[libunwind] Update to upstream v1.1
Kyle McMartin
kyle at fedoraproject.org
Mon Feb 18 21:33:12 UTC 2013
commit ef33c9d57094bf4f55e447d3733e9fe747e24458
Author: Kyle McMartin <kmcmarti at redhat.com>
Date: Mon Feb 18 15:06:59 2013 -0500
Update to upstream v1.1
.gitignore | 2 +-
libunwind-arm-register-rename.patch | 59 ----------------------
libunwind-disable-setjmp.patch | 91 ++++++++++++++++++++--------------
libunwind-install-ptrace.patch | 31 ------------
libunwind.spec | 16 ++++---
sources | 2 +-
6 files changed, 64 insertions(+), 137 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6987f4d..de89374 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/libunwind-1.0.1.tar.gz
+/libunwind-1.1.tar.gz
diff --git a/libunwind-disable-setjmp.patch b/libunwind-disable-setjmp.patch
index ef68f64..a463f49 100644
--- a/libunwind-disable-setjmp.patch
+++ b/libunwind-disable-setjmp.patch
@@ -4,17 +4,30 @@ match src/setjmp/setjmp.c + include/tdep-x86_64/jmpbuf.h .
google-perftools link only with libunwind.so.7 .
---- libunwind-1.0.1-orig/src/Makefile.am 2011-09-11 05:06:41.000000000 +0200
-+++ libunwind-1.0.1/src/Makefile.am 2011-09-15 13:55:42.000000000 +0200
+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:0:0 # See comments at end of file.
+ 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:
- #
-@@ -27,8 +27,8 @@ libunwind_ptrace_a_SOURCES = \
- noinst_HEADERS += ptrace/_UPT_internal.h
+@@ -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) \
@@ -24,7 +37,7 @@ google-perftools link only with libunwind.so.7 .
if USE_ELF32
LIBUNWIND_ELF = libunwind-elf32.la
-@@ -40,12 +40,12 @@ if USE_ELFXX
+@@ -74,12 +74,12 @@ if USE_ELFXX
LIBUNWIND_ELF = libunwind-elfxx.la
endif
@@ -43,7 +56,7 @@ google-perftools link only with libunwind.so.7 .
### libunwind:
libunwind_la_LIBADD =
-@@ -373,7 +373,7 @@ if ARCH_ARM
+@@ -428,7 +428,7 @@ if ARCH_ARM
if !REMOTE_ONLY
libunwind_arm_la_LIBADD += libunwind.la -lc
endif
@@ -51,8 +64,8 @@ google-perftools link only with libunwind.so.7 .
+# libunwind_setjmp_la_SOURCES += arm/siglongjmp.S
else
if ARCH_IA64
- ia64_mk_Gcursor_i_SOURCES = ia64/mk_Gcursor_i.c
-@@ -393,8 +393,8 @@ Lcursor_i.h: ia64/mk_Lcursor_i
+ 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
@@ -63,7 +76,7 @@ google-perftools link only with libunwind.so.7 .
else
if ARCH_HPPA
lib_LTLIBRARIES += libunwind-hppa.la
-@@ -406,7 +406,7 @@ if ARCH_HPPA
+@@ -462,7 +462,7 @@ if ARCH_HPPA
if !REMOTE_ONLY
libunwind_hppa_la_LIBADD += libunwind.la -lc
endif
@@ -72,7 +85,7 @@ google-perftools link only with libunwind.so.7 .
else
if ARCH_MIPS
lib_LTLIBRARIES += libunwind-mips.la
-@@ -418,7 +418,7 @@ if ARCH_MIPS
+@@ -474,7 +474,7 @@ if ARCH_MIPS
if !REMOTE_ONLY
libunwind_mips_la_LIBADD += libunwind.la -lc
endif
@@ -81,7 +94,7 @@ google-perftools link only with libunwind.so.7 .
else
if ARCH_X86
lib_LTLIBRARIES += libunwind-x86.la
-@@ -430,7 +430,7 @@ if ARCH_X86
+@@ -486,7 +486,7 @@ if ARCH_X86
if !REMOTE_ONLY
libunwind_x86_la_LIBADD += libunwind.la -lc
endif
@@ -90,7 +103,7 @@ google-perftools link only with libunwind.so.7 .
else
if ARCH_X86_64
lib_LTLIBRARIES += libunwind-x86_64.la
-@@ -442,7 +442,7 @@ if ARCH_X86_64
+@@ -498,7 +498,7 @@ if ARCH_X86_64
if !REMOTE_ONLY
libunwind_x86_64_la_LIBADD += libunwind.la -lc
endif
@@ -99,7 +112,7 @@ google-perftools link only with libunwind.so.7 .
else
if ARCH_PPC32
lib_LTLIBRARIES += libunwind-ppc32.la
-@@ -454,7 +454,7 @@ if ARCH_PPC32
+@@ -510,7 +510,7 @@ if ARCH_PPC32
if !REMOTE_ONLY
libunwind_ppc32_la_LIBADD += libunwind.la -lc
endif
@@ -108,16 +121,25 @@ google-perftools link only with libunwind.so.7 .
else
if ARCH_PPC64
lib_LTLIBRARIES += libunwind-ppc64.la
-@@ -466,7 +466,7 @@ if ARCH_PPC64
+@@ -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
- endif # ARCH_PPC32
-@@ -480,7 +480,7 @@ endif # ARCH_ARM
+@@ -549,7 +549,7 @@ endif # ARCH_ARM
# libunwind-setjmp depends on libunwind-$(arch). Therefore must be added
# at the end.
if !REMOTE_ONLY
@@ -126,29 +148,20 @@ google-perftools link only with libunwind.so.7 .
endif
#
---- libunwind-1.0.1-orig/tests/Makefile.am 2011-09-11 05:06:41.000000000 +0200
-+++ libunwind-1.0.1/tests/Makefile.am 2011-09-15 13:56:16.000000000 +0200
-@@ -27,7 +27,7 @@ if ARCH_IA64
- Gia64-test-nat Lia64-test-nat \
- Gia64-test-rbs Lia64-test-rbs \
- Gia64-test-readonly Lia64-test-readonly \
-- ia64-test-setjmp ia64-test-sig
-+ ia64-test-sig
- else
- if ARCH_PPC64
- if USE_ALTIVEC
-@@ -44,8 +44,9 @@ endif #ARCH_IA64
+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 \
-+ test-mem test-ptrace \
- Ltest-nomalloc Ltest-nocalloc rs-race
-+# test-setjmp
- noinst_PROGRAMS_cdep = forker mapper test-ptrace-misc \
+- 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
-
-@@ -123,8 +124,8 @@ if USE_ELFXX
+@@ -134,8 +134,8 @@ if USE_ELFXX
LIBUNWIND_ELF = $(top_builddir)/src/libunwind-elfxx.la
endif
@@ -159,7 +172,7 @@ google-perftools link only with libunwind.so.7 .
test_async_sig_LDADD = $(LIBUNWIND_local) -lpthread
test_flush_cache_LDADD = $(LIBUNWIND_local)
-@@ -159,6 +160,6 @@ Lperf_simple_LDADD = $(LIBUNWIND_local)
+@@ -172,8 +172,8 @@ Lperf_simple_LDADD = $(LIBUNWIND_local)
Ltest_trace_LDADD = $(LIBUNWIND_local)
Lperf_trace_LDADD = $(LIBUNWIND_local)
@@ -168,3 +181,5 @@ google-perftools link only with libunwind.so.7 .
+#test_setjmp_LDADD = $(LIBUNWIND_setjmp)
+#ia64_test_setjmp_LDADD = $(LIBUNWIND_setjmp)
+ if BUILD_COREDUMP
+ test_coredump_unwind_LDADD = $(LIBUNWIND_coredump) $(LIBUNWIND)
diff --git a/libunwind.spec b/libunwind.spec
index aca3b5a..64888b7 100644
--- a/libunwind.spec
+++ b/libunwind.spec
@@ -3,15 +3,13 @@
Summary: An unwinding library
Name: libunwind
-Version: 1.0.1
-Release: 5%{?dist}
+Version: 1.1
+Release: 1%{?dist}
License: BSD
Group: Development/Debuggers
Source: http://download.savannah.gnu.org/releases/libunwind/libunwind-%{version}.tar.gz
#Fedora specific patch
Patch1: libunwind-disable-setjmp.patch
-Patch2: libunwind-install-ptrace.patch
-Patch3: libunwind-arm-register-rename.patch
URL: http://savannah.nongnu.org/projects/libunwind
ExclusiveArch: %{arm} hppa ia64 mips ppc ppc64 %{ix86} x86_64
@@ -22,7 +20,6 @@ BuildRequires: automake libtool autoconf
%description
Libunwind provides a C ABI to determine the call-chain of a program.
-This version of libunwind is targetted for the ia64 platform.
%package devel
Summary: Development package for libunwind
@@ -36,8 +33,6 @@ libunwind.
%prep
%setup -q
%patch1 -p1
-%patch2 -p1
-%patch3 -p1 -b .arm
%build
aclocal
@@ -82,12 +77,19 @@ echo ====================TESTSUITE DISABLED=========================
%defattr(-,root,root,-)
%{_libdir}/libunwind*.so
%{_libdir}/libunwind-ptrace.a
+%{_libdir}/pkgconfig/libunwind*.pc
%{_mandir}/*/*
# <unwind.h> does not get installed for REMOTE_ONLY targets - check it.
%{_includedir}/unwind.h
%{_includedir}/libunwind*.h
%changelog
+* Mon Feb 18 2013 Kyle McMartin <kmcmarti at redhat.com> 1.1-1
+- Update to upstream v1.1
+- libunwind-install-ptrace.patch: drop upstream patch
+- libunwind-arm-register-rename.patch: fixed upstream
+- Add pkg-config files to libunwind-devel
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/sources b/sources
index 79522d0..94f0441 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-993e47cca7315e22239c3e0d987e94e0 libunwind-1.0.1.tar.gz
+fb4ea2f6fbbe45bf032cd36e586883ce libunwind-1.1.tar.gz
More information about the scm-commits
mailing list