|
 |
30e226 |
At least x86_64 version cannot work, src/setjmp/setjmp.c and
|
|
|
30e226 |
src/setjmp/sigsetjmp.c are not even compiled, src/x86_64/longjmp.S does not
|
|
|
30e226 |
match src/setjmp/setjmp.c + include/tdep-x86_64/jmpbuf.h .
|
|
|
30e226 |
|
|
|
30e226 |
google-perftools link only with libunwind.so.7 .
|
|
|
30e226 |
|
|
|
30e226 |
diff --git a/src/Makefile.am b/src/Makefile.am
|
|
|
30e226 |
index adfbef3..08d2870 100644
|
|
|
30e226 |
--- a/src/Makefile.am
|
|
|
30e226 |
+++ b/src/Makefile.am
|
|
|
30e226 |
@@ -1,5 +1,5 @@
|
|
|
30e226 |
SOVERSION=8:1:0 # See comments at end of file.
|
|
|
30e226 |
-SETJMP_SO_VERSION=0:0:0
|
|
|
30e226 |
+#SETJMP_SO_VERSION=0:0:0
|
|
|
30e226 |
COREDUMP_SO_VERSION=0:0:0
|
|
|
30e226 |
#
|
|
|
30e226 |
# Don't link with start-files since we don't use any constructors/destructors:
|
|
|
30e226 |
@@ -22,8 +22,8 @@ pkgconfigdir = $(libdir)/pkgconfig
|
|
|
30e226 |
pkgconfig_DATA = libunwind-generic.pc
|
|
|
30e226 |
|
|
|
30e226 |
if !REMOTE_ONLY
|
|
|
30e226 |
-pkgconfig_DATA += unwind/libunwind.pc ptrace/libunwind-ptrace.pc \
|
|
|
30e226 |
- setjmp/libunwind-setjmp.pc
|
|
|
30e226 |
+pkgconfig_DATA += unwind/libunwind.pc ptrace/libunwind-ptrace.pc
|
|
|
30e226 |
+# setjmp/libunwind-setjmp.pc
|
|
|
30e226 |
endif
|
|
|
30e226 |
|
|
|
30e226 |
if BUILD_COREDUMP
|
|
|
30e226 |
@@ -61,8 +61,8 @@ libunwind_coredump_la_LDFLAGS = $(COMMON_SO_LDFLAGS) \
|
|
|
30e226 |
noinst_HEADERS += coredump/_UCD_internal.h
|
|
|
30e226 |
|
|
|
30e226 |
### libunwind-setjmp:
|
|
|
30e226 |
-libunwind_setjmp_la_LDFLAGS = $(COMMON_SO_LDFLAGS) \
|
|
|
30e226 |
- -version-info $(SETJMP_SO_VERSION)
|
|
|
30e226 |
+#libunwind_setjmp_la_LDFLAGS = $(COMMON_SO_LDFLAGS) \
|
|
|
30e226 |
+# -version-info $(SETJMP_SO_VERSION)
|
|
|
30e226 |
|
|
|
30e226 |
if USE_ELF32
|
|
|
30e226 |
LIBUNWIND_ELF = libunwind-elf32.la
|
|
|
30e226 |
@@ -74,12 +74,12 @@ if USE_ELFXX
|
|
|
30e226 |
LIBUNWIND_ELF = libunwind-elfxx.la
|
|
|
30e226 |
endif
|
|
|
30e226 |
|
|
|
30e226 |
-libunwind_setjmp_la_LIBADD = $(LIBUNWIND_ELF) \
|
|
|
30e226 |
- libunwind-$(arch).la \
|
|
|
30e226 |
- libunwind.la -lc
|
|
|
30e226 |
-libunwind_setjmp_la_SOURCES = setjmp/longjmp.c \
|
|
|
30e226 |
- setjmp/siglongjmp.c
|
|
|
30e226 |
-noinst_HEADERS += setjmp/setjmp_i.h
|
|
|
30e226 |
+#libunwind_setjmp_la_LIBADD = $(LIBUNWIND_ELF) \
|
|
|
30e226 |
+# libunwind-$(arch).la \
|
|
|
30e226 |
+# libunwind.la -lc
|
|
|
30e226 |
+#libunwind_setjmp_la_SOURCES = setjmp/longjmp.c \
|
|
|
30e226 |
+# setjmp/siglongjmp.c
|
|
|
30e226 |
+#noinst_HEADERS += setjmp/setjmp_i.h
|
|
|
30e226 |
|
|
|
30e226 |
### libunwind:
|
|
|
30e226 |
libunwind_la_LIBADD =
|
|
|
30e226 |
@@ -428,7 +428,7 @@ if ARCH_ARM
|
|
|
30e226 |
if !REMOTE_ONLY
|
|
|
30e226 |
libunwind_arm_la_LIBADD += libunwind.la -lc
|
|
|
30e226 |
endif
|
|
|
30e226 |
- libunwind_setjmp_la_SOURCES += arm/siglongjmp.S
|
|
|
30e226 |
+# libunwind_setjmp_la_SOURCES += arm/siglongjmp.S
|
|
|
30e226 |
else
|
|
|
30e226 |
if ARCH_IA64
|
|
|
30e226 |
BUILT_SOURCES = Gcursor_i.h Lcursor_i.h
|
|
|
30e226 |
@@ -449,8 +449,8 @@ Lcursor_i.h: mk_Lcursor_i.s
|
|
|
30e226 |
if !REMOTE_ONLY
|
|
|
30e226 |
libunwind_ia64_la_LIBADD += libunwind.la -lc
|
|
|
30e226 |
endif
|
|
|
30e226 |
- libunwind_setjmp_la_SOURCES += ia64/setjmp.S ia64/sigsetjmp.S \
|
|
|
30e226 |
- ia64/longjmp.S ia64/siglongjmp.S
|
|
|
30e226 |
+# libunwind_setjmp_la_SOURCES += ia64/setjmp.S ia64/sigsetjmp.S \
|
|
|
30e226 |
+# ia64/longjmp.S ia64/siglongjmp.S
|
|
|
30e226 |
else
|
|
|
30e226 |
if ARCH_HPPA
|
|
|
30e226 |
lib_LTLIBRARIES += libunwind-hppa.la
|
|
|
30e226 |
@@ -462,7 +462,7 @@ if ARCH_HPPA
|
|
|
30e226 |
if !REMOTE_ONLY
|
|
|
30e226 |
libunwind_hppa_la_LIBADD += libunwind.la -lc
|
|
|
30e226 |
endif
|
|
|
30e226 |
- libunwind_setjmp_la_SOURCES += hppa/siglongjmp.S
|
|
|
30e226 |
+# libunwind_setjmp_la_SOURCES += hppa/siglongjmp.S
|
|
|
30e226 |
else
|
|
|
30e226 |
if ARCH_MIPS
|
|
|
30e226 |
lib_LTLIBRARIES += libunwind-mips.la
|
|
|
30e226 |
@@ -474,7 +474,7 @@ if ARCH_MIPS
|
|
|
30e226 |
if !REMOTE_ONLY
|
|
|
30e226 |
libunwind_mips_la_LIBADD += libunwind.la -lc
|
|
|
30e226 |
endif
|
|
|
30e226 |
- libunwind_setjmp_la_SOURCES += mips/siglongjmp.S
|
|
|
30e226 |
+# libunwind_setjmp_la_SOURCES += mips/siglongjmp.S
|
|
|
30e226 |
else
|
|
|
30e226 |
if ARCH_X86
|
|
|
30e226 |
lib_LTLIBRARIES += libunwind-x86.la
|
|
|
30e226 |
@@ -486,7 +486,7 @@ if ARCH_X86
|
|
|
30e226 |
if !REMOTE_ONLY
|
|
|
30e226 |
libunwind_x86_la_LIBADD += libunwind.la -lc
|
|
|
30e226 |
endif
|
|
|
30e226 |
- libunwind_setjmp_la_SOURCES += x86/longjmp.S x86/siglongjmp.S
|
|
|
30e226 |
+# libunwind_setjmp_la_SOURCES += x86/longjmp.S x86/siglongjmp.S
|
|
|
30e226 |
else
|
|
|
30e226 |
if ARCH_X86_64
|
|
|
30e226 |
lib_LTLIBRARIES += libunwind-x86_64.la
|
|
|
30e226 |
@@ -498,7 +498,7 @@ if ARCH_X86_64
|
|
|
30e226 |
if !REMOTE_ONLY
|
|
|
30e226 |
libunwind_x86_64_la_LIBADD += libunwind.la -lc
|
|
|
30e226 |
endif
|
|
|
30e226 |
- libunwind_setjmp_la_SOURCES += x86_64/longjmp.S x86_64/siglongjmp.S
|
|
|
30e226 |
+# libunwind_setjmp_la_SOURCES += x86_64/longjmp.S x86_64/siglongjmp.S
|
|
|
30e226 |
else
|
|
|
30e226 |
if ARCH_PPC32
|
|
|
30e226 |
lib_LTLIBRARIES += libunwind-ppc32.la
|
|
|
30e226 |
@@ -510,7 +510,7 @@ if ARCH_PPC32
|
|
|
30e226 |
if !REMOTE_ONLY
|
|
|
30e226 |
libunwind_ppc32_la_LIBADD += libunwind.la -lc
|
|
|
30e226 |
endif
|
|
|
30e226 |
- libunwind_setjmp_la_SOURCES += ppc/longjmp.S ppc/siglongjmp.S
|
|
|
30e226 |
+# libunwind_setjmp_la_SOURCES += ppc/longjmp.S ppc/siglongjmp.S
|
|
|
30e226 |
else
|
|
|
30e226 |
if ARCH_PPC64
|
|
|
30e226 |
lib_LTLIBRARIES += libunwind-ppc64.la
|
|
|
30e226 |
@@ -522,7 +522,7 @@ if ARCH_PPC64
|
|
|
30e226 |
if !REMOTE_ONLY
|
|
|
30e226 |
libunwind_ppc64_la_LIBADD += libunwind.la -lc
|
|
|
30e226 |
endif
|
|
|
30e226 |
- libunwind_setjmp_la_SOURCES += ppc/longjmp.S ppc/siglongjmp.S
|
|
|
30e226 |
+# libunwind_setjmp_la_SOURCES += ppc/longjmp.S ppc/siglongjmp.S
|
|
|
30e226 |
else
|
|
|
30e226 |
if ARCH_SH
|
|
|
30e226 |
lib_LTLIBRARIES += libunwind-sh.la
|
|
|
30e226 |
@@ -534,7 +534,7 @@ if ARCH_SH
|
|
|
30e226 |
if !REMOTE_ONLY
|
|
|
30e226 |
libunwind_sh_la_LIBADD += libunwind.la -lc
|
|
|
30e226 |
endif
|
|
|
30e226 |
- libunwind_setjmp_la_SOURCES += sh/siglongjmp.S
|
|
|
30e226 |
+# libunwind_setjmp_la_SOURCES += sh/siglongjmp.S
|
|
|
30e226 |
|
|
|
30e226 |
endif # ARCH_SH
|
|
|
30e226 |
endif # ARCH_PPC64
|
|
|
30e226 |
@@ -549,7 +549,7 @@ endif # ARCH_ARM
|
|
|
30e226 |
# libunwind-setjmp depends on libunwind-$(arch). Therefore must be added
|
|
|
30e226 |
# at the end.
|
|
|
30e226 |
if !REMOTE_ONLY
|
|
|
30e226 |
-lib_LTLIBRARIES += libunwind-setjmp.la
|
|
|
30e226 |
+#lib_LTLIBRARIES += libunwind-setjmp.la
|
|
|
30e226 |
endif
|
|
|
30e226 |
|
|
|
30e226 |
#
|
|
|
30e226 |
diff --git a/tests/Makefile.am b/tests/Makefile.am
|
|
|
30e226 |
index a367eed..3f47e80 100644
|
|
|
30e226 |
--- a/tests/Makefile.am
|
|
|
30e226 |
+++ b/tests/Makefile.am
|
|
|
30e226 |
@@ -45,7 +45,7 @@ endif #!ARCH_IA64
|
|
|
30e226 |
Gtest-dyn1 Ltest-dyn1 \
|
|
|
30e226 |
Gtest-trace Ltest-trace \
|
|
|
30e226 |
test-async-sig test-flush-cache test-init-remote \
|
|
|
30e226 |
- test-mem test-setjmp test-ptrace Ltest-varargs \
|
|
|
30e226 |
+ test-mem test-ptrace Ltest-varargs \
|
|
|
30e226 |
Ltest-nomalloc Ltest-nocalloc Lrs-race
|
|
|
30e226 |
noinst_PROGRAMS_cdep = forker crasher mapper test-ptrace-misc \
|
|
|
30e226 |
Gperf-simple Lperf-simple
|
|
|
30e226 |
@@ -134,8 +134,8 @@ if USE_ELFXX
|
|
|
30e226 |
LIBUNWIND_ELF = $(top_builddir)/src/libunwind-elfxx.la
|
|
|
30e226 |
endif
|
|
|
30e226 |
|
|
|
30e226 |
-LIBUNWIND_setjmp = $(top_builddir)/src/libunwind-setjmp.la \
|
|
|
30e226 |
- $(LIBUNWIND_ELF) $(LIBUNWIND)
|
|
|
30e226 |
+#LIBUNWIND_setjmp = $(top_builddir)/src/libunwind-setjmp.la \
|
|
|
30e226 |
+# $(LIBUNWIND_ELF) $(LIBUNWIND)
|
|
|
30e226 |
|
|
|
30e226 |
test_async_sig_LDADD = $(LIBUNWIND_local) -lpthread
|
|
|
30e226 |
test_flush_cache_LDADD = $(LIBUNWIND_local)
|
|
|
30e226 |
@@ -172,8 +172,8 @@ Lperf_simple_LDADD = $(LIBUNWIND_local)
|
|
|
30e226 |
Ltest_trace_LDADD = $(LIBUNWIND_local)
|
|
|
30e226 |
Lperf_trace_LDADD = $(LIBUNWIND_local)
|
|
|
30e226 |
|
|
|
30e226 |
-test_setjmp_LDADD = $(LIBUNWIND_setjmp)
|
|
|
30e226 |
-ia64_test_setjmp_LDADD = $(LIBUNWIND_setjmp)
|
|
|
30e226 |
+#test_setjmp_LDADD = $(LIBUNWIND_setjmp)
|
|
|
30e226 |
+#ia64_test_setjmp_LDADD = $(LIBUNWIND_setjmp)
|
|
|
30e226 |
|
|
|
30e226 |
if BUILD_COREDUMP
|
|
|
30e226 |
test_coredump_unwind_LDADD = $(LIBUNWIND_coredump) $(LIBUNWIND)
|