[people/pmueller/ipfire-3.x.git] / libunwind / patches / libunwind-disable-setjmp.patch

At least x86_64 version cannot work, src/setjmp/setjmp.c and
src/setjmp/sigsetjmp.c are not even compiled, src/x86_64/longjmp.S does not
match src/setjmp/setjmp.c + include/tdep-x86_64/jmpbuf.h .

google-perftools link only with libunwind.so.7 .

diff --git a/src/Makefile.am b/src/Makefile.am
index adfbef3..08d2870 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,5 @@
 SOVERSION=8:1:0		# See comments at end of file.
-SETJMP_SO_VERSION=0:0:0
+#SETJMP_SO_VERSION=0:0:0
 COREDUMP_SO_VERSION=0:0:0
 #
 # Don't link with start-files since we don't use any constructors/destructors:
@@ -22,8 +22,8 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libunwind-generic.pc
 
 if !REMOTE_ONLY
-pkgconfig_DATA += unwind/libunwind.pc ptrace/libunwind-ptrace.pc         \
-                  setjmp/libunwind-setjmp.pc
+pkgconfig_DATA += unwind/libunwind.pc ptrace/libunwind-ptrace.pc
+#                  setjmp/libunwind-setjmp.pc
 endif
 
 if BUILD_COREDUMP
@@ -61,8 +61,8 @@ libunwind_coredump_la_LDFLAGS = $(COMMON_SO_LDFLAGS) \
 noinst_HEADERS += coredump/_UCD_internal.h
 
 ### libunwind-setjmp:
-libunwind_setjmp_la_LDFLAGS		= $(COMMON_SO_LDFLAGS)		     \
-					  -version-info $(SETJMP_SO_VERSION)
+#libunwind_setjmp_la_LDFLAGS		= $(COMMON_SO_LDFLAGS)		     \
+#					  -version-info $(SETJMP_SO_VERSION)
 
 if USE_ELF32
 LIBUNWIND_ELF = libunwind-elf32.la
@@ -74,12 +74,12 @@ if USE_ELFXX
 LIBUNWIND_ELF = libunwind-elfxx.la
 endif
 
-libunwind_setjmp_la_LIBADD		= $(LIBUNWIND_ELF)	\
-					  libunwind-$(arch).la	\
-					  libunwind.la -lc
-libunwind_setjmp_la_SOURCES		= setjmp/longjmp.c	\
-					  setjmp/siglongjmp.c
-noinst_HEADERS				+= setjmp/setjmp_i.h
+#libunwind_setjmp_la_LIBADD		= $(LIBUNWIND_ELF)	\
+#					  libunwind-$(arch).la	\
+#					  libunwind.la -lc
+#libunwind_setjmp_la_SOURCES		= setjmp/longjmp.c	\
+#					  setjmp/siglongjmp.c
+#noinst_HEADERS				+= setjmp/setjmp_i.h
 
 ### libunwind:
 libunwind_la_LIBADD =
@@ -428,7 +428,7 @@ if ARCH_ARM
 if !REMOTE_ONLY
  libunwind_arm_la_LIBADD += libunwind.la -lc
 endif
- libunwind_setjmp_la_SOURCES += arm/siglongjmp.S
+# libunwind_setjmp_la_SOURCES += arm/siglongjmp.S
 else
 if ARCH_IA64
  BUILT_SOURCES = Gcursor_i.h Lcursor_i.h
@@ -449,8 +449,8 @@ Lcursor_i.h: mk_Lcursor_i.s
 if !REMOTE_ONLY
  libunwind_ia64_la_LIBADD += libunwind.la -lc
 endif
- libunwind_setjmp_la_SOURCES += ia64/setjmp.S  ia64/sigsetjmp.S  \
-				ia64/longjmp.S ia64/siglongjmp.S
+# libunwind_setjmp_la_SOURCES += ia64/setjmp.S  ia64/sigsetjmp.S  \
+#				ia64/longjmp.S ia64/siglongjmp.S
 else
 if ARCH_HPPA
  lib_LTLIBRARIES += libunwind-hppa.la
@@ -462,7 +462,7 @@ if ARCH_HPPA
 if !REMOTE_ONLY
  libunwind_hppa_la_LIBADD += libunwind.la -lc
 endif
