* [PATCH] Fix compatibility sys_siglist and sys_sigabbrev
@ 2002-10-29 23:22 Jakub Jelinek
0 siblings, 0 replies; only message in thread
From: Jakub Jelinek @ 2002-10-29 23:22 UTC (permalink / raw)
To: Roland McGrath, Ulrich Drepper; +Cc: Glibc hackers
Hi!
Since gcc started using .data.rel.ro.local and similar sections,
sys_siglist@GLIBC_2.0 and sys_sigabbrev@GLIBC_2.0 are very broken - they
point to some random object in .data section which happens to follow
(in my build that is proc_file_chain_lock).
The following patch should fix it (and as a bonus arm special siglist
version can go away, since ASM_TYPE_DIRECTIVE_PREFIX configury takes care
of it.
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.
--- libc/sysdeps/gnu/siglist.c.jj 2002-08-05 08:44:20.000000000 +0200
+++ libc/sysdeps/gnu/siglist.c 2002-10-29 15:30:52.000000000 +0100
@@ -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[NS
#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);
--- libc/sysdeps/mach/hurd/siglist.h.jj 2001-08-23 18:50:05.000000000 +0200
+++ libc/sysdeps/mach/hurd/siglist.h 2002-10-29 15:26:35.000000000 +0100
@@ -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. */
--- libc/sysdeps/unix/sysv/linux/arm/siglist.c.jj 2002-08-05 08:44:24.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/arm/siglist.c 2002-10-29 15:39:23.000000000 +0100
@@ -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);
--- libc/sysdeps/unix/sysv/linux/siglist.h.jj 2001-08-23 18:50:44.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/siglist.h 2002-10-29 15:27:02.000000000 +0100
@@ -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. */
Jakub
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2002-10-29 15:41 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2002-10-29 23:22 [PATCH] Fix compatibility sys_siglist and sys_sigabbrev Jakub Jelinek
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).