aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@suse.de>2006-10-03 15:50:57 +0000
committerAndreas Schwab <schwab@suse.de>2006-10-03 15:50:57 +0000
commit23cd7e446d65460def5b26bb46147702432886a6 (patch)
treede001d740cc091c8484119754c4a565db8b3cfc0
parent4b32aae99b6696ee5e25a7563bd0356be2bb59dd (diff)
downloadglibc-23cd7e446d65460def5b26bb46147702432886a6.tar.xz
glibc-23cd7e446d65460def5b26bb46147702432886a6.zip
* sysdeps/m68k/setjmp.c: Use __builtin_return_address and
__builtin_frame_address. Don't call __sigjmp_save in ld.so.
-rw-r--r--ChangeLog.m68k3
-rw-r--r--sysdeps/m68k/setjmp.c13
2 files changed, 12 insertions, 4 deletions
diff --git a/ChangeLog.m68k b/ChangeLog.m68k
index 94e35b6382..44cdd8f33c 100644
--- a/ChangeLog.m68k
+++ b/ChangeLog.m68k
@@ -1,5 +1,8 @@
2006-10-03 Andreas Schwab <schwab@suse.de>
+ * sysdeps/m68k/setjmp.c: Use __builtin_return_address and
+ __builtin_frame_address. Don't call __sigjmp_save in ld.so.
+
* sysdeps/unix/sysv/linux/m68k/mremap.S: Accept fifth parameter.
2006-10-03 Richard Sandiford <richard@codesourcery.com>
diff --git a/sysdeps/m68k/setjmp.c b/sysdeps/m68k/setjmp.c
index e2ba0e700d..2ebe97ee60 100644
--- a/sysdeps/m68k/setjmp.c
+++ b/sysdeps/m68k/setjmp.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1994, 1997, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1994, 1997, 2001, 2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -37,17 +37,17 @@ __sigsetjmp (jmp_buf env, int savemask)
: : "m" (env[0].__jmpbuf[0].__dregs[0]));
/* Save return address in place of register A0. */
- env[0].__jmpbuf[0].__aregs[0] = ((void **) &env)[-1];
+ env[0].__jmpbuf[0].__aregs[0] = __builtin_return_address (0);
/* Save address registers A1 through A5. */
asm volatile ("movem%.l %/a1-%/a5, %0"
: : "m" (env[0].__jmpbuf[0].__aregs[1]));
/* Save caller's FP, not our own. */
- env[0].__jmpbuf[0].__fp = ((void **) &env)[-2];
+ env[0].__jmpbuf[0].__fp = *(int **) __builtin_frame_address (0);
/* Save caller's SP, not our own. */
- env[0].__jmpbuf[0].__sp = (void *) &env;
+ env[0].__jmpbuf[0].__sp = (int *) __builtin_frame_address (0) + 2;
#if defined __HAVE_68881__ || defined __HAVE_FPU__
/* Save floating-point (68881) registers FP0 through FP7. */
@@ -58,8 +58,13 @@ __sigsetjmp (jmp_buf env, int savemask)
: : "m" (env[0].__jmpbuf[0].__fpregs[0]));
#endif
+#if defined NOT_IN_libc && defined IS_IN_rtld
+ /* In ld.so we never save the signal mask. */
+ return 0;
+#else
/* Save the signal mask if requested. */
return __sigjmp_save (env, savemask);
+#endif
}
#if !defined BSD_SETJMP && !defined BSD__SETJMP
libc_hidden_def (__sigsetjmp)