- libunwind_setjmp_la_SOURCES += hppa/siglongjmp.S
+# libunwind_setjmp_la_SOURCES += hppa/siglongjmp.S
 else
 if ARCH_MIPS
  lib_LTLIBRARIES += libunwind-mips.la
@@ -474,7 +474,7 @@ if ARCH_MIPS
 if !REMOTE_ONLY
  libunwind_mips_la_LIBADD += libunwind.la -lc
 endif
- libunwind_setjmp_la_SOURCES += mips/siglongjmp.S
+# libunwind_setjmp_la_SOURCES += mips/siglongjmp.S
 else
 if ARCH_X86
  lib_LTLIBRARIES += libunwind-x86.la
@@ -486,7 +486,7 @@ if ARCH_X86
 if !REMOTE_ONLY
  libunwind_x86_la_LIBADD += libunwind.la -lc
 endif
- libunwind_setjmp_la_SOURCES += x86/longjmp.S x86/siglongjmp.S
+# libunwind_setjmp_la_SOURCES += x86/longjmp.S x86/siglongjmp.S
 else
 if ARCH_X86_64
  lib_LTLIBRARIES += libunwind-x86_64.la
@@ -498,7 +498,7 @@ if ARCH_X86_64
 if !REMOTE_ONLY
  libunwind_x86_64_la_LIBADD += libunwind.la -lc
 endif
- libunwind_setjmp_la_SOURCES += x86_64/longjmp.S x86_64/siglongjmp.S
+# libunwind_setjmp_la_SOURCES += x86_64/longjmp.S x86_64/siglongjmp.S
 else
 if ARCH_PPC32
  lib_LTLIBRARIES += libunwind-ppc32.la
@@ -510,7 +510,7 @@ if ARCH_PPC32
 if !REMOTE_ONLY
  libunwind_ppc32_la_LIBADD += libunwind.la -lc
 endif
- libunwind_setjmp_la_SOURCES += ppc/longjmp.S ppc/siglongjmp.S
+# libunwind_setjmp_la_SOURCES += ppc/longjmp.S ppc/siglongjmp.S
 else
 if ARCH_PPC64
  lib_LTLIBRARIES += libunwind-ppc64.la
@@ -522,7 +522,7 @@ if ARCH_PPC64
 if !REMOTE_ONLY
  libunwind_ppc64_la_LIBADD += libunwind.la -lc
 endif
- libunwind_setjmp_la_SOURCES += ppc/longjmp.S ppc/siglongjmp.S
+# libunwind_setjmp_la_SOURCES += ppc/longjmp.S ppc/siglongjmp.S
 else
 if ARCH_SH
  lib_LTLIBRARIES += libunwind-sh.la
@@ -534,7 +534,7 @@ if ARCH_SH
 if !REMOTE_ONLY
  libunwind_sh_la_LIBADD += libunwind.la -lc
 endif
- libunwind_setjmp_la_SOURCES += sh/siglongjmp.S
+# libunwind_setjmp_la_SOURCES += sh/siglongjmp.S
 
 endif # ARCH_SH
 endif # ARCH_PPC64
@@ -549,7 +549,7 @@ endif # ARCH_ARM
 # libunwind-setjmp depends on libunwind-$(arch). Therefore must be added
 # at the end.
 if !REMOTE_ONLY
-lib_LTLIBRARIES += libunwind-setjmp.la
+#lib_LTLIBRARIES += libunwind-setjmp.la
 endif
 
 #
diff --git a/tests/Makefile.am b/tests/Makefile.am
index a367eed..3f47e80 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -45,7 +45,7 @@ endif #!ARCH_IA64
 			Gtest-dyn1 Ltest-dyn1				 \
 			Gtest-trace Ltest-trace				 \
 			test-async-sig test-flush-cache test-init-remote \
-			test-mem test-setjmp test-ptrace Ltest-varargs	 \
+			test-mem test-ptrace Ltest-varargs	 	 \
 			Ltest-nomalloc Ltest-nocalloc Lrs-race
  noinst_PROGRAMS_cdep = forker crasher mapper test-ptrace-misc		 \
 			Gperf-simple Lperf-simple
@@ -134,8 +134,8 @@ if USE_ELFXX
 LIBUNWIND_ELF = $(top_builddir)/src/libunwind-elfxx.la
 endif
 
