aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-01-03 16:34:40 +0000
committerJoseph Myers <joseph@codesourcery.com>2012-01-03 16:34:40 +0000
commita80fb816722dcc790c761af7aa9d0c0e1b9be9a5 (patch)
tree1d3c0e82f20a6fcb63136b7a106f5a8d23739c56
parent8117345d2231ba93f5684c63f2b512e4d7fca9d2 (diff)
downloadglibc-a80fb816722dcc790c761af7aa9d0c0e1b9be9a5.tar.xz
glibc-a80fb816722dcc790c761af7aa9d0c0e1b9be9a5.zip
Use END in ARM old-ABI sigrestorer.S.
-rw-r--r--ChangeLog.arm7
-rw-r--r--sysdeps/unix/sysv/linux/arm/sigrestorer.S4
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog.arm b/ChangeLog.arm
index de9a2c1ff0..36027d56a1 100644
--- a/ChangeLog.arm
+++ b/ChangeLog.arm
@@ -1,5 +1,12 @@
2012-01-03 Mike Frysinger <vapier@gentoo.org>
+ [BZ #12354]
+ * sysdeps/unix/sysv/linux/arm/sigrestorer.S (__default_sa_restorer):
+ Add END(__default_sa_restorer).
+ (__default_rt_sa_restorer): Add END(__default_rt_sa_restorer).
+
+2012-01-03 Mike Frysinger <vapier@gentoo.org>
+
* sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h (PSEUDO): Change
.type/.globl/label to ENTRY(). Change .size to END().
diff --git a/sysdeps/unix/sysv/linux/arm/sigrestorer.S b/sysdeps/unix/sysv/linux/arm/sigrestorer.S
index 98e33cb8bc..d9cc40fb0f 100644
--- a/sysdeps/unix/sysv/linux/arm/sigrestorer.S
+++ b/sysdeps/unix/sysv/linux/arm/sigrestorer.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1999, 2012 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
@@ -24,10 +24,12 @@
ENTRY(__default_sa_restorer)
swi SYS_ify(sigreturn)
+END(__default_sa_restorer)
#ifdef __NR_rt_sigreturn
ENTRY(__default_rt_sa_restorer)
swi SYS_ify(rt_sigreturn)
+END(__default_rt_sa_restorer)
#endif