about summary refs log tree commit diff
path: root/sysdeps/s390/s390-32
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@redhat.com>2010-09-15 07:38:19 -0700
committerUlrich Drepper <drepper@redhat.com>2010-09-15 07:38:19 -0700
commit7291c56f9d6f5861d1c001bc63a364f047a74738 (patch)
tree9c631b0ad2ebe7c554e90025fadbad79778c8754 /sysdeps/s390/s390-32
parentbc5fb0374c3ce6eca92f44d13a55b066e707c4a0 (diff)
downloadglibc-7291c56f9d6f5861d1c001bc63a364f047a74738.tar.gz
glibc-7291c56f9d6f5861d1c001bc63a364f047a74738.tar.xz
glibc-7291c56f9d6f5861d1c001bc63a364f047a74738.zip
Fix register conflict in s390 ____longjmp_chk
Diffstat (limited to 'sysdeps/s390/s390-32')
-rw-r--r--sysdeps/s390/s390-32/__longjmp.c13
1 files changed, 8 insertions, 5 deletions
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"