-LIBUNWIND_setjmp = $(top_builddir)/src/libunwind-setjmp.la	\
-		   $(LIBUNWIND_ELF) $(LIBUNWIND)
+#LIBUNWIND_setjmp = $(top_builddir)/src/libunwind-setjmp.la	\
+#		   $(LIBUNWIND_ELF) $(LIBUNWIND)
 
 test_async_sig_LDADD = $(LIBUNWIND_local) -lpthread
 test_flush_cache_LDADD = $(LIBUNWIND_local)
@@ -172,8 +172,8 @@ Lperf_simple_LDADD = $(LIBUNWIND_local)
 Ltest_trace_LDADD = $(LIBUNWIND_local)
 Lperf_trace_LDADD = $(LIBUNWIND_local)
 
-test_setjmp_LDADD = $(LIBUNWIND_setjmp)
-ia64_test_setjmp_LDADD = $(LIBUNWIND_setjmp)
+#test_setjmp_LDADD = $(LIBUNWIND_setjmp)
+#ia64_test_setjmp_LDADD = $(LIBUNWIND_setjmp)
 
 if BUILD_COREDUMP
 test_coredump_unwind_LDADD = $(LIBUNWIND_coredump) $(LIBUNWIND)
Commit	Line	Data
d1ecc343 MT	1	At least x86_64 version cannot work, src/setjmp/setjmp.c and
	2	src/setjmp/sigsetjmp.c are not even compiled, src/x86_64/longjmp.S does not
	3	match src/setjmp/setjmp.c + include/tdep-x86_64/jmpbuf.h .
	4
	5	google-perftools link only with libunwind.so.7 .
	6
add5a956 MT	7	diff --git a/src/Makefile.am b/src/Makefile.am
	8	index adfbef3..08d2870 100644
	9	--- a/src/Makefile.am
	10	+++ b/src/Makefile.am
d1ecc343	11	@@ -1,5 +1,5 @@
add5a956	12	SOVERSION=8:1:0 # See comments at end of file.
d1ecc343 MT	13	-SETJMP_SO_VERSION=0:0:0
d1ecc343 MT	14	+#SETJMP_SO_VERSION=0:0:0
add5a956	15	COREDUMP_SO_VERSION=0:0:0
d1ecc343 MT	16	#
d1ecc343 MT	17	# Don't link with start-files since we don't use any constructors/destructors:
add5a956 MT	18	@@ -22,8 +22,8 @@ pkgconfigdir = $(libdir)/pkgconfig
	19	pkgconfig_DATA = libunwind-generic.pc
	20
	21	if !REMOTE_ONLY
	22	-pkgconfig_DATA += unwind/libunwind.pc ptrace/libunwind-ptrace.pc \
	23	- setjmp/libunwind-setjmp.pc
	24	+pkgconfig_DATA += unwind/libunwind.pc ptrace/libunwind-ptrace.pc
	25	+# setjmp/libunwind-setjmp.pc
	26	endif
	27
	28	if BUILD_COREDUMP
	29	@@ -61,8 +61,8 @@ libunwind_coredump_la_LDFLAGS = $(COMMON_SO_LDFLAGS) \
	30	noinst_HEADERS += coredump/_UCD_internal.h
d1ecc343 MT	31
	32	### libunwind-setjmp:
	33	-libunwind_setjmp_la_LDFLAGS = $(COMMON_SO_LDFLAGS) \
	34	- -version-info $(SETJMP_SO_VERSION)
	35	+#libunwind_setjmp_la_LDFLAGS = $(COMMON_SO_LDFLAGS) \
	36	+# -version-info $(SETJMP_SO_VERSION)
	37
	38	if USE_ELF32
	39	LIBUNWIND_ELF = libunwind-elf32.la
add5a956	40	@@ -74,12 +74,12 @@ if USE_ELFXX
d1ecc343 MT	41	LIBUNWIND_ELF = libunwind-elfxx.la
	42	endif
	43
	44	-libunwind_setjmp_la_LIBADD = $(LIBUNWIND_ELF) \
	45	- libunwind-$(arch).la \
	46	- libunwind.la -lc
	47	-libunwind_setjmp_la_SOURCES = setjmp/longjmp.c \
	48	- setjmp/siglongjmp.c
	49	-noinst_HEADERS += setjmp/setjmp_i.h
	50	+#libunwind_setjmp_la_LIBADD = $(LIBUNWIND_ELF) \
	51	+# libunwind-$(arch).la \
	52	+# libunwind.la -lc
	53	+#libunwind_setjmp_la_SOURCES = setjmp/longjmp.c \
	54	+# setjmp/siglongjmp.c
	55	+#noinst_HEADERS += setjmp/setjmp_i.h
	56
	57	### libunwind:
	58	libunwind_la_LIBADD =
