Accepting request 85188 from Base:System
- 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.6 optimized these away. - don't use -fasynchronous-unwind-tables on arm, it breaks the build - Cleanup spec file: remove some tags OBS-URL: https://build.opensuse.org/request/show/85188 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glibc?expand=0&rev=86
This commit is contained in:
commit
684d885bfc
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:e2455ca82dd99d898d8000fc0b6130d4ab80a5394fe3c1dfa6b5e9c894a73384
|
|
||||||
size 15640243
|
|
3
glibc-2.14-8bd683657e8a.tar.bz2
Normal file
3
glibc-2.14-8bd683657e8a.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:f3b9989d779eeac58033375d0fcfbb984127291658f5133bd155d452ec702540
|
||||||
|
size 15643610
|
30
glibc-2.14-fix-ctors.patch
Normal file
30
glibc-2.14-fix-ctors.patch
Normal file
@ -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")))
|
@ -1,3 +1,18 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
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.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
|
Thu Sep 22 21:07:43 CEST 2011 - dmueller@suse.de
|
||||||
|
|
||||||
@ -9,6 +24,11 @@ Thu Sep 22 13:10:02 UTC 2011 - adrian@suse.de
|
|||||||
- add armv8l architecture
|
- add armv8l architecture
|
||||||
- don't enforce armv5tel for all arm architectures anymore
|
- 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
|
Mon Sep 19 08:09:40 UTC 2011 - opensuse@cboltz.de
|
||||||
|
|
||||||
|
10
glibc.spec
10
glibc.spec
@ -77,12 +77,11 @@ Obsoletes: glibc-64bit
|
|||||||
%ifarch ppc
|
%ifarch ppc
|
||||||
Obsoletes: glibc-32bit
|
Obsoletes: glibc-32bit
|
||||||
%endif
|
%endif
|
||||||
AutoReqProv: on
|
|
||||||
Version: 2.14
|
Version: 2.14
|
||||||
Release: 11
|
Release: 11
|
||||||
Url: http://www.gnu.org/software/libc/libc.html
|
Url: http://www.gnu.org/software/libc/libc.html
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
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
|
Source2: http://ftp.gnu.org/gnu/glibc/glibc-ports-2.14.tar.bz2
|
||||||
Source3: noversion.tar.bz2
|
Source3: noversion.tar.bz2
|
||||||
Source4: manpages.tar.bz2
|
Source4: manpages.tar.bz2
|
||||||
@ -205,6 +204,8 @@ Patch71: x86-cpuid-level2.patch
|
|||||||
Patch72: glibc-2.15-avoid-vsyscall.patch
|
Patch72: glibc-2.15-avoid-vsyscall.patch
|
||||||
# PATCH-FIX-UPSTREAM Fix assertion error in res_query.c (bso#13013)
|
# PATCH-FIX-UPSTREAM Fix assertion error in res_query.c (bso#13013)
|
||||||
Patch73: glibc-resolv-assert.diff
|
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
|
# PATCH-FEATURE-OPENSUSE -- add sha support to crypt_blowfish lnussel@suse.de
|
||||||
Patch80: crypt_blowfish-1.2-sha.diff
|
Patch80: crypt_blowfish-1.2-sha.diff
|
||||||
# PATCH-FEATURE-OPENSUSE -- use separate symbol version for Owl extensions - lnussel@suse.de
|
# PATCH-FEATURE-OPENSUSE -- use separate symbol version for Owl extensions - lnussel@suse.de
|
||||||
@ -440,6 +441,7 @@ rm nscd/s-stamp
|
|||||||
%patch71 -p1
|
%patch71 -p1
|
||||||
%patch72 -p1
|
%patch72 -p1
|
||||||
%patch73 -p1
|
%patch73 -p1
|
||||||
|
%patch74 -p1
|
||||||
|
|
||||||
#
|
#
|
||||||
# Inconsistency detected by ld.so: dl-close.c: 719: _dl_close: Assertion `map->l_init_called' failed!
|
# Inconsistency detected by ld.so: dl-close.c: 719: _dl_close: Assertion `map->l_init_called' failed!
|
||||||
@ -534,7 +536,6 @@ PARALLEL="%{?_smp_mflags}"
|
|||||||
%endif
|
%endif
|
||||||
%ifarch %arm armv5tel armv7l armv8l
|
%ifarch %arm armv5tel armv7l armv8l
|
||||||
add_ons=$add_ons,glibc-ports-%{version}
|
add_ons=$add_ons,glibc-ports-%{version}
|
||||||
BuildFlags="$BuildFlags -fasynchronous-unwind-tables"
|
|
||||||
# fails to build otherwise - need to recheck and fix
|
# fails to build otherwise - need to recheck and fix
|
||||||
%define enable_stackguard_randomization 0
|
%define enable_stackguard_randomization 0
|
||||||
%endif
|
%endif
|
||||||
@ -845,9 +846,6 @@ install -m 644 %{SOURCE22} %{buildroot}/lib/systemd/system
|
|||||||
###
|
###
|
||||||
#######################################################################
|
#######################################################################
|
||||||
|
|
||||||
%clean
|
|
||||||
rm -rf %{buildroot}
|
|
||||||
|
|
||||||
# Note: glibc_post_upgrade does:
|
# Note: glibc_post_upgrade does:
|
||||||
# %%set_permissions %%{_libdir}/pt_chown
|
# %%set_permissions %%{_libdir}/pt_chown
|
||||||
# since we cannot do it in our own post section
|
# since we cannot do it in our own post section
|
||||||
|
Loading…
Reference in New Issue
Block a user