* [PATCH] AArch64: Don't clobber argument for tail call to __sigjmp_save in sigsetjmp
@ 2013-05-21 8:05 Andreas Schwab
2013-05-21 8:25 ` Marcus Shawcroft
0 siblings, 1 reply; 2+ messages in thread
From: Andreas Schwab @ 2013-05-21 8:05 UTC (permalink / raw)
To: Marcus Shawcroft; +Cc: libc-ports
sigsetjmp needs to preserve the second argument for the tail call to
__sigjmp_save. Also, in ld.so there is no need to call it at all.
Andreas.
[BZ #15493]
* setjmp/Makefile (tests): Add tst-sigsetjmp.
* setjmp/tst-sigsetjmp.c: New test.
ChangeLog.aarch64:
[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 ++++++++--
setjmp/Makefile | 3 ++-
setjmp/tst-sigsetjmp.c | 44 ++++++++++++++++++++++++++++++++++++++++++
3 files changed, 54 insertions(+), 3 deletions(-)
create mode 100644 setjmp/tst-sigsetjmp.c
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)
diff --git a/setjmp/Makefile b/setjmp/Makefile
index 6124333..913359c 100644
--- a/setjmp/Makefile
+++ b/setjmp/Makefile
@@ -25,7 +25,8 @@ headers := setjmp.h bits/setjmp.h bits/setjmp2.h
routines := setjmp sigjmp bsd-setjmp bsd-_setjmp \
longjmp __longjmp jmp-unwind
-tests := tst-setjmp jmpbug bug269-setjmp tst-setjmp-fp
+tests := tst-setjmp jmpbug bug269-setjmp tst-setjmp-fp \
+ tst-sigsetjmp
include ../Rules
diff --git a/setjmp/tst-sigsetjmp.c b/setjmp/tst-sigsetjmp.c
new file mode 100644
index 0000000..d5cf295
--- /dev/null
+++ b/setjmp/tst-sigsetjmp.c
@@ -0,0 +1,44 @@
+/* Copyright (C) 2013 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
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
+
+/* Test case for BZ #15493 */
+
+#include <stdlib.h>
+#include <signal.h>
+#include <setjmp.h>
+
+static int
+do_test (void)
+{
+ sigjmp_buf sj;
+ sigset_t m;
+
+ sigemptyset (&m);
+ sigprocmask (SIG_SETMASK, &m, 0);
+ if (!sigsetjmp (sj, 0))
+ {
+ sigaddset (&m, SIGUSR1);
+ sigprocmask (SIG_SETMASK, &m, 0);
+ siglongjmp (sj, 1);
+ return 1;
+ }
+ sigprocmask (SIG_SETMASK, 0, &m);
+ return sigismember (&m, SIGUSR1) == 0 ? EXIT_FAILURE : EXIT_SUCCESS;
+}
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"
--
1.8.2.3
--
Andreas Schwab, SUSE Labs, schwab@suse.de
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] AArch64: Don't clobber argument for tail call to __sigjmp_save in sigsetjmp
2013-05-21 8:05 [PATCH] AArch64: Don't clobber argument for tail call to __sigjmp_save in sigsetjmp Andreas Schwab
@ 2013-05-21 8:25 ` Marcus Shawcroft
0 siblings, 0 replies; 2+ messages in thread
From: Marcus Shawcroft @ 2013-05-21 8:25 UTC (permalink / raw)
To: Andreas Schwab; +Cc: libc-ports
On 21 May 2013 09:04, Andreas Schwab <schwab@suse.de> wrote:
> sigsetjmp needs to preserve the second argument for the tail call to
> __sigjmp_save. Also, in ld.so there is no need to call it at all.
>
> Andreas.
>
> [BZ #15493]
> * setjmp/Makefile (tests): Add tst-sigsetjmp.
> * setjmp/tst-sigsetjmp.c: New test.
>
> ChangeLog.aarch64:
> [BZ #15493]
> * sysdeps/aarch64/setjmp.S (__sigsetjmp): Don't clobber register
Looks good to me.
/Marcus
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-05-21 8:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-05-21 8:05 [PATCH] AArch64: Don't clobber argument for tail call to __sigjmp_save in sigsetjmp Andreas Schwab
2013-05-21 8:25 ` Marcus Shawcroft
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).