add5a956	59	@@ -428,7 +428,7 @@ if ARCH_ARM
d1ecc343 MT	60	if !REMOTE_ONLY
	61	libunwind_arm_la_LIBADD += libunwind.la -lc
	62	endif
	63	- libunwind_setjmp_la_SOURCES += arm/siglongjmp.S
	64	+# libunwind_setjmp_la_SOURCES += arm/siglongjmp.S
	65	else
	66	if ARCH_IA64
add5a956 MT	67	BUILT_SOURCES = Gcursor_i.h Lcursor_i.h
add5a956 MT	68	@@ -449,8 +449,8 @@ Lcursor_i.h: mk_Lcursor_i.s
d1ecc343 MT	69	if !REMOTE_ONLY
	70	libunwind_ia64_la_LIBADD += libunwind.la -lc
	71	endif
	72	- libunwind_setjmp_la_SOURCES += ia64/setjmp.S ia64/sigsetjmp.S \
	73	- ia64/longjmp.S ia64/siglongjmp.S
	74	+# libunwind_setjmp_la_SOURCES += ia64/setjmp.S ia64/sigsetjmp.S \
	75	+# ia64/longjmp.S ia64/siglongjmp.S
	76	else
	77	if ARCH_HPPA
	78	lib_LTLIBRARIES += libunwind-hppa.la
add5a956	79	@@ -462,7 +462,7 @@ if ARCH_HPPA
d1ecc343 MT	80	if !REMOTE_ONLY
	81	libunwind_hppa_la_LIBADD += libunwind.la -lc
	82	endif
	83	- libunwind_setjmp_la_SOURCES += hppa/siglongjmp.S
	84	+# libunwind_setjmp_la_SOURCES += hppa/siglongjmp.S
	85	else
	86	if ARCH_MIPS
	87	lib_LTLIBRARIES += libunwind-mips.la
add5a956	88	@@ -474,7 +474,7 @@ if ARCH_MIPS
d1ecc343 MT	89	if !REMOTE_ONLY
	90	libunwind_mips_la_LIBADD += libunwind.la -lc
	91	endif
	92	- libunwind_setjmp_la_SOURCES += mips/siglongjmp.S
	93	+# libunwind_setjmp_la_SOURCES += mips/siglongjmp.S
	94	else
	95	if ARCH_X86
	96	lib_LTLIBRARIES += libunwind-x86.la
add5a956	97	@@ -486,7 +486,7 @@ if ARCH_X86
d1ecc343 MT	98	if !REMOTE_ONLY
	99	libunwind_x86_la_LIBADD += libunwind.la -lc
	100	endif
	101	- libunwind_setjmp_la_SOURCES += x86/longjmp.S x86/siglongjmp.S
	102	+# libunwind_setjmp_la_SOURCES += x86/longjmp.S x86/siglongjmp.S
	103	else
	104	if ARCH_X86_64
	105	lib_LTLIBRARIES += libunwind-x86_64.la
add5a956	106	@@ -498,7 +498,7 @@ if ARCH_X86_64
d1ecc343 MT	107	if !REMOTE_ONLY
	108	libunwind_x86_64_la_LIBADD += libunwind.la -lc
	109	endif
	110	- libunwind_setjmp_la_SOURCES += x86_64/longjmp.S x86_64/siglongjmp.S
	111	+# libunwind_setjmp_la_SOURCES += x86_64/longjmp.S x86_64/siglongjmp.S
	112	else
	113	if ARCH_PPC32
	114	lib_LTLIBRARIES += libunwind-ppc32.la
add5a956	115	@@ -510,7 +510,7 @@ if ARCH_PPC32
d1ecc343 MT	116	if !REMOTE_ONLY
	117	libunwind_ppc32_la_LIBADD += libunwind.la -lc
	118	endif
	119	- libunwind_setjmp_la_SOURCES += ppc/longjmp.S ppc/siglongjmp.S
	120	+# libunwind_setjmp_la_SOURCES += ppc/longjmp.S ppc/siglongjmp.S
	121	else
	122	if ARCH_PPC64
	123	lib_LTLIBRARIES += libunwind-ppc64.la
