diff options
| author | Andreas Schwab <schwab@redhat.com> | 2010-09-15 07:38:19 -0700 |
|---|---|---|
| committer | Petr Baudis <pasky@suse.cz> | 2010-11-09 02:16:20 +0100 |
| commit | dca25feaf72a073df5ca7cca4de5e5d0fccacc36 (patch) | |
| tree | 96f4f0a9df5aeba92ca69824e9b9743c7a7604bb | |
| parent | e6ff4b8b261116ccf2867bc91891ad8f3f33ea24 (diff) | |
| download | glibc-dca25feaf72a073df5ca7cca4de5e5d0fccacc36.tar.gz glibc-dca25feaf72a073df5ca7cca4de5e5d0fccacc36.tar.xz glibc-dca25feaf72a073df5ca7cca4de5e5d0fccacc36.zip | |
Fix register conflict in s390 ____longjmp_chk
(cherry picked from commit 7291c56f9d6f5861d1c001bc63a364f047a74738)
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | sysdeps/s390/s390-32/__longjmp.c | 13 | ||||
| -rw-r--r-- | sysdeps/s390/s390-64/__longjmp.c | 13 |
3 files changed, 22 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog index 4461b2def5..5800ca49e6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-09-14 Andreas Schwab <schwab@redhat.com> + + * sysdeps/s390/s390-32/__longjmp.c (__longjmp): Define register + variables after CHECK_SP call. + * sysdeps/s390/s390-64/__longjmp.c (__longjmp): Likewise. + 2010-09-08 Chung-Lin Tang <cltang@codesourcery.com> Ulrich Drepper <drepper@redhat.com> diff --git a/sysdeps/s390/s390-32/__longjmp.c b/sysdeps/s390/s390-32/__longjmp.c index 4abc0ec81c..95f8b71019 100644 --- a/sysdeps/s390/s390-32/__longjmp.c +++ b/sysdeps/s390/s390-32/__longjmp.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2001, 2005, 2009 Free Software Foundation, Inc. +/* Copyright (C) 2000, 2001, 2005, 2009, 2010 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com). @@ -29,16 +29,19 @@ void __longjmp (__jmp_buf env, int val) { - register int r2 __asm ("%r2") = val == 0 ? 1 : val; #ifdef PTR_DEMANGLE - register uintptr_t r3 __asm ("%r3") = THREAD_GET_POINTER_GUARD (); - register void *r1 __asm ("%r1") = (void *) env; + uintptr_t guard = THREAD_GET_POINTER_GUARD (); # ifdef CHECK_SP - CHECK_SP (env, r3); + CHECK_SP (env, guard); # endif #elif defined CHECK_SP CHECK_SP (env, 0); #endif + register int r2 __asm ("%r2") = val == 0 ? 1 : val; +#ifdef PTR_DEMANGLE + register uintptr_t r3 __asm ("%r3") = guard; + register void *r1 __asm ("%r1") = (void *) env; +#endif /* Restore registers and jump back. */ asm volatile ("ld %%f6,48(%1)\n\t" "ld %%f4,40(%1)\n\t" diff --git a/sysdeps/s390/s390-64/__longjmp.c b/sysdeps/s390/s390-64/__longjmp.c index 445bd3baf3..313b338546 100644 --- a/sysdeps/s390/s390-64/__longjmp.c +++ b/sysdeps/s390/s390-64/__longjmp.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001, 2005, 2009 Free Software Foundation, Inc. +/* Copyright (C) 2001, 2005, 2009, 2010 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com). @@ -29,16 +29,19 @@ void __longjmp (__jmp_buf env, int val) { - register long int r2 __asm ("%r2") = val == 0 ? 1 : val; #ifdef PTR_DEMANGLE - register uintptr_t r3 __asm ("%r3") = THREAD_GET_POINTER_GUARD (); - register void *r1 __asm ("%r1") = (void *) env; + uintptr_t guard = THREAD_GET_POINTER_GUARD (); # ifdef CHECK_SP - CHECK_SP (env, r3); + CHECK_SP (env, guard); # endif #elif defined CHECK_SP CHECK_SP (env, 0); #endif + register long int r2 __asm ("%r2") = val == 0 ? 1 : val; +#ifdef PTR_DEMANGLE + register uintptr_t r3 __asm ("%r3") = guard; + register void *r1 __asm ("%r1") = (void *) env; +#endif /* Restore registers and jump back. */ asm volatile ("ld %%f7,104(%1)\n\t" "ld %%f5,96(%1)\n\t" |