SHA256
3
0
forked from pool/glibc

Accepting request 176168 from home:Andreas_Schwab:Factory

- aarch64-sigsetjmp.patch: Fix sigsetjmp on aarch64

OBS-URL: https://build.opensuse.org/request/show/176168
OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=287
This commit is contained in:
Andreas Schwab 2013-05-20 15:48:10 +00:00 committed by Git OBS Bridge
parent 6f25f66bbd
commit 9532d05464
7 changed files with 83 additions and 21 deletions

38
aarch64-sigsetjmp.patch Normal file
View File

@ -0,0 +1,38 @@
From c272f67f9fc4c354336241ef4f3876771ccab443 Mon Sep 17 00:00:00 2001
From: Andreas Schwab <schwab@suse.de>
Date: Mon, 20 May 2013 10:19:31 +0200
Subject: [PATCH] AArch64: Don't clobber argument for tail call to
__sigjmp_save in sigsetjmp
[BZ #15493]
* sysdeps/aarch64/setjmp.S (__sigsetjmp): Don't clobber register
x1.
[NOT_IN_libc && IS_IN_rtld]: Don't call __sigjmp_save.
---
ports/sysdeps/aarch64/setjmp.S | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/ports/sysdeps/aarch64/setjmp.S b/ports/sysdeps/aarch64/setjmp.S
index cff81c7..10e0709 100644
--- a/ports/sysdeps/aarch64/setjmp.S
+++ b/ports/sysdeps/aarch64/setjmp.S
@@ -44,8 +44,14 @@ ENTRY (__sigsetjmp)
stp d10, d11, [x0, #JB_D10<<3]
stp d12, d13, [x0, #JB_D12<<3]
stp d14, d15, [x0, #JB_D14<<3]
- mov x1, sp
- str x1, [x0, #JB_SP<<3]
+ mov x2, sp
+ str x2, [x0, #JB_SP<<3]
+#if defined NOT_IN_libc && defined IS_IN_rtld
+ /* In ld.so we never save the signal mask */
+ mov w0, #0
+ RET
+#else
b C_SYMBOL_NAME(__sigjmp_save)
+#endif
END (__sigsetjmp)
hidden_def (__sigsetjmp)
--
1.8.2.3

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon May 20 08:26:35 UTC 2013 - schwab@suse.de
- aarch64-sigsetjmp.patch: Fix sigsetjmp on aarch64
------------------------------------------------------------------- -------------------------------------------------------------------
Sat May 18 09:34:41 UTC 2013 - schwab@suse.de Sat May 18 09:34:41 UTC 2013 - schwab@suse.de

View File

@ -261,20 +261,22 @@ Patch1005: getaddrinfo-overflow.patch
### ###
# Patches awaiting upstream approval # Patches awaiting upstream approval
### ###
# PATCH-FIX-OPENSUSE Fix LD_PROFILE (glibc bug#13818) - aj@suse.de # PATCH-FIX-UPSTREAM Fix LD_PROFILE (glibc bug#13818) - aj@suse.de
Patch2008: glibc-ld-profile.patch Patch2008: glibc-ld-profile.patch
# PATCH-FIX-OPENSUSE Properly check for short writes when sending the response in nscd # PATCH-FIX-UPSTREAM Properly check for short writes when sending the response in nscd
Patch2010: nscd-short-write.patch Patch2010: nscd-short-write.patch
# PATCH-FIX-OPENSUSE Update BIG5-HKSCS charmap to HKSCS-2008 # PATCH-FIX-UPSTREAM Update BIG5-HKSCS charmap to HKSCS-2008
Patch2011: big5-hkscs-update.patch.bz2 Patch2011: big5-hkscs-update.patch.bz2
# PATCH-FIX-OPENSUSE Fix parsing of numeric hosts in gethostbyname_r # PATCH-FIX-UPSTREAM Fix parsing of numeric hosts in gethostbyname_r
Patch2012: digits-dots.patch Patch2012: digits-dots.patch
# PATCH-FIX-OPENSUSE Properly cache the result from looking up the nss database config # PATCH-FIX-UPSTREAM Properly cache the result from looking up the nss database config
Patch2013: nss-database.patch Patch2013: nss-database.patch
# PATCH-FIX-OPENSUSE Properly handle %W in strptime # PATCH-FIX-UPSTREAM Properly handle %W in strptime
Patch2014: strptime-W-week.patch Patch2014: strptime-W-week.patch
# PATCH-FIX-OPENSUSE Revert problematic fixes for [BZ #11741] # PATCH-FIX-UPSTREAM Revert problematic fixes for [BZ #11741]
Patch2015: printf-overrun.patch Patch2015: printf-overrun.patch
# PATCH-FIX-UPSTREAM AArch64: Don't clobber argument for tail call to __sigjmp_save in sigsetjmp
Patch2016: aarch64-sigsetjmp.patch
# Non-glibc patches # Non-glibc patches
# PATCH-FIX-OPENSUSE Remove debianisms from manpages # PATCH-FIX-OPENSUSE Remove debianisms from manpages
@ -496,6 +498,7 @@ rm nscd/s-stamp
%patch2013 -p1 %patch2013 -p1
%patch2014 -p1 %patch2014 -p1
%patch2015 -p1 %patch2015 -p1
%patch2016 -p1
%patch3000 %patch3000

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon May 20 08:26:35 UTC 2013 - schwab@suse.de
- aarch64-sigsetjmp.patch: Fix sigsetjmp on aarch64
------------------------------------------------------------------- -------------------------------------------------------------------
Sat May 18 09:34:41 UTC 2013 - schwab@suse.de Sat May 18 09:34:41 UTC 2013 - schwab@suse.de

View File

@ -260,20 +260,22 @@ Patch1005: getaddrinfo-overflow.patch
### ###
# Patches awaiting upstream approval # Patches awaiting upstream approval
### ###
# PATCH-FIX-OPENSUSE Fix LD_PROFILE (glibc bug#13818) - aj@suse.de # PATCH-FIX-UPSTREAM Fix LD_PROFILE (glibc bug#13818) - aj@suse.de
Patch2008: glibc-ld-profile.patch Patch2008: glibc-ld-profile.patch
# PATCH-FIX-OPENSUSE Properly check for short writes when sending the response in nscd # PATCH-FIX-UPSTREAM Properly check for short writes when sending the response in nscd
Patch2010: nscd-short-write.patch Patch2010: nscd-short-write.patch
# PATCH-FIX-OPENSUSE Update BIG5-HKSCS charmap to HKSCS-2008 # PATCH-FIX-UPSTREAM Update BIG5-HKSCS charmap to HKSCS-2008
Patch2011: big5-hkscs-update.patch.bz2 Patch2011: big5-hkscs-update.patch.bz2
# PATCH-FIX-OPENSUSE Fix parsing of numeric hosts in gethostbyname_r # PATCH-FIX-UPSTREAM Fix parsing of numeric hosts in gethostbyname_r
Patch2012: digits-dots.patch Patch2012: digits-dots.patch
# PATCH-FIX-OPENSUSE Properly cache the result from looking up the nss database config # PATCH-FIX-UPSTREAM Properly cache the result from looking up the nss database config
Patch2013: nss-database.patch Patch2013: nss-database.patch
# PATCH-FIX-OPENSUSE Properly handle %W in strptime # PATCH-FIX-UPSTREAM Properly handle %W in strptime
Patch2014: strptime-W-week.patch Patch2014: strptime-W-week.patch
# PATCH-FIX-OPENSUSE Revert problematic fixes for [BZ #11741] # PATCH-FIX-UPSTREAM Revert problematic fixes for [BZ #11741]
Patch2015: printf-overrun.patch Patch2015: printf-overrun.patch
# PATCH-FIX-UPSTREAM AArch64: Don't clobber argument for tail call to __sigjmp_save in sigsetjmp
Patch2016: aarch64-sigsetjmp.patch
# Non-glibc patches # Non-glibc patches
# PATCH-FIX-OPENSUSE Remove debianisms from manpages # PATCH-FIX-OPENSUSE Remove debianisms from manpages
@ -496,6 +498,7 @@ rm nscd/s-stamp
%patch2013 -p1 %patch2013 -p1
%patch2014 -p1 %patch2014 -p1
%patch2015 -p1 %patch2015 -p1
%patch2016 -p1
%patch3000 %patch3000

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon May 20 08:26:35 UTC 2013 - schwab@suse.de
- aarch64-sigsetjmp.patch: Fix sigsetjmp on aarch64
------------------------------------------------------------------- -------------------------------------------------------------------
Sat May 18 09:34:41 UTC 2013 - schwab@suse.de Sat May 18 09:34:41 UTC 2013 - schwab@suse.de

View File

@ -261,20 +261,22 @@ Patch1005: getaddrinfo-overflow.patch
### ###
# Patches awaiting upstream approval # Patches awaiting upstream approval
### ###
# PATCH-FIX-OPENSUSE Fix LD_PROFILE (glibc bug#13818) - aj@suse.de # PATCH-FIX-UPSTREAM Fix LD_PROFILE (glibc bug#13818) - aj@suse.de
Patch2008: glibc-ld-profile.patch Patch2008: glibc-ld-profile.patch
# PATCH-FIX-OPENSUSE Properly check for short writes when sending the response in nscd # PATCH-FIX-UPSTREAM Properly check for short writes when sending the response in nscd
Patch2010: nscd-short-write.patch Patch2010: nscd-short-write.patch
# PATCH-FIX-OPENSUSE Update BIG5-HKSCS charmap to HKSCS-2008 # PATCH-FIX-UPSTREAM Update BIG5-HKSCS charmap to HKSCS-2008
Patch2011: big5-hkscs-update.patch.bz2 Patch2011: big5-hkscs-update.patch.bz2
# PATCH-FIX-OPENSUSE Fix parsing of numeric hosts in gethostbyname_r # PATCH-FIX-UPSTREAM Fix parsing of numeric hosts in gethostbyname_r
Patch2012: digits-dots.patch Patch2012: digits-dots.patch
# PATCH-FIX-OPENSUSE Properly cache the result from looking up the nss database config # PATCH-FIX-UPSTREAM Properly cache the result from looking up the nss database config
Patch2013: nss-database.patch Patch2013: nss-database.patch
# PATCH-FIX-OPENSUSE Properly handle %W in strptime # PATCH-FIX-UPSTREAM Properly handle %W in strptime
Patch2014: strptime-W-week.patch Patch2014: strptime-W-week.patch
# PATCH-FIX-OPENSUSE Revert problematic fixes for [BZ #11741] # PATCH-FIX-UPSTREAM Revert problematic fixes for [BZ #11741]
Patch2015: printf-overrun.patch Patch2015: printf-overrun.patch
# PATCH-FIX-UPSTREAM AArch64: Don't clobber argument for tail call to __sigjmp_save in sigsetjmp
Patch2016: aarch64-sigsetjmp.patch
# Non-glibc patches # Non-glibc patches
# PATCH-FIX-OPENSUSE Remove debianisms from manpages # PATCH-FIX-OPENSUSE Remove debianisms from manpages
@ -496,6 +498,7 @@ rm nscd/s-stamp
%patch2013 -p1 %patch2013 -p1
%patch2014 -p1 %patch2014 -p1
%patch2015 -p1 %patch2015 -p1
%patch2016 -p1
%patch3000 %patch3000