add5a956	124	@@ -522,7 +522,7 @@ if ARCH_PPC64
d1ecc343 MT	125	if !REMOTE_ONLY
	126	libunwind_ppc64_la_LIBADD += libunwind.la -lc
	127	endif
	128	- libunwind_setjmp_la_SOURCES += ppc/longjmp.S ppc/siglongjmp.S
	129	+# libunwind_setjmp_la_SOURCES += ppc/longjmp.S ppc/siglongjmp.S
add5a956 MT	130	else
	131	if ARCH_SH
	132	lib_LTLIBRARIES += libunwind-sh.la
	133	@@ -534,7 +534,7 @@ if ARCH_SH
	134	if !REMOTE_ONLY
	135	libunwind_sh_la_LIBADD += libunwind.la -lc
	136	endif
	137	- libunwind_setjmp_la_SOURCES += sh/siglongjmp.S
	138	+# libunwind_setjmp_la_SOURCES += sh/siglongjmp.S
d1ecc343	139
add5a956	140	endif # ARCH_SH
d1ecc343	141	endif # ARCH_PPC64
add5a956	142	@@ -549,7 +549,7 @@ endif # ARCH_ARM
d1ecc343 MT	143	# libunwind-setjmp depends on libunwind-$(arch). Therefore must be added
	144	# at the end.
	145	if !REMOTE_ONLY
	146	-lib_LTLIBRARIES += libunwind-setjmp.la
	147	+#lib_LTLIBRARIES += libunwind-setjmp.la
	148	endif
	149
	150	#
add5a956 MT	151	diff --git a/tests/Makefile.am b/tests/Makefile.am
	152	index a367eed..3f47e80 100644
	153	--- a/tests/Makefile.am
	154	+++ b/tests/Makefile.am
	155	@@ -45,7 +45,7 @@ endif #!ARCH_IA64
d1ecc343 MT	156	Gtest-dyn1 Ltest-dyn1 \
	157	Gtest-trace Ltest-trace \
	158	test-async-sig test-flush-cache test-init-remote \
add5a956 MT	159	- test-mem test-setjmp test-ptrace Ltest-varargs \
	160	+ test-mem test-ptrace Ltest-varargs \
	161	Ltest-nomalloc Ltest-nocalloc Lrs-race
	162	noinst_PROGRAMS_cdep = forker crasher mapper test-ptrace-misc \
d1ecc343	163	Gperf-simple Lperf-simple
add5a956	164	@@ -134,8 +134,8 @@ if USE_ELFXX
d1ecc343 MT	165	LIBUNWIND_ELF = $(top_builddir)/src/libunwind-elfxx.la
	166	endif
	167
	168	-LIBUNWIND_setjmp = $(top_builddir)/src/libunwind-setjmp.la \
	169	- $(LIBUNWIND_ELF) $(LIBUNWIND)
	170	+#LIBUNWIND_setjmp = $(top_builddir)/src/libunwind-setjmp.la \
	171	+# $(LIBUNWIND_ELF) $(LIBUNWIND)
	172
	173	test_async_sig_LDADD = $(LIBUNWIND_local) -lpthread
	174	test_flush_cache_LDADD = $(LIBUNWIND_local)
add5a956	175	@@ -172,8 +172,8 @@ Lperf_simple_LDADD = $(LIBUNWIND_local)
d1ecc343 MT	176	Ltest_trace_LDADD = $(LIBUNWIND_local)
	177	Lperf_trace_LDADD = $(LIBUNWIND_local)
	178
	179	-test_setjmp_LDADD = $(LIBUNWIND_setjmp)
	180	-ia64_test_setjmp_LDADD = $(LIBUNWIND_setjmp)
	181	+#test_setjmp_LDADD = $(LIBUNWIND_setjmp)
	182	+#ia64_test_setjmp_LDADD = $(LIBUNWIND_setjmp)
	183
add5a956 MT	184	if BUILD_COREDUMP
add5a956 MT	185	test_coredump_unwind_LDADD = $(LIBUNWIND_coredump) $(LIBUNWIND)