diff options
| author | Roland McGrath <roland@gnu.org> | 2002-11-01 20:48:37 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2002-11-01 20:48:37 +0000 |
| commit | 15deb6b3b4f3e1f65fe25acab1d0b4317bcb51a8 (patch) | |
| tree | 8863acbf8ab508652b871d038b76d719109b5447 /sysdeps/gnu | |
| parent | c88fccbef1a9046476ba7882c6240e372d52cd03 (diff) | |
| download | glibc-15deb6b3b4f3e1f65fe25acab1d0b4317bcb51a8.tar.gz glibc-15deb6b3b4f3e1f65fe25acab1d0b4317bcb51a8.tar.xz glibc-15deb6b3b4f3e1f65fe25acab1d0b4317bcb51a8.zip | |
* sysdeps/gnu/siglist.c (PTR_SIZE_STR): Remove.
(__old_sys_siglist, __old_sys_sigabbrev): Use strong_alias and declare_symbol. * sysdeps/mach/hurd/siglist.h (OLD_SIGLIST_SIZE_STR): Remove. (OLD_SIGLIST_SIZE): Define. * sysdeps/unix/sysv/linux/siglist.h (OLD_SIGLIST_SIZE_STR): Remove. (OLD_SIGLIST_SIZE): Define. * sysdeps/unix/sysv/linux/arm/siglist.c: Remove.
Diffstat (limited to 'sysdeps/gnu')
| -rw-r--r-- | sysdeps/gnu/siglist.c | 27 |
1 files changed, 5 insertions, 22 deletions
diff --git a/sysdeps/gnu/siglist.c b/sysdeps/gnu/siglist.c index 345803f118..0788bf59e5 100644 --- a/sysdeps/gnu/siglist.c +++ b/sysdeps/gnu/siglist.c @@ -21,20 +21,7 @@ #include <signal.h> #include <libintl.h> #include <shlib-compat.h> - #include <bits/wordsize.h> -#if __WORDSIZE == 32 -#define PTR_SIZE_STR "4" -#elif __WORDSIZE == 64 -#define PTR_SIZE_STR "8" -#else -#error unexpected wordsize __WORDSIZE -#endif - - -#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1) -asm (".data\n\t.globl __old_sys_siglist\n__old_sys_siglist:"); -#endif const char *const __new_sys_siglist[NSIG] = { @@ -45,10 +32,8 @@ const char *const __new_sys_siglist[NSIG] = strong_alias (__new_sys_siglist, _sys_siglist_internal) #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1) -asm (".type __old_sys_siglist,@object\n\t.size __old_sys_siglist," - OLD_SIGLIST_SIZE_STR "*" PTR_SIZE_STR); - -asm (".data\n\t.globl __old_sys_sigabbrev\n__old_sys_sigabbrev:"); +strong_alias (_sys_siglist_internal, __old_sys_siglist) +declare_symbol (__old_sys_siglist, object, OLD_SIGLIST_SIZE * __WORDSIZE / 8) #endif const char *const __new_sys_sigabbrev[NSIG] = @@ -57,13 +42,11 @@ const char *const __new_sys_sigabbrev[NSIG] = #include <siglist.h> #undef init_sig }; +strong_alias (__new_sys_sigabbrev, _sys_sigabbrev_internal) #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1) -asm (".type __old_sys_sigabbrev,@object\n\t.size __old_sys_sigabbrev," - OLD_SIGLIST_SIZE_STR "*" PTR_SIZE_STR); - -extern const char *const *__old_sys_siglist; -extern const char *const *__old_sys_sigabbrev; +strong_alias (_sys_sigabbrev_internal, __old_sys_sigabbrev) +declare_symbol (__old_sys_sigabbrev, object, OLD_SIGLIST_SIZE * __WORDSIZE / 8) strong_alias (__old_sys_siglist, _old_sys_siglist) compat_symbol (libc, __old_sys_siglist, _sys_siglist, GLIBC_2_0); |