+2014-06-21 Joseph Myers <joseph@codesourcery.com>
+
+ * sysdeps/unix/sysv/linux/arm/kernel-features.h
+ (__ASSUME_SIGFRAME_V2): Remove macro.
+ * sysdeps/unix/sysv/linux/arm/sigrestorer.S: Update comment.
+ [!__ASSUME_SIGFRAME_V2]: Remove conditional code.
+ (__default_sa_restorer_v2): Rename to __default_sa_restorer.
+ (__default_rt_sa_restorer_v2): Rename to __default_rt_sa_restorer.
+ * sysdeps/unix/sysv/linux/arm/sigaction.c (__default_sa_restorer):
+ Declare as function. Remove conditional macro definitions.
+ (__default_rt_sa_restorer): Likewise.
+ (__default_sa_restorer_v1): Remove declaration.
+ (__default_sa_restorer_v2): Likewise.
+ (__default_rt_sa_restorer_v1): Likewise.
+ (__default_rt_sa_restorer_v2): Likewise.
+ * sysdeps/unix/sysv/linux/arm/Versions (GLIBC_PRIVATE): Remove
+ __default_sa_restorer_v1, __default_rt_sa_restorer_v1,
+ __default_sa_restorer_v2 and __default_rt_sa_restorer_v2.
+
2014-06-20 Roland McGrath <roland@hack.frob.com>
* sysdeps/unix/sysv/linux/sparc/Makefile [$(subdir) = nptl]
GLIBC_PRIVATE {
# A copy of sigaction lives in libpthread, and needs these.
__default_sa_restorer; __default_rt_sa_restorer;
- __default_sa_restorer_v1; __default_rt_sa_restorer_v1;
- __default_sa_restorer_v2; __default_rt_sa_restorer_v2;
}
}
License along with the GNU C Library. If not, see
<http://www.gnu.org/licenses/>. */
-/* The signal frame layout changed in 2.6.18. */
-#define __ASSUME_SIGFRAME_V2 1
-
/* Support for the recvmmsg syscall was added in 2.6.33. */
#if __LINUX_KERNEL_VERSION >= 0x020621
# define __ASSUME_RECVMMSG_SYSCALL 1
#define SA_RESTORER 0x04000000
-extern void __default_sa_restorer_v1(void);
-extern void __default_sa_restorer_v2(void);
-extern void __default_rt_sa_restorer_v1(void);
-extern void __default_rt_sa_restorer_v2(void);
-#ifdef __ASSUME_SIGFRAME_V2
-# define __default_sa_restorer __default_sa_restorer_v2
-# define __default_rt_sa_restorer __default_rt_sa_restorer_v2
-#else
-# include <ldsodefs.h>
-# define __default_sa_restorer (GLRO(dl_osversion) >= 0x020612 \
- ? __default_sa_restorer_v2 \
- : __default_sa_restorer_v1)
-# define __default_rt_sa_restorer (GLRO(dl_osversion) >= 0x020612 \
- ? __default_rt_sa_restorer_v2 \
- : __default_rt_sa_restorer_v1)
-#endif
+extern void __default_sa_restorer (void);
+extern void __default_rt_sa_restorer (void);
/* When RT signals are in use we need to use a different return stub. */
#define choose_restorer(flags) \
Start the unwind tables at least one instruction before the signal
trampoline, because the unwinder will assume we are returning after
- a call site.
-
- Because the signal frame layout changed in 2.6.18, we provide two
- copies of these functions with different unwind information. */
+ a call site. */
/* Used in ENTRY. */
#undef cfi_startproc
cfi_offset (r14, OFFSET + 14 * 4); \
cfi_offset (r15, OFFSET + 15 * 4)
-#ifndef __ASSUME_SIGFRAME_V2
-#define OFFSET 12
- .fnstart
- .save {r0-r15}
- .pad #OFFSET
- nop
-ENTRY(__default_sa_restorer_v1)
- CFI
- mov r7, $SYS_ify(sigreturn)
- swi 0x0
- .fnend
-END(__default_sa_restorer_v1)
-#undef OFFSET
-#endif /* __ASSUME_SIGFRAME_V2 */
-
#define OFFSET 32
.fnstart
.save {r0-r15}
.pad #OFFSET
nop
-ENTRY(__default_sa_restorer_v2)
+ENTRY(__default_sa_restorer)
CFI
mov r7, $SYS_ify(sigreturn)
swi 0x0
.fnend
-END(__default_sa_restorer_v2)
-#undef OFFSET
-
-#ifndef __ASSUME_SIGFRAME_V2
-#define OFFSET 168
- .fnstart
- .save {r0-r15}
- .pad #OFFSET
- nop
-ENTRY(__default_rt_sa_restorer_v1)
- CFI
- mov r7, $SYS_ify(rt_sigreturn)
- swi 0x0
- .fnend
-END(__default_rt_sa_restorer_v1)
+END(__default_sa_restorer)
#undef OFFSET
-#endif /* __ASSUME_SIGFRAME_V2 */
#define OFFSET 160
.fnstart
.save {r0-r15}
.pad #OFFSET
nop
-ENTRY(__default_rt_sa_restorer_v2)
+ENTRY(__default_rt_sa_restorer)
CFI
mov r7, $SYS_ify(rt_sigreturn)
swi 0x0
.fnend
-END(__default_rt_sa_restorer_v2)
+END(__default_rt_sa_restorer)
#undef OFFSET