diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2014-06-21 00:58:56 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2014-06-21 00:58:56 +0000 |
| commit | 2272ffc1160687d181efe87c62abbe46a8425ca4 (patch) | |
| tree | 946aa3b0f7c20994797d2ade725f71ed70a059c9 /sysdeps/unix/sysv/linux/arm/sigaction.c | |
| parent | c4eff5625df1d2e11191650ed302fa1b7c529034 (diff) | |
| download | glibc-2272ffc1160687d181efe87c62abbe46a8425ca4.tar.gz glibc-2272ffc1160687d181efe87c62abbe46a8425ca4.tar.xz glibc-2272ffc1160687d181efe87c62abbe46a8425ca4.zip | |
Remove ARM __ASSUME_SIGFRAME_V2.
This patch removes ARM __ASSUME_SIGFRAME_V2 now that the 2.6.18-and-later signal frame layout can be assumed, renaming the affected functions accordingly now only one version of them is needed in glibc. (sigrestorer.S did not in fact include <kernel-features.h> and it appears that, unlike other such cases, it didn't get the header indirectly, so the v1 functions would have been compiled in even when sigaction.c didn't reference them.) (alpha and hppa also have architecture-specific __ASSUME_* macros that should now be removed: __ASSUME_FDATASYNC and __ASSUME_LWS_CAS respectively. I don't have any plans to do anything on that myself.) Tested on ARM. * 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.
Diffstat (limited to 'sysdeps/unix/sysv/linux/arm/sigaction.c')
| -rw-r--r-- | sysdeps/unix/sysv/linux/arm/sigaction.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/sysdeps/unix/sysv/linux/arm/sigaction.c b/sysdeps/unix/sysv/linux/arm/sigaction.c index 21df885a7a..e1d87cbc48 100644 --- a/sysdeps/unix/sysv/linux/arm/sigaction.c +++ b/sysdeps/unix/sysv/linux/arm/sigaction.c @@ -30,22 +30,8 @@ #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) \ |