From 454dec769ff41b33539d5478d64edd9b59c7158646e65a05e0a31b73c049cb84 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Tue, 27 Sep 2011 11:48:32 +0000 Subject: [PATCH 1/3] Accepting request 85072 from home:a_jaeger:branches:openSUSE:Factory Fix changes entry. OBS-URL: https://build.opensuse.org/request/show/85072 OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=109 --- glibc-2.14-69c1dfc1a796.tar.bz2 | 3 --- glibc-2.14-8bd683657e8a.tar.bz2 | 3 +++ glibc-2.14-fix-ctors.patch | 30 ++++++++++++++++++++++++++++++ glibc.changes | 15 +++++++++++++++ glibc.spec | 9 ++++----- 5 files changed, 52 insertions(+), 8 deletions(-) delete mode 100644 glibc-2.14-69c1dfc1a796.tar.bz2 create mode 100644 glibc-2.14-8bd683657e8a.tar.bz2 create mode 100644 glibc-2.14-fix-ctors.patch diff --git a/glibc-2.14-69c1dfc1a796.tar.bz2 b/glibc-2.14-69c1dfc1a796.tar.bz2 deleted file mode 100644 index db951fc..0000000 --- a/glibc-2.14-69c1dfc1a796.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e2455ca82dd99d898d8000fc0b6130d4ab80a5394fe3c1dfa6b5e9c894a73384 -size 15640243 diff --git a/glibc-2.14-8bd683657e8a.tar.bz2 b/glibc-2.14-8bd683657e8a.tar.bz2 new file mode 100644 index 0000000..5a3da48 --- /dev/null +++ b/glibc-2.14-8bd683657e8a.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f3b9989d779eeac58033375d0fcfbb984127291658f5133bd155d452ec702540 +size 15643610 diff --git a/glibc-2.14-fix-ctors.patch b/glibc-2.14-fix-ctors.patch new file mode 100644 index 0000000..33867e0 --- /dev/null +++ b/glibc-2.14-fix-ctors.patch @@ -0,0 +1,30 @@ +Index: glibc-2.14/elf/soinit.c +=================================================================== +--- glibc-2.14.orig/elf/soinit.c ++++ glibc-2.14/elf/soinit.c +@@ -26,7 +26,11 @@ void + __libc_global_ctors (void) + { + /* Call constructor functions. */ +- run_hooks (__CTOR_LIST__); ++ void (**tem)(); ++ asm ("" : "=r" (tem) : "0" (__CTOR_LIST__)); ++ /* Call destructor functions. */ ++ ++ run_hooks (tem); + } + + +@@ -36,7 +40,11 @@ void + __libc_fini (void) + { + /* Call destructor functions. */ +- run_hooks (__DTOR_LIST__); ++ void (**tem)(); ++ asm ("" : "=r" (tem) : "0" (__DTOR_LIST__)); ++ /* Call destructor functions. */ ++ ++ run_hooks (tem); + } + + void (*_fini_ptr) (void) __attribute__ ((section (".fini_array"))) diff --git a/glibc.changes b/glibc.changes index 13f21b3..4e76c16 100644 --- a/glibc.changes +++ b/glibc.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Sep 27 11:24:02 UTC 2011 - aj@suse.de + +- Update to 2.14 git version 8bd683657e8a, it contains backports from + glibc trunk: + + Avoid race between {,__de}allocate_stack and __reclaim_stacks + during fork +- Add glibc-2.14-fix-ctors.patch to run ctors (bnc#717671), gcc 4.7 + optimized these away. + ------------------------------------------------------------------- Thu Sep 22 21:07:43 CEST 2011 - dmueller@suse.de @@ -9,6 +19,11 @@ Thu Sep 22 13:10:02 UTC 2011 - adrian@suse.de - add armv8l architecture - don't enforce armv5tel for all arm architectures anymore +------------------------------------------------------------------- +Tue Sep 20 07:54:21 UTC 2011 - aj@suse.de + +- Cleanup spec file: remove some tags + ------------------------------------------------------------------- Mon Sep 19 08:09:40 UTC 2011 - opensuse@cboltz.de diff --git a/glibc.spec b/glibc.spec index f2d4280..c38a3c6 100644 --- a/glibc.spec +++ b/glibc.spec @@ -77,12 +77,11 @@ Obsoletes: glibc-64bit %ifarch ppc Obsoletes: glibc-32bit %endif -AutoReqProv: on Version: 2.14 Release: 11 Url: http://www.gnu.org/software/libc/libc.html BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source: glibc-%{version}-69c1dfc1a796.tar.bz2 +Source: glibc-%{version}-8bd683657e8a.tar.bz2 Source2: http://ftp.gnu.org/gnu/glibc/glibc-ports-2.14.tar.bz2 Source3: noversion.tar.bz2 Source4: manpages.tar.bz2 @@ -205,6 +204,8 @@ Patch71: x86-cpuid-level2.patch Patch72: glibc-2.15-avoid-vsyscall.patch # PATCH-FIX-UPSTREAM Fix assertion error in res_query.c (bso#13013) Patch73: glibc-resolv-assert.diff +# PATCH-FIX-OPENSUSE Run ctors (bnc#717671) aj@suse.de +Patch74: glibc-2.14-fix-ctors.patch # PATCH-FEATURE-OPENSUSE -- add sha support to crypt_blowfish lnussel@suse.de Patch80: crypt_blowfish-1.2-sha.diff # PATCH-FEATURE-OPENSUSE -- use separate symbol version for Owl extensions - lnussel@suse.de @@ -440,6 +441,7 @@ rm nscd/s-stamp %patch71 -p1 %patch72 -p1 %patch73 -p1 +%patch74 -p1 # # Inconsistency detected by ld.so: dl-close.c: 719: _dl_close: Assertion `map->l_init_called' failed! @@ -845,9 +847,6 @@ install -m 644 %{SOURCE22} %{buildroot}/lib/systemd/system ### ####################################################################### -%clean -rm -rf %{buildroot} - # Note: glibc_post_upgrade does: # %%set_permissions %%{_libdir}/pt_chown # since we cannot do it in our own post section From 431e91e3aebc0666e3b52d7691bc7c892054e96b6b47bb2a0a43715a025a1401 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Tue, 27 Sep 2011 11:52:05 +0000 Subject: [PATCH 2/3] Accepting request 85077 from home:a_jaeger:branches:openSUSE:Factory Fix changes entry. OBS-URL: https://build.opensuse.org/request/show/85077 OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=110 --- glibc.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glibc.changes b/glibc.changes index 4e76c16..94daa2c 100644 --- a/glibc.changes +++ b/glibc.changes @@ -5,7 +5,7 @@ Tue Sep 27 11:24:02 UTC 2011 - aj@suse.de glibc trunk: + Avoid race between {,__de}allocate_stack and __reclaim_stacks during fork -- Add glibc-2.14-fix-ctors.patch to run ctors (bnc#717671), gcc 4.7 +- Add glibc-2.14-fix-ctors.patch to run ctors (bnc#717671), gcc 4.6 optimized these away. ------------------------------------------------------------------- From 8da4ab62518059cd05b7694104908a35205f78348d853e5c467edb07241a6138 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 27 Sep 2011 12:08:28 +0000 Subject: [PATCH 3/3] - don't use -fasynchronous-unwind-tables on arm, it breaks the build OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=111 --- glibc.changes | 5 +++++ glibc.spec | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/glibc.changes b/glibc.changes index 94daa2c..df2a1f4 100644 --- a/glibc.changes +++ b/glibc.changes @@ -8,6 +8,11 @@ Tue Sep 27 11:24:02 UTC 2011 - aj@suse.de - Add glibc-2.14-fix-ctors.patch to run ctors (bnc#717671), gcc 4.6 optimized these away. +------------------------------------------------------------------- +Mon Sep 26 12:30:09 UTC 2011 - adrian@suse.de + +- don't use -fasynchronous-unwind-tables on arm, it breaks the build + ------------------------------------------------------------------- Thu Sep 22 21:07:43 CEST 2011 - dmueller@suse.de diff --git a/glibc.spec b/glibc.spec index c38a3c6..2f28b07 100644 --- a/glibc.spec +++ b/glibc.spec @@ -536,7 +536,6 @@ PARALLEL="%{?_smp_mflags}" %endif %ifarch %arm armv5tel armv7l armv8l add_ons=$add_ons,glibc-ports-%{version} - BuildFlags="$BuildFlags -fasynchronous-unwind-tables" # fails to build otherwise - need to recheck and fix %define enable_stackguard_randomization 0 %endif