diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | sysdeps/gnu/siglist.c | 27 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/siglist.h | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/arm/siglist.c | 67 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/siglist.h | 4 |
5 files changed, 20 insertions, 93 deletions
@@ -1,3 +1,14 @@ +2002-10-29 Jakub Jelinek <jakub@redhat.com> + + * 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. + 2002-11-01 Jakub Jelinek <jakub@redhat.com> * sysdeps/ia64/strncpy.S: Fix recovery code. diff --git a/sysdeps/gnu/siglist.c b/sysdeps/gnu/siglist.c index 345803f..0788bf5 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); diff --git a/sysdeps/mach/hurd/siglist.h b/sysdeps/mach/hurd/siglist.h index b29a42a..75701c8 100644 --- a/sysdeps/mach/hurd/siglist.h +++ b/sysdeps/mach/hurd/siglist.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1999 Free Software Foundation, Inc. +/* Copyright (C) 1999, 2002 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 @@ -20,4 +20,4 @@ #include_next <siglist.h> /* Get the canonical list. */ -#define OLD_SIGLIST_SIZE_STR "33" /* For GLIBC_2.0 binary compatibility. */ +#define OLD_SIGLIST_SIZE 33 /* For GLIBC_2.0 binary compatibility. */ diff --git a/sysdeps/unix/sysv/linux/arm/siglist.c b/sysdeps/unix/sysv/linux/arm/siglist.c deleted file mode 100644 index d5fdb5d..0000000 --- a/sysdeps/unix/sysv/linux/arm/siglist.c +++ /dev/null @@ -1,67 +0,0 @@ -/* Copyright (C) 1997, 1998, 2000, 2002 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, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ - -#include <stddef.h> -#include <signal.h> -#include <sizes.h> -#include <libintl.h> -#include <shlib-compat.h> - -#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1) -asm (".data; .globl __old_sys_siglist; __old_sys_siglist:"); -#endif - -const char *const __new_sys_siglist[NSIG] = -{ -#define init_sig(sig, abbrev, desc) [sig] desc, -#include "siglist.h" -#undef init_sig -}; -strong_alias (__new_sys_siglist, _sys_siglist_internal) - -#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1) -asm (".type __old_sys_siglist,%object;.size __old_sys_siglist," - OLD_SIGLIST_SIZE_STR "*" PTR_SIZE_STR); - -asm (".data; .globl __old_sys_sigabbrev; __old_sys_sigabbrev:"); -#endif - -const char *const __new_sys_sigabbrev[NSIG] = -{ -#define init_sig(sig, abbrev, desc) [sig] abbrev, -#include "siglist.h" -#undef init_sig -}; - -#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1) -asm (".type __old_sys_sigabbrev,%object;.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 (__old_sys_siglist, _old_sys_siglist) -compat_symbol (libc, __old_sys_siglist, _sys_siglist, GLIBC_2_0); -compat_symbol (libc, _old_sys_siglist, sys_siglist, GLIBC_2_0); -compat_symbol (libc, __old_sys_sigabbrev, sys_sigabbrev, GLIBC_2_0); -#endif - -strong_alias (__new_sys_siglist, _new_sys_siglist) -versioned_symbol (libc, __new_sys_siglist, _sys_siglist, GLIBC_2_1); -versioned_symbol (libc, _new_sys_siglist, sys_siglist, GLIBC_2_1); -versioned_symbol (libc, __new_sys_sigabbrev, sys_sigabbrev, GLIBC_2_1); diff --git a/sysdeps/unix/sysv/linux/siglist.h b/sysdeps/unix/sysv/linux/siglist.h index 8af463c..0e3ba53 100644 --- a/sysdeps/unix/sysv/linux/siglist.h +++ b/sysdeps/unix/sysv/linux/siglist.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997, 1998, 1999, 2002 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 @@ -20,4 +20,4 @@ #include_next <siglist.h> /* Get the canonical list. */ -#define OLD_SIGLIST_SIZE_STR "32" /* For GLIBC_2.0 binary compatibility. */ +#define OLD_SIGLIST_SIZE 32 /* For GLIBC_2.0 binary compatibility. */ |