aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1999-06-19 12:28:15 +0000
committerRoland McGrath <roland@gnu.org>1999-06-19 12:28:15 +0000
commit7f12722d6d86754574a9ca1fa52167b8575acf71 (patch)
tree05f014809695a6c0473674c65fcf2a622fd4cfcf
parent4360eafdd20769fa9d42c075853271debd06f7d1 (diff)
downloadglibc-7f12722d6d86754574a9ca1fa52167b8575acf71.zip
glibc-7f12722d6d86754574a9ca1fa52167b8575acf71.tar.gz
glibc-7f12722d6d86754574a9ca1fa52167b8575acf71.tar.bz2
1999-06-19 Roland McGrath <roland@baalperazim.frob.com>
* sysdeps/unix/sysv/linux/siglist.c: Moved to ... * sysdeps/gnu/siglist.c: ... here. Use <siglist.h> instead of "siglist.h", to ensure sysdeps-search. Use <bits/wordsize.h> instead of <sizes.h> to determine PTR_SIZE_STR. * sysdeps/gnu/siglist.h: New file, contents from linux version. Add entry for SIGLOST protected by #ifdef. * sysdeps/unix/sysv/linux/siglist.h: Just #include that file, and define OLD_SIGLIST_SIZE_STR. * sysdeps/mach/hurd/siglist.h: New file, likewise.
-rw-r--r--sysdeps/gnu/siglist.c (renamed from sysdeps/unix/sysv/linux/siglist.c)18
-rw-r--r--sysdeps/gnu/siglist.h69
-rw-r--r--sysdeps/mach/hurd/siglist.h23
-rw-r--r--sysdeps/unix/sysv/linux/siglist.h50
4 files changed, 109 insertions, 51 deletions
diff --git a/sysdeps/unix/sysv/linux/siglist.c b/sysdeps/gnu/siglist.c
index 30d2a4a..ae5a620 100644
--- a/sysdeps/unix/sysv/linux/siglist.c
+++ b/sysdeps/gnu/siglist.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1997, 1998 Free Software Foundation, Inc.
+/* Define list of all signal numbers and their names.
+ Copyright (C) 1997, 1998, 1999 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
@@ -18,9 +19,18 @@
#include <stddef.h>
#include <signal.h>
-#include <sizes.h>
#include <libintl.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 defined HAVE_ELF && defined PIC && defined DO_VERSIONING
# define SYS_SIGLIST __new_sys_siglist
# define SYS_SIGABBREV __new_sys_sigabbrev
@@ -36,7 +46,7 @@ asm (".data; .globl __old_sys_siglist; __old_sys_siglist:");
const char *const SYS_SIGLIST[NSIG] =
{
#define init_sig(sig, abbrev, desc) [sig] desc,
-#include "siglist.h"
+#include <siglist.h>
#undef init_sig
};
@@ -50,7 +60,7 @@ asm (".data; .globl __old_sys_sigabbrev; __old_sys_sigabbrev:");
const char *const SYS_SIGABBREV[NSIG] =
{
#define init_sig(sig, abbrev, desc) [sig] abbrev,
-#include "siglist.h"
+#include <siglist.h>
#undef init_sig
};
diff --git a/sysdeps/gnu/siglist.h b/sysdeps/gnu/siglist.h
new file mode 100644
index 0000000..7fb41ad
--- /dev/null
+++ b/sysdeps/gnu/siglist.h
@@ -0,0 +1,69 @@
+/* Canonical list of all signal names.
+ Copyright (C) 1996,97,98,99 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 Library General Public License as
+ published by the Free Software Foundation; either version 2 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
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+/* This file is included multiple times. */
+
+/* Standard signals */
+ init_sig (SIGHUP, "HUP", N_("Hangup"))
+ init_sig (SIGINT, "INT", N_("Interrupt"))
+ init_sig (SIGQUIT, "QUIT", N_("Quit"))
+ init_sig (SIGILL, "ILL", N_("Illegal instruction"))
+ init_sig (SIGTRAP, "TRAP", N_("Trace/breakpoint trap"))
+ init_sig (SIGABRT, "ABRT", N_("Aborted"))
+ init_sig (SIGFPE, "FPE", N_("Floating point exception"))
+ init_sig (SIGKILL, "KILL", N_("Killed"))
+ init_sig (SIGBUS, "BUS", N_("Bus error"))
+ init_sig (SIGSEGV, "SEGV", N_("Segmentation fault"))
+ init_sig (SIGPIPE, "PIPE", N_("Broken pipe"))
+ init_sig (SIGALRM, "ALRM", N_("Alarm clock"))
+ init_sig (SIGTERM, "TERM", N_("Terminated"))
+ init_sig (SIGURG, "URG", N_("Urgent I/O condition"))
+ init_sig (SIGSTOP, "STOP", N_("Stopped (signal)"))
+ init_sig (SIGTSTP, "TSTP", N_("Stopped"))
+ init_sig (SIGCONT, "CONT", N_("Continued"))
+ init_sig (SIGCHLD, "CHLD", N_("Child exited"))
+ init_sig (SIGTTIN, "TTIN", N_("Stopped (tty input)"))
+ init_sig (SIGTTOU, "TTOU", N_("Stopped (tty output)"))
+ init_sig (SIGIO, "IO", N_("I/O possible"))
+ init_sig (SIGXCPU, "XCPU", N_("CPU time limit exceeded"))
+ init_sig (SIGXFSZ, "XFSZ", N_("File size limit exceeded"))
+ init_sig (SIGVTALRM, "VTALRM", N_("Virtual timer expired"))
+ init_sig (SIGPROF, "PROF", N_("Profiling timer expired"))
+ init_sig (SIGWINCH, "WINCH", N_("Window changed"))
+ init_sig (SIGUSR1, "USR1", N_("User defined signal 1"))
+ init_sig (SIGUSR2, "USR2", N_("User defined signal 2"))
+
+/* Variations */
+#ifdef SIGEMT
+ init_sig (SIGEMT, "EMT", N_("EMT trap"))
+#endif
+#ifdef SIGSYS
+ init_sig (SIGSYS, "SYS", N_("Bad system call"))
+#endif
+#ifdef SIGSTKFLT
+ init_sig (SIGSTKFLT, "STKFLT", N_("Stack fault"))
+#endif
+#ifdef SIGINFO
+ init_sig (SIGINFO, "INFO", N_("Information request"))
+#elif defined(SIGPWR)
+ init_sig (SIGPWR, "PWR", N_("Power failure"))
+#endif
+#ifdef SIGLOST
+ init_sig (SIGLOST, "LOST", N_("Resource lost"))
+#endif
diff --git a/sysdeps/mach/hurd/siglist.h b/sysdeps/mach/hurd/siglist.h
new file mode 100644
index 0000000..e516ad6
--- /dev/null
+++ b/sysdeps/mach/hurd/siglist.h
@@ -0,0 +1,23 @@
+/* Copyright (C) 1999 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 Library General Public License as
+ published by the Free Software Foundation; either version 2 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
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+/* This file is included multiple times. */
+
+#include <sysdeps/gnu/siglist.h> /* This file defines the canonical list. */
+
+#define OLD_SIGLIST_SIZE_STR "33" /* For GLIBC_2.0 binary compatibility. */
diff --git a/sysdeps/unix/sysv/linux/siglist.h b/sysdeps/unix/sysv/linux/siglist.h
index 4c47e8a..a6d0302 100644
--- a/sysdeps/unix/sysv/linux/siglist.h
+++ b/sysdeps/unix/sysv/linux/siglist.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 1998, 1999 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
@@ -18,50 +18,6 @@
/* This file is included multiple times. */
-/* Standard signals */
- init_sig (SIGHUP, "HUP", N_("Hangup"))
- init_sig (SIGINT, "INT", N_("Interrupt"))
- init_sig (SIGQUIT, "QUIT", N_("Quit"))
- init_sig (SIGILL, "ILL", N_("Illegal instruction"))
- init_sig (SIGTRAP, "TRAP", N_("Trace/breakpoint trap"))
- init_sig (SIGABRT, "ABRT", N_("Aborted"))
- init_sig (SIGFPE, "FPE", N_("Floating point exception"))
- init_sig (SIGKILL, "KILL", N_("Killed"))
- init_sig (SIGBUS, "BUS", N_("Bus error"))
- init_sig (SIGSEGV, "SEGV", N_("Segmentation fault"))
- init_sig (SIGPIPE, "PIPE", N_("Broken pipe"))
- init_sig (SIGALRM, "ALRM", N_("Alarm clock"))
- init_sig (SIGTERM, "TERM", N_("Terminated"))
- init_sig (SIGURG, "URG", N_("Urgent I/O condition"))
- init_sig (SIGSTOP, "STOP", N_("Stopped (signal)"))
- init_sig (SIGTSTP, "TSTP", N_("Stopped"))
- init_sig (SIGCONT, "CONT", N_("Continued"))
- init_sig (SIGCHLD, "CHLD", N_("Child exited"))
- init_sig (SIGTTIN, "TTIN", N_("Stopped (tty input)"))
- init_sig (SIGTTOU, "TTOU", N_("Stopped (tty output)"))
- init_sig (SIGIO, "IO", N_("I/O possible"))
- init_sig (SIGXCPU, "XCPU", N_("CPU time limit exceeded"))
- init_sig (SIGXFSZ, "XFSZ", N_("File size limit exceeded"))
- init_sig (SIGVTALRM, "VTALRM", N_("Virtual timer expired"))
- init_sig (SIGPROF, "PROF", N_("Profiling timer expired"))
- init_sig (SIGWINCH, "WINCH", N_("Window changed"))
- init_sig (SIGUSR1, "USR1", N_("User defined signal 1"))
- init_sig (SIGUSR2, "USR2", N_("User defined signal 2"))
+#include <sysdeps/gnu/siglist.h> /* This file defines the canonical list. */
-/* Variations */
-#ifdef SIGEMT
- init_sig (SIGEMT, "EMT", N_("EMT trap"))
-#endif
-#ifdef SIGSYS
- init_sig (SIGSYS, "SYS", N_("Bad system call"))
-#endif
-#ifdef SIGSTKFLT
- init_sig (SIGSTKFLT, "STKFLT", N_("Stack fault"))
-#endif
-#ifdef SIGINFO
- init_sig (SIGINFO, "INFO", N_("Information request"))
-#elif defined(SIGPWR)
- init_sig (SIGPWR, "PWR", N_("Power failure"))
-#endif
-
-#define OLD_SIGLIST_SIZE_STR "32"
+#define OLD_SIGLIST_SIZE_STR "32" /* For GLIBC_2.0 binary compatibility. */