* [gentoo-commits] repo/gentoo:master commit in: sys-libs/libunwind/files/
@ 2017-01-15 7:27 Aaron Bauman
0 siblings, 0 replies; 5+ messages in thread
From: Aaron Bauman @ 2017-01-15 7:27 UTC (permalink / raw
To: gentoo-commits
commit: 7b772e5232475dd2f931edd8f93a88e3769e044f
Author: Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 15 07:27:10 2017 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sun Jan 15 07:27:10 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b772e52
sys-libs/libunwind: remove stale patches
Package-Manager: portage-2.3.0
.../files/libunwind-0.99-disable-setjmp.patch | 213 ---------------------
.../libunwind-0.99-implicit-declaration.patch | 17 --
.../files/libunwind-1.0.1-disable-setjmp.patch | 37 ----
.../libunwind/files/libunwind-1.0.1-ia64.patch | 133 -------------
4 files changed, 400 deletions(-)
diff --git a/sys-libs/libunwind/files/libunwind-0.99-disable-setjmp.patch b/sys-libs/libunwind/files/libunwind-0.99-disable-setjmp.patch
deleted file mode 100644
index 698d2ac..00000000
--- a/sys-libs/libunwind/files/libunwind-0.99-disable-setjmp.patch
+++ /dev/null
@@ -1,213 +0,0 @@
-http://cvs.fedoraproject.org/viewvc/rpms/libunwind/devel/libunwind-disable-setjmp.patch?revision=1.1&view=markup
-http://bugs.gentoo.org/show_bug.cgi?id=299344
-
-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 .
-
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -12,7 +12,7 @@ lib_LTLIBRARIES_cdep_setjmp =
- else
- LIBRARIES_cdep = libunwind-ptrace.a
- lib_LTLIBRARIES_cdep = libunwind.la
--lib_LTLIBRARIES_cdep_setjmp = libunwind-setjmp.la
-+lib_LTLIBRARIES_cdep_setjmp = #libunwind-setjmp.la
- endif
-
- ### libunwind-ptrace:
-@@ -27,21 +27,21 @@ libunwind_ptrace_a_SOURCES = \
- ptrace/_UPT_reg_offset.c ptrace/_UPT_resume.c
-
- ### libunwind-setjmp:
--libunwind_setjmp_la_LDFLAGS = $(COMMON_SO_LDFLAGS) \
-- -version-info $(SETJMP_SO_VERSION)
--libunwind_setjmp_la_LIBADD = libunwind-$(arch).la -lc
--libunwind_setjmp_la_SOURCES_common = setjmp/setjmp_i.h \
-- setjmp/longjmp.c \
-- setjmp/siglongjmp.c
--libunwind_setjmp_la_SOURCES_arm = arm/siglongjmp.S
--libunwind_setjmp_la_SOURCES_ia64 = ia64/setjmp.S ia64/sigsetjmp.S \
-- ia64/longjmp.S ia64/siglongjmp.S
--libunwind_setjmp_la_SOURCES_hppa = hppa/siglongjmp.S
--libunwind_setjmp_la_SOURCES_mips = mips/siglongjmp.S
--libunwind_setjmp_la_SOURCES_x86 = x86/longjmp.S x86/siglongjmp.S
--libunwind_setjmp_la_SOURCES_x86_64 = x86_64/longjmp.S x86_64/siglongjmp.S
--libunwind_setjmp_la_SOURCES_ppc64 = ppc/longjmp.S ppc/siglongjmp.S
--libunwind_setjmp_la_SOURCES_ppc32 = ppc/longjmp.S ppc/siglongjmp.S
-+#libunwind_setjmp_la_LDFLAGS = $(COMMON_SO_LDFLAGS) \
-+# -version-info $(SETJMP_SO_VERSION)
-+#libunwind_setjmp_la_LIBADD = libunwind-$(arch).la -lc
-+#libunwind_setjmp_la_SOURCES_common = setjmp/setjmp_i.h \
-+# setjmp/longjmp.c \
-+# setjmp/siglongjmp.c
-+#libunwind_setjmp_la_SOURCES_arm = arm/siglongjmp.S
-+#libunwind_setjmp_la_SOURCES_ia64 = ia64/setjmp.S ia64/sigsetjmp.S \
-+# ia64/longjmp.S ia64/siglongjmp.S
-+#libunwind_setjmp_la_SOURCES_hppa = hppa/siglongjmp.S
-+#libunwind_setjmp_la_SOURCES_mips = mips/siglongjmp.S
-+#libunwind_setjmp_la_SOURCES_x86 = x86/longjmp.S x86/siglongjmp.S
-+#libunwind_setjmp_la_SOURCES_x86_64 = x86_64/longjmp.S x86_64/siglongjmp.S
-+#libunwind_setjmp_la_SOURCES_ppc64 = ppc/longjmp.S ppc/siglongjmp.S
-+#libunwind_setjmp_la_SOURCES_ppc32 = ppc/longjmp.S ppc/siglongjmp.S
-
- ### libunwind:
-
-@@ -359,8 +359,8 @@ if ARCH_ARM
- if !REMOTE_ONLY
- libunwind_arm_la_LIBADD = libunwind.la -lc
- endif
-- libunwind_setjmp_la_SOURCES = $(libunwind_setjmp_la_SOURCES_common) \
-- $(libunwind_setjmp_la_SOURCES_arm)
-+# libunwind_setjmp_la_SOURCES = $(libunwind_setjmp_la_SOURCES_common) \
-+# $(libunwind_setjmp_la_SOURCES_arm)
- else
- if ARCH_IA64
- ia64_mk_Gcursor_i_SOURCES = ia64/mk_Gcursor_i.c
-@@ -378,8 +378,8 @@ Lcursor_i.h: ia64/mk_Lcursor_i
- if !REMOTE_ONLY
- libunwind_ia64_la_LIBADD = libunwind.la -lc
- endif
-- libunwind_setjmp_la_SOURCES = $(libunwind_setjmp_la_SOURCES_common) \
-- $(libunwind_setjmp_la_SOURCES_ia64)
-+# libunwind_setjmp_la_SOURCES = $(libunwind_setjmp_la_SOURCES_common) \
-+# $(libunwind_setjmp_la_SOURCES_ia64)
- else
- if ARCH_HPPA
- lib_LTLIBRARIES_arch = libunwind-hppa.la
-@@ -389,8 +389,8 @@ if ARCH_HPPA
- if !REMOTE_ONLY
- libunwind_hppa_la_LIBADD = libunwind.la -lc
- endif
-- libunwind_setjmp_la_SOURCES = $(libunwind_setjmp_la_SOURCES_common) \
-- $(libunwind_setjmp_la_SOURCES_hppa)
-+# libunwind_setjmp_la_SOURCES = $(libunwind_setjmp_la_SOURCES_common) \
-+# $(libunwind_setjmp_la_SOURCES_hppa)
- else
- if ARCH_MIPS
- lib_LTLIBRARIES_arch = libunwind-mips.la
-@@ -400,8 +400,8 @@ if ARCH_MIPS
- if !REMOTE_ONLY
- libunwind_mips_la_LIBADD = libunwind.la -lc
- endif
-- libunwind_setjmp_la_SOURCES = $(libunwind_setjmp_la_SOURCES_common) \
-- $(libunwind_setjmp_la_SOURCES_mips)
-+# libunwind_setjmp_la_SOURCES = $(libunwind_setjmp_la_SOURCES_common) \
-+# $(libunwind_setjmp_la_SOURCES_mips)
- else
- if ARCH_X86
- lib_LTLIBRARIES_arch = libunwind-x86.la
-@@ -411,8 +411,8 @@ if ARCH_X86
- if !REMOTE_ONLY
- libunwind_x86_la_LIBADD = libunwind.la -lc
- endif
-- libunwind_setjmp_la_SOURCES = $(libunwind_setjmp_la_SOURCES_common) \
-- $(libunwind_setjmp_la_SOURCES_x86)
-+# libunwind_setjmp_la_SOURCES = $(libunwind_setjmp_la_SOURCES_common) \
-+# $(libunwind_setjmp_la_SOURCES_x86)
- else
- if ARCH_X86_64
- lib_LTLIBRARIES_arch = libunwind-x86_64.la
-@@ -422,8 +422,8 @@ if ARCH_X86_64
- if !REMOTE_ONLY
- libunwind_x86_64_la_LIBADD = libunwind.la -lc
- endif
-- libunwind_setjmp_la_SOURCES = $(libunwind_setjmp_la_SOURCES_common) \
-- $(libunwind_setjmp_la_SOURCES_x86_64)
-+# libunwind_setjmp_la_SOURCES = $(libunwind_setjmp_la_SOURCES_common) \
-+# $(libunwind_setjmp_la_SOURCES_x86_64)
- else
- if ARCH_PPC32
- lib_LTLIBRARIES_arch = libunwind-ppc32.la
-@@ -433,8 +433,8 @@ if ARCH_PPC32
- if !REMOTE_ONLY
- libunwind_ppc32_la_LIBADD = libunwind.la -lc
- endif
-- libunwind_setjmp_la_SOURCES = $(libunwind_setjmp_la_SOURCES_common) \
-- $(libunwind_setjmp_la_SOURCES_ppc32)
-+# libunwind_setjmp_la_SOURCES = $(libunwind_setjmp_la_SOURCES_common) \
-+# $(libunwind_setjmp_la_SOURCES_ppc32)
- else
- if ARCH_PPC64
- lib_LTLIBRARIES_arch = libunwind-ppc64.la
-@@ -444,8 +444,8 @@ if ARCH_PPC64
- if !REMOTE_ONLY
- libunwind_ppc64_la_LIBADD = libunwind.la -lc
- endif
-- libunwind_setjmp_la_SOURCES = $(libunwind_setjmp_la_SOURCES_common) \
-- $(libunwind_setjmp_la_SOURCES_ppc64)
-+# libunwind_setjmp_la_SOURCES = $(libunwind_setjmp_la_SOURCES_common) \
-+# $(libunwind_setjmp_la_SOURCES_ppc64)
-
- endif # ARCH_PPC64
- endif # ARCH_PPC32
-@@ -466,7 +466,7 @@ libunwind_la_LIBADD = -lc $(LIBCRTS)
-
- lib_LIBRARIES = $(LIBRARIES_cdep)
- lib_LTLIBRARIES = $(lib_LTLIBRARIES_cdep) $(lib_LTLIBRARIES_arch) \
-- $(lib_LTLIBRARIES_cdep_setjmp)
-+ # $(lib_LTLIBRARIES_cdep_setjmp)
-
- AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/include/tdep-$(arch) -I.
- AM_CCASFLAGS = $(AM_CPPFLAGS)
-@@ -488,16 +488,16 @@ EXTRA_DIST = elfxx.h elfxx.c unwind/unwind-internal.h \
- $(libunwind_mips_la_SOURCES_mips) \
- $(libunwind_x86_la_SOURCES_x86) \
- $(libunwind_x86_64_la_SOURCES_x86_64) \
-- $(libunwind_ptrace_a_SOURCES) \
-- $(libunwind_setjmp_la_SOURCES_common) \
-- $(libunwind_setjmp_la_SOURCES_arm) \
-- $(libunwind_setjmp_la_SOURCES_hppa) \
-- $(libunwind_setjmp_la_SOURCES_ia64) \
-- $(libunwind_setjmp_la_SOURCES_mips) \
-- $(libunwind_setjmp_la_SOURCES_x86) \
-- $(libunwind_setjmp_la_SOURCES_x86_64) \
-- $(libunwind_setjmp_la_SOURCES_ppc32) \
-- $(libunwind_setjmp_la_SOURCES_ppc64)
-+ $(libunwind_ptrace_a_SOURCES)
-+# $(libunwind_setjmp_la_SOURCES_common) \
-+# $(libunwind_setjmp_la_SOURCES_arm) \
-+# $(libunwind_setjmp_la_SOURCES_hppa) \
-+# $(libunwind_setjmp_la_SOURCES_ia64) \
-+# $(libunwind_setjmp_la_SOURCES_mips) \
-+# $(libunwind_setjmp_la_SOURCES_x86) \
-+# $(libunwind_setjmp_la_SOURCES_x86_64) \
-+# $(libunwind_setjmp_la_SOURCES_ppc32) \
-+# $(libunwind_setjmp_la_SOURCES_ppc64)
-
-
- # The -version-info flag accepts an argument of the form
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -24,7 +24,8 @@ 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
-+# ia64-test-setjmp
- else
- if ARCH_PPC64
- if USE_ALTIVEC
-@@ -40,8 +41,9 @@ endif #ARCH_IA64
- Gtest-resume-sig Ltest-resume-sig \
- Gtest-dyn1 Ltest-dyn1 \
- test-async-sig test-flush-cache test-init-remote \
-- test-mem test-setjmp test-ptrace \
-+ test-mem test-ptrace \
- Ltest-nomalloc
-+# test-setjmp
- noinst_PROGRAMS_cdep = forker mapper test-ptrace-misc test-varargs \
- Gperf-simple Lperf-simple
-
-@@ -93,8 +95,8 @@ test_ptrace_misc_SOURCES = test-ptrace-misc.c ident.c
- LIBUNWIND = ../src/libunwind-$(arch).la $(LIBUNWIND_local)
- LDADD = $(LIBUNWIND)
-
--test_setjmp_LDADD = ../src/libunwind-setjmp.la $(LIBUNWIND_local)
--ia64_test_setjmp_LDADD = ../src/libunwind-setjmp.la $(LIBUNWIND_local)
-+# test_setjmp_LDADD = ../src/libunwind-setjmp.la $(LIBUNWIND_local)
-+# ia64_test_setjmp_LDADD = ../src/libunwind-setjmp.la $(LIBUNWIND_local)
- test_ptrace_LDADD = ../src/libunwind-ptrace.a $(LIBUNWIND)
- Ltest_concurrent_LDADD = $(LIBUNWIND) -lpthread
- Gtest_concurrent_LDADD = $(LIBUNWIND) -lpthread
diff --git a/sys-libs/libunwind/files/libunwind-0.99-implicit-declaration.patch b/sys-libs/libunwind/files/libunwind-0.99-implicit-declaration.patch
deleted file mode 100644
index 6387f0a..00000000
--- a/sys-libs/libunwind/files/libunwind-0.99-implicit-declaration.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=289445#c2
-
---- src/x86_64/unwind_i.h
-+++ src/x86_64/unwind_i.h
-@@ -65,6 +65,12 @@
- extern void x86_64_local_addr_space_init (void);
- extern int x86_64_local_resume (unw_addr_space_t as, unw_cursor_t *cursor,
- void *arg);
-+
-+/* implemented in setcontext.S */
-+#if defined(__linux)
-+extern int _Ux86_64_setcontext (const ucontext_t *ucp);
-+#endif
-+
- #if 0
- extern dwarf_loc_t x86_64_scratch_loc (struct cursor *c, unw_regnum_t reg);
- #endif
diff --git a/sys-libs/libunwind/files/libunwind-1.0.1-disable-setjmp.patch b/sys-libs/libunwind/files/libunwind-1.0.1-disable-setjmp.patch
deleted file mode 100644
index 442a5df..00000000
--- a/sys-libs/libunwind/files/libunwind-1.0.1-disable-setjmp.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-http://cvs.fedoraproject.org/viewvc/rpms/libunwind/devel/libunwind-disable-setjmp.patch?revision=1.1&view=markup
-http://bugs.gentoo.org/299344
-
-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 .
-
---- libunwind-1.0.1/src/Makefile.am
-+++ libunwind-1.0.1/src/Makefile.am
-@@ -9,6 +9,3 @@
- # libunwind-setjmp depends on libunwind-$(arch). Therefore must be added
- # at the end.
--if !REMOTE_ONLY
--lib_LTLIBRARIES += libunwind-setjmp.la
--endif
-
- #
---- libunwind-1.0.1/tests/Makefile.am
-+++ libunwind-1.0.1/tests/Makefile.am
-@@ -27,7 +27,7 @@
- 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,7 +44,7 @@
- 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
- noinst_PROGRAMS_cdep = forker mapper test-ptrace-misc \
- Gperf-simple Lperf-simple
diff --git a/sys-libs/libunwind/files/libunwind-1.0.1-ia64.patch b/sys-libs/libunwind/files/libunwind-1.0.1-ia64.patch
deleted file mode 100644
index 0639e64..00000000
--- a/sys-libs/libunwind/files/libunwind-1.0.1-ia64.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-fix from upstream for building on ia64
-
-https://bugs.gentoo.org/425736
-
-From 197571915c70b9ccd0978c13f12acb2a5f3058d4 Mon Sep 17 00:00:00 2001
-From: Ken Werner <ken.werner@linaro.org>
-Date: Tue, 11 Oct 2011 15:13:35 +0200
-Subject: [PATCH] Change _UPTi_find_unwind_table to return an integer.
-
-This keeps the definition on IA64 and all the other architectures in sync with
-the declaration of _UPTi_find_unwind_table. This also mimics the behaviour of
-what's done for local unwinding and allows the function to provide more than
-one way to undwind.
-
-Signed-off-by: Ken Werner <ken.werner@linaro.org>
----
- src/ptrace/_UPT_find_proc_info.c | 8 ++++----
- src/ptrace/_UPT_get_dyn_info_list_addr.c | 6 ++----
- src/ptrace/_UPT_internal.h | 2 +-
- 3 files changed, 7 insertions(+), 9 deletions(-)
-
-diff --git a/src/ptrace/_UPT_find_proc_info.c b/src/ptrace/_UPT_find_proc_info.c
-index 44feb34..7aaa0c2 100644
---- a/src/ptrace/_UPT_find_proc_info.c
-+++ b/src/ptrace/_UPT_find_proc_info.c
-@@ -95,7 +95,7 @@ find_gp (struct UPT_info *ui, Elf64_Phdr *pdyn, Elf64_Addr load_base)
- return gp;
- }
-
--HIDDEN unw_dyn_info_t *
-+HIDDEN int
- _UPTi_find_unwind_table (struct UPT_info *ui, unw_addr_space_t as,
- char *path, unw_word_t segbase, unw_word_t mapoff,
- unw_word_t ip)
-@@ -105,7 +105,7 @@ _UPTi_find_unwind_table (struct UPT_info *ui, unw_addr_space_t as,
- int i;
-
- if (!_Uelf64_valid_object (&ui->ei))
-- return NULL;
-+ return -UNW_ENOINFO;
-
- ehdr = ui->ei.image;
- phdr = (Elf64_Phdr *) ((char *) ui->ei.image + ehdr->e_phoff);
-@@ -132,7 +132,7 @@ _UPTi_find_unwind_table (struct UPT_info *ui, unw_addr_space_t as,
- }
- }
- if (!ptxt || !punw)
-- return NULL;
-+ return 0;
-
- ui->di_cache.start_ip = segbase;
- ui->di_cache.end_ip = ui->di_cache.start_ip + ptxt->p_memsz;
-@@ -143,7 +143,7 @@ _UPTi_find_unwind_table (struct UPT_info *ui, unw_addr_space_t as,
- ui->di_cache.u.ti.table_len = punw->p_memsz / sizeof (unw_word_t);
- ui->di_cache.u.ti.table_data = (unw_word_t *)
- ((char *) ui->ei.image + (punw->p_vaddr - ptxt->p_vaddr));
-- return &ui->di_cache;
-+ return 1;
- }
-
- #elif UNW_TARGET_X86 || UNW_TARGET_X86_64 || UNW_TARGET_HPPA \
-
-From 962366dace4fed902ad5e89df1b34c13c3224b8b Mon Sep 17 00:00:00 2001
-From: Arun Sharma <asharma@fb.com>
-Date: Fri, 23 Sep 2011 11:11:34 -0700
-Subject: [PATCH] Fixup compile errors on ia64.
-
-Suggested-by: Harald Servat <harald.servat@bsc.es>
----
- src/ptrace/_UPT_get_dyn_info_list_addr.c | 2 +-
- src/ptrace/_UPT_internal.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/ptrace/_UPT_get_dyn_info_list_addr.c b/src/ptrace/_UPT_get_dyn_info_list_addr.c
-index d82d4e4..ba9c795 100644
---- a/src/ptrace/_UPT_get_dyn_info_list_addr.c
-+++ b/src/ptrace/_UPT_get_dyn_info_list_addr.c
-@@ -62,7 +62,7 @@ get_list_addr (unw_addr_space_t as, unw_word_t *dil_addr, void *arg,
-
- Debug (16, "checking object %s\n", path);
-
-- di = _UPTi_find_unwind_table (ui, as, path, lo, off);
-+ di = _UPTi_find_unwind_table (ui, as, path, lo, off, 0);
- if (di)
- {
- res = _Uia64_find_dyn_list (as, di, arg);
-From d93d96ad833390519ea68a2df22dd55dd26a3214 Mon Sep 17 00:00:00 2001
-From: Martin Milata <mmilata@redhat.com>
-Date: Tue, 22 May 2012 11:51:06 +0200
-Subject: [PATCH] Fix compilation on IA64
-
- - Add tdep macro for {dwarf,ia64}_find_unwind_table so that ia64
- doesn't try to use dwarf code.
- - Fix extraneous #if.
- - Fix mistyped filename in Makefile.am.
- - Link ia64-specific tests with correct libraries.
-
-Signed-off-by: Martin Milata <mmilata@redhat.com>
----
- include/tdep-arm/libunwind_i.h | 1 +
- include/tdep-hppa/libunwind_i.h | 1 +
- include/tdep-ia64/libunwind_i.h | 1 +
- include/tdep-mips/libunwind_i.h | 1 +
- include/tdep-ppc32/libunwind_i.h | 1 +
- include/tdep-ppc64/libunwind_i.h | 1 +
- include/tdep-x86/libunwind_i.h | 1 +
- include/tdep-x86_64/libunwind_i.h | 1 +
- src/Makefile.am | 4 ++--
- src/ia64/Gfind_unwind_table.c | 3 ---
- src/ptrace/_UPT_find_proc_info.c | 2 +-
- src/ptrace/_UPT_get_dyn_info_list_addr.c | 2 +-
- tests/Makefile.am | 11 +++++++++++
- 13 files changed, 23 insertions(+), 7 deletions(-)
-
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 26e7987..4b3bce3 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -165,3 +165,14 @@ test_setjmp_LDADD = $(LIBUNWIND_setjmp)
- test_setjmp_LDADD = $(LIBUNWIND_setjmp)
- ia64_test_setjmp_LDADD = $(LIBUNWIND_setjmp)
-
-+
-+Gia64_test_nat_LDADD = $(LIBUNWIND) $(LIBUNWIND_local)
-+Gia64_test_stack_LDADD = $(LIBUNWIND) $(LIBUNWIND_local)
-+Gia64_test_rbs_LDADD = $(LIBUNWIND) $(LIBUNWIND_local)
-+Gia64_test_readonly_LDADD = $(LIBUNWIND) $(LIBUNWIND_local)
-+Lia64_test_nat_LDADD = $(LIBUNWIND_local)
-+Lia64_test_stack_LDADD = $(LIBUNWIND_local)
-+Lia64_test_rbs_LDADD = $(LIBUNWIND_local)
-+Lia64_test_readonly_LDADD = $(LIBUNWIND_local)
-+ia64_test_dyn1_LDADD = $(LIBUNWIND)
-+ia64_test_sig_LDADD = $(LIBUNWIND)
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-libs/libunwind/files/
@ 2019-12-12 20:52 Aaron Bauman
0 siblings, 0 replies; 5+ messages in thread
From: Aaron Bauman @ 2019-12-12 20:52 UTC (permalink / raw
To: gentoo-commits
commit: 51bed4fe21ed5f166206ac7ab51fd937ed75d42c
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Thu Dec 12 20:48:03 2019 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Thu Dec 12 20:52:16 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51bed4fe
sys-libs/libunwind: remove unused patches
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13959
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
.../files/libunwind-1.1-fix-CVE-2015-3239.patch | 15 ------
sys-libs/libunwind/files/libunwind-1.1-lzma.patch | 63 ----------------------
2 files changed, 78 deletions(-)
diff --git a/sys-libs/libunwind/files/libunwind-1.1-fix-CVE-2015-3239.patch b/sys-libs/libunwind/files/libunwind-1.1-fix-CVE-2015-3239.patch
deleted file mode 100644
index 153108bbb15..00000000000
--- a/sys-libs/libunwind/files/libunwind-1.1-fix-CVE-2015-3239.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-taken from Fedora
-
-https://bugs.gentoo.org/585830
-
---- libunwind-1.1/include/dwarf_i.h.CVE20153239
-+++ libunwind-1.1/include/dwarf_i.h
-@@ -20,7 +20,7 @@
- extern const uint8_t dwarf_to_unw_regnum_map[DWARF_REGNUM_MAP_LENGTH];
- /* REG is evaluated multiple times; it better be side-effects free! */
- # define dwarf_to_unw_regnum(reg) \
-- (((reg) <= DWARF_REGNUM_MAP_LENGTH) ? dwarf_to_unw_regnum_map[reg] : 0)
-+ (((reg) < DWARF_REGNUM_MAP_LENGTH) ? dwarf_to_unw_regnum_map[reg] : 0)
- #endif
-
- #ifdef UNW_LOCAL_ONLY
diff --git a/sys-libs/libunwind/files/libunwind-1.1-lzma.patch b/sys-libs/libunwind/files/libunwind-1.1-lzma.patch
deleted file mode 100644
index 09cefa02853..00000000000
--- a/sys-libs/libunwind/files/libunwind-1.1-lzma.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 38c349bb000b427c376e756e3ecdb764a2b4d297 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sat, 15 Feb 2014 21:00:59 -0500
-Subject: [PATCH] link sublibs against liblzma as needed
-
-The coredump/elf32/elf64/elfxx libs use lzma funcs but don't link against
-it. This produces sub-shared libs that don't link against lzma and can
-make the linker angry due to underlinking like so:
-
-libtool: link: x86_64-pc-linux-gnu-gcc -O2 -march=amdfam10 -pipe -g \
- -frecord-gcc-switches -Wimplicit-function-declaration -fexceptions \
- -Wall -Wsign-compare -Wl,-O1 -Wl,--hash-style=gnu \
- -o .libs/test-coredump-unwind test-coredump-unwind.o \
- ../src/.libs/libunwind-coredump.so ../src/.libs/libunwind-x86_64.so
-../src/.libs/libunwind-coredump.so: error: undefined reference to 'lzma_stream_footer_decode'
-../src/.libs/libunwind-coredump.so: error: undefined reference to 'lzma_index_buffer_decode'
-../src/.libs/libunwind-coredump.so: error: undefined reference to 'lzma_index_size'
-../src/.libs/libunwind-coredump.so: error: undefined reference to 'lzma_index_end'
-../src/.libs/libunwind-coredump.so: error: undefined reference to 'lzma_index_uncompressed_size'
-../src/.libs/libunwind-coredump.so: error: undefined reference to 'lzma_stream_buffer_decode'
-collect2: error: ld returned 1 exit status
-
-So add LIBLZMA to the right LIBADD for each of these libraries.
-
-URL: https://bugs.gentoo.org/444050
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- src/Makefile.am | 4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -169,7 +169,7 @@ libunwind_arm_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(libunwind_arm_la_LDFLAGS) $(LDFLAGS) -o $@
- @ARCH_ARM_TRUE@am_libunwind_arm_la_rpath = -rpath $(libdir)
--libunwind_coredump_la_LIBADD =
-+libunwind_coredump_la_LIBADD = $(LIBLZMA)
- am__libunwind_coredump_la_SOURCES_DIST = coredump/_UCD_accessors.c \
- coredump/_UCD_create.c coredump/_UCD_destroy.c \
- coredump/_UCD_access_mem.c coredump/_UCD_elf_map_image.c \
-@@ -214,15 +214,15 @@ am_libunwind_dwarf_local_la_OBJECTS = dwarf/Lexpr.lo dwarf/Lfde.lo \
- libunwind_dwarf_local_la_OBJECTS = \
- $(am_libunwind_dwarf_local_la_OBJECTS)
- @REMOTE_ONLY_FALSE@@USE_DWARF_TRUE@am_libunwind_dwarf_local_la_rpath =
--libunwind_elf32_la_LIBADD =
-+libunwind_elf32_la_LIBADD = $(LIBLZMA)
- am_libunwind_elf32_la_OBJECTS = elf32.lo
- libunwind_elf32_la_OBJECTS = $(am_libunwind_elf32_la_OBJECTS)
- @USE_ELF32_TRUE@am_libunwind_elf32_la_rpath =
--libunwind_elf64_la_LIBADD =
-+libunwind_elf64_la_LIBADD = $(LIBLZMA)
- am_libunwind_elf64_la_OBJECTS = elf64.lo
- libunwind_elf64_la_OBJECTS = $(am_libunwind_elf64_la_OBJECTS)
- @USE_ELF64_TRUE@am_libunwind_elf64_la_rpath =
--libunwind_elfxx_la_LIBADD =
-+libunwind_elfxx_la_LIBADD = $(LIBLZMA)
- am_libunwind_elfxx_la_OBJECTS = elfxx.lo
- libunwind_elfxx_la_OBJECTS = $(am_libunwind_elfxx_la_OBJECTS)
- @USE_ELFXX_TRUE@am_libunwind_elfxx_la_rpath =
---
-1.8.5.5
-
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-libs/libunwind/files/
@ 2020-07-06 18:40 Sergei Trofimovich
0 siblings, 0 replies; 5+ messages in thread
From: Sergei Trofimovich @ 2020-07-06 18:40 UTC (permalink / raw
To: gentoo-commits
commit: 9a837fb82b78ecbbc91dbb1b629e6967f28b2368
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Jul 6 17:26:25 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Jul 6 18:40:28 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a837fb8
sys-libs/libunwind: remove unused patches
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16615
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
.../files/libunwind-1.2-ia64-undwarf.patch | 17 --------
.../files/libunwind-1.2.1-arm-__asm__.patch | 47 ----------------------
.../files/libunwind-1.2.1-fix_version_macros.patch | 13 ------
.../files/libunwind-1.2.1-no-PROTECTED.patch | 14 -------
4 files changed, 91 deletions(-)
diff --git a/sys-libs/libunwind/files/libunwind-1.2-ia64-undwarf.patch b/sys-libs/libunwind/files/libunwind-1.2-ia64-undwarf.patch
deleted file mode 100644
index 1e3e2489828..00000000000
--- a/sys-libs/libunwind/files/libunwind-1.2-ia64-undwarf.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/src/mi/Gget_proc_name.c b/src/mi/Gget_proc_name.c
-index 5376f82..64d2503 100644
---- a/src/mi/Gget_proc_name.c
-+++ b/src/mi/Gget_proc_name.c
-@@ -106,8 +106,12 @@ unw_get_proc_name (unw_cursor_t *cursor, char *buf, size_t buf_len,
- ip = tdep_get_ip (c);
-+#if !defined(__ia64)
- if (c->dwarf.use_prev_instr)
- --ip;
-+#endif
- error = get_proc_name (tdep_get_as (c), ip, buf, buf_len, offp,
- tdep_get_as_arg (c));
-+#if !defined(__ia64)
- if (c->dwarf.use_prev_instr && offp != NULL && error == 0)
- *offp += 1;
-+#endif
- return error;
diff --git a/sys-libs/libunwind/files/libunwind-1.2.1-arm-__asm__.patch b/sys-libs/libunwind/files/libunwind-1.2.1-arm-__asm__.patch
deleted file mode 100644
index 4b6debabefc..00000000000
--- a/sys-libs/libunwind/files/libunwind-1.2.1-arm-__asm__.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-https://bugs.gentoo.org/635674
-
-From ca6b6f3ad9190814ef7869e8c7e73dae0922f647 Mon Sep 17 00:00:00 2001
-From: Romain Naour <romain.naour@smile.fr>
-Date: Mon, 3 Jul 2017 15:31:10 +0200
-Subject: [PATCH] libunwind-arm: fix build failure due to asm()
-
-mesa3d on ARM build with libunwind support enabled fail to build due to asm()
-function used when building with -std=c99.
-The gcc documentation [1] suggest to use __asm__ instead of asm.
-
-Fixes:
-https://urldefense.proofpoint.com/v2/url?u=http-3A__autobuild.buildroot.net_results_3ef_3efe156b6494e4392b6c31de447ee2c72acc1a53&d=DwICAg&c=5VD0RTtNlTh3ycd41b3MUw&r=vou6lT5jmE_fWQWZZgNrsMWu4RT87QAB9V07tPHlP5U&m=BlAszRQ0vewy5vW7raCh9FmNOACKez_juz55zoiNfUs&s=4sXL6_rFriQz7qi5ygKXBIVHMc7YSdCBnkkHoi347CU&e=
-
-[1] https://gcc.gnu.org/onlinedocs/gcc/Alternate-Keywords.html#Alternate-Keywords
-
-Signed-off-by: Romain Naour <romain.naour@smile.fr>
-Cc: Bernd Kuhls <bernd.kuhls@t-online.de>
----
- include/libunwind-arm.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/include/libunwind-arm.h b/include/libunwind-arm.h
-index f208487a..1c856faf 100644
---- a/include/libunwind-arm.h
-+++ b/include/libunwind-arm.h
-@@ -265,7 +265,7 @@ unw_tdep_context_t;
- #ifndef __thumb__
- #define unw_tdep_getcontext(uc) (({ \
- unw_tdep_context_t *unw_ctx = (uc); \
-- register unsigned long *unw_base asm ("r0") = unw_ctx->regs; \
-+ register unsigned long *unw_base __asm__ ("r0") = unw_ctx->regs; \
- __asm__ __volatile__ ( \
- "stmia %[base], {r0-r15}" \
- : : [base] "r" (unw_base) : "memory"); \
-@@ -273,7 +273,7 @@ unw_tdep_context_t;
- #else /* __thumb__ */
- #define unw_tdep_getcontext(uc) (({ \
- unw_tdep_context_t *unw_ctx = (uc); \
-- register unsigned long *unw_base asm ("r0") = unw_ctx->regs; \
-+ register unsigned long *unw_base __asm__ ("r0") = unw_ctx->regs; \
- __asm__ __volatile__ ( \
- ".align 2\nbx pc\nnop\n.code 32\n" \
- "stmia %[base], {r0-r15}\n" \
---
-2.18.0
-
diff --git a/sys-libs/libunwind/files/libunwind-1.2.1-fix_version_macros.patch b/sys-libs/libunwind/files/libunwind-1.2.1-fix_version_macros.patch
deleted file mode 100644
index 63202937084..00000000000
--- a/sys-libs/libunwind/files/libunwind-1.2.1-fix_version_macros.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index a254bbe..fe0247b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1,6 +1,6 @@
- define(pkg_major, 1)
--define(pkg_minor, 2.1)
--define(pkg_extra, )
-+define(pkg_minor, 2)
-+define(pkg_extra, 1)
- define(pkg_maintainer, libunwind-devel@nongnu.org)
- define(mkvers, $1.$2$3)
- dnl Process this file with autoconf to produce a configure script.
diff --git a/sys-libs/libunwind/files/libunwind-1.2.1-no-PROTECTED.patch b/sys-libs/libunwind/files/libunwind-1.2.1-no-PROTECTED.patch
deleted file mode 100644
index 6b12d9712ff..00000000000
--- a/sys-libs/libunwind/files/libunwind-1.2.1-no-PROTECTED.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://bugs.gentoo.org/659732
-https://github.com/libunwind/libunwind/issues/58
-
-From a1437a3d27924e17d00021df3cc659bd998e8580 Mon Sep 17 00:00:00 2001
-From: Dave Watson <davejwatson@fb.com>
-Date: Thu, 28 Dec 2017 08:26:42 -0800
-Subject: [PATCH] Remove PROTECTED visibility
-
-This only works on bfd ld, not lld or gold.
---- a/include/compiler.h
-+++ b/include/compiler.h
-@@ -43 +43 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
--# define PROTECTED __attribute__((visibility ("protected")))
-+# define PROTECTED
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-libs/libunwind/files/
@ 2021-11-27 16:46 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2021-11-27 16:46 UTC (permalink / raw
To: gentoo-commits
commit: c445899f326a6aa0c824973e329d9ba8a0324303
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 27 16:46:19 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 27 16:46:34 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c445899f
sys-libs/libunwind: add link to upstream PR fo bashism patch
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../libunwind/files/libunwind-1.6.0-avoid-bashisms-in-configure.patch | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/sys-libs/libunwind/files/libunwind-1.6.0-avoid-bashisms-in-configure.patch b/sys-libs/libunwind/files/libunwind-1.6.0-avoid-bashisms-in-configure.patch
index 79ac58d1e539..16fd593c3c1a 100644
--- a/sys-libs/libunwind/files/libunwind-1.6.0-avoid-bashisms-in-configure.patch
+++ b/sys-libs/libunwind/files/libunwind-1.6.0-avoid-bashisms-in-configure.patch
@@ -1,5 +1,4 @@
-diff --git a/configure.ac b/configure.ac
-index 0bd2234..42cca58 100644
+https://github.com/libunwind/libunwind/pull/315
--- a/configure.ac
+++ b/configure.ac
@@ -136,7 +136,7 @@ AC_MSG_RESULT([$enable_ptrace])
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-libs/libunwind/files/
@ 2024-01-20 21:22 Conrad Kostecki
0 siblings, 0 replies; 5+ messages in thread
From: Conrad Kostecki @ 2024-01-20 21:22 UTC (permalink / raw
To: gentoo-commits
commit: a20318e93bb3e42a11c173e7de61e33f98f036c3
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Jan 20 08:21:14 2024 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Jan 20 21:21:46 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a20318e9
sys-libs/libunwind: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../libunwind-1.8.0_rc1-configure-bashism.patch | 21 ---------------------
1 file changed, 21 deletions(-)
diff --git a/sys-libs/libunwind/files/libunwind-1.8.0_rc1-configure-bashism.patch b/sys-libs/libunwind/files/libunwind-1.8.0_rc1-configure-bashism.patch
deleted file mode 100644
index b4e36d71efdc..000000000000
--- a/sys-libs/libunwind/files/libunwind-1.8.0_rc1-configure-bashism.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://github.com/libunwind/libunwind/pull/675
-
-From ac81d339a7999e054deda2c0041c01424df3eadd Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sat, 2 Dec 2023 21:18:44 +0000
-Subject: [PATCH] configure.ac: fix bashism in LDFLAGS append
-
-'+=' is not required for POSIX shells and may not work with e.g. /bin/sh
-provided by dash. Just expand it instead.
---- a/configure.ac
-+++ b/configure.ac
-@@ -54,7 +54,7 @@ dnl Checks for libraries.
- AC_MSG_NOTICE([--- Checking for libraries ---])
- save_LDFLAGS="$LDFLAGS"
- save_LIBS="$LIBS"
--LDFLAGS+=" -nostdlib"
-+LDFLAGS="${LDFLAGS} -nostdlib"
- AC_SEARCH_LIBS([_Unwind_Resume], [gcc_s gcc],
- [AS_IF([test "$ac_cv_search__Unwind_Resume" != "none required"],
- [AC_SUBST([LIBCRTS], ["$ac_cv_search__Unwind_Resume"])])],
-
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-01-20 21:22 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-11-27 16:46 [gentoo-commits] repo/gentoo:master commit in: sys-libs/libunwind/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-01-20 21:22 Conrad Kostecki
2020-07-06 18:40 Sergei Trofimovich
2019-12-12 20:52 Aaron Bauman
2017-01-15 7:27 Aaron Bauman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox