mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-11-21 01:12:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix register conflict in s390 ____longjmp_chk

Browse Source
This commit is contained in:
Andreas Schwab 2010-09-15 07:38:19 -07:00 committed by Ulrich Drepper
parent bc5fb0374c
commit 7291c56f9d
3 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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-13 Andreas Schwab <schwab@redhat.com>
Ulrich Drepper <drepper@redhat.com>

13
sysdeps/s390/s390-32/__longjmp.c
View File

@ -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,15 +29,18 @@
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"

13
sysdeps/s390/s390-64/__longjmp.c
View File

@ -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,15 +29,18 @@
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"