remove some duplicates in bits/signum.h. No code changes.

 include/signal.h                        |   42 +++++++++++++++++++-------------
 libc/sysdeps/linux/alpha/bits/signum.h  |   19 --------------
 libc/sysdeps/linux/common/bits/signum.h |   22 ----------------
 libc/sysdeps/linux/hppa/bits/signum.h   |   17 ------------
 libc/sysdeps/linux/mips/bits/signum.h   |   23 +----------------
 libc/sysdeps/linux/sparc/bits/signum.h  |   20 ---------------
 6 files changed, 27 insertions(+), 116 deletions(-)

include/signal.h

@@ -56,18 +56,31 @@ typedef __sigset_t sigset_t;
 
 #include <bits/types.h>
 #include <bits/signum.h>
-//TODO vda: pull out of bits/signum.h the following,
+
-//which is the same for all arches:
+/* Fake signal functions.  */
-//#define SIG_ERR    ((__sighandler_t) -1) /* Error return.  */
+#define SIG_ERR    ((__sighandler_t) -1) /* Error return.  */
-//#define SIG_DFL    ((__sighandler_t) 0)  /* Default action.  */
+#define SIG_DFL    ((__sighandler_t) 0)  /* Default action.  */
-//#define SIG_IGN    ((__sighandler_t) 1)  /* Ignore signal.  */
+#define SIG_IGN    ((__sighandler_t) 1)  /* Ignore signal.  */
-//#ifdef __USE_UNIX98
+#ifdef __USE_UNIX98
-//# define SIG_HOLD  ((__sighandler_t) 2)  /* Add signal to hold mask.  */
+# define SIG_HOLD  ((__sighandler_t) 2)  /* Add signal to hold mask.  */
-//#endif
+#endif
-//#define SIGRTMIN   (__libc_current_sigrtmin())
+/* Biggest signal number + 1 (including real-time signals).  */
-//#define SIGRTMAX   (__libc_current_sigrtmax())
+#ifndef _NSIG /* if arch has not defined it in bits/signum.h... */
-//#define __SIGRTMIN -- dont pull, it's arch specific
+# define _NSIG 65
-//#define __SIGRTMAX (_NSIG - 1)
+#endif
+#ifdef __USE_MISC
+# define NSIG _NSIG
+#endif
+/* Real-time signal range */
+#define SIGRTMIN   (__libc_current_sigrtmin())
+#define SIGRTMAX   (__libc_current_sigrtmax())
+/* These are the hard limits of the kernel.  These values should not be
+   used directly at user level.  */
+#ifndef __SIGRTMIN /* if arch has not defined it in bits/signum.h... */
+# define __SIGRTMIN 32
+#endif
+#define __SIGRTMAX (_NSIG - 1)
+
 
 #if defined __USE_XOPEN || defined __USE_XOPEN2K
 # ifndef __pid_t_defined
@@ -205,11 +218,6 @@ extern int siggetmask (void) __THROW __attribute_deprecated__;
 #endif /* Use BSD.  */
 
 
-/* Biggest signal number + 1 (including real-time signals).  */
-#ifdef __USE_MISC
-# define NSIG  _NSIG
-#endif
-
 #ifdef __USE_GNU
 typedef __sighandler_t sighandler_t;
 #endif

libc/sysdeps/linux/alpha/bits/signum.h

@@ -19,15 +19,6 @@
 
 #ifdef	_SIGNAL_H
 
-/* Fake signal functions.  */
-#define SIG_ERR ((__sighandler_t) -1) /* Error return.  */
-#define SIG_DFL ((__sighandler_t) 0) /* Default action.  */
-#define SIG_IGN ((__sighandler_t) 1) /* Ignore signal.  */
-
-#ifdef __USE_UNIX98
-# define SIG_HOLD	((__sighandler_t) 2)	/* Add signal to hold mask.  */
-#endif
-
 /*
  * Linux/AXP has different signal numbers that Linux/i386: I'm trying
  * to make it OSF/1 binary compatible, at least for normal binaries.
@@ -69,14 +60,4 @@
 #define SIGPWR	SIGINFO
 #define SIGIOT	SIGABRT
 
-#define	_NSIG		65	/* Biggest signal number + 1.  */
-
-#define SIGRTMIN	(__libc_current_sigrtmin ())
-#define SIGRTMAX	(__libc_current_sigrtmax ())
-
-/* These are the hard limits of the kernel.  These values should not be
-   used directly at user level.  */
-#define __SIGRTMIN	32
-#define __SIGRTMAX	(_NSIG - 1)
-
 #endif	/* <signal.h> included.  */

libc/sysdeps/linux/common/bits/signum.h

@@ -19,17 +19,6 @@
 
 #ifdef	_SIGNAL_H
 
-/* Fake signal functions.  */
-#define SIG_ERR	((__sighandler_t) -1)		/* Error return.  */
-#define SIG_DFL	((__sighandler_t) 0)		/* Default action.  */
-#define SIG_IGN	((__sighandler_t) 1)		/* Ignore signal.  */
-
-#ifdef __USE_UNIX98
-# define SIG_HOLD	((__sighandler_t) 2)	/* Add signal to hold mask.  */
-#endif
-
-
-/* Signals.  */
 #define	SIGHUP		1	/* Hangup (POSIX).  */
 #define	SIGINT		2	/* Interrupt (ANSI).  */
 #define	SIGQUIT		3	/* Quit (POSIX).  */
@@ -66,15 +55,4 @@
 #define SIGSYS		31	/* Bad system call.  */
 #define SIGUNUSED	31
 
-#define	_NSIG		65	/* Biggest signal number + 1
-				   (including real-time signals).  */
-
-#define SIGRTMIN        (__libc_current_sigrtmin ())
-#define SIGRTMAX        (__libc_current_sigrtmax ())
-
-/* These are the hard limits of the kernel.  These values should not be
-   used directly at user level.  */
-#define __SIGRTMIN	32
-#define __SIGRTMAX	(_NSIG - 1)
-
 #endif	/* <signal.h> included.  */

libc/sysdeps/linux/hppa/bits/signum.h

@@ -19,17 +19,6 @@
 
 #ifdef	_SIGNAL_H
 
-/* Fake signal functions.  */
-#define SIG_ERR	((__sighandler_t) -1)		/* Error return.  */
-#define SIG_DFL	((__sighandler_t) 0)		/* Default action.  */
-#define SIG_IGN	((__sighandler_t) 1)		/* Ignore signal.  */
-
-#ifdef __USE_UNIX98
-# define SIG_HOLD	((__sighandler_t) 2)	/* Add signal to hold mask.  */
-#endif
-
-
-/* Signals.  */
 #define	SIGHUP		1	/* Hangup (POSIX).  */
 #define	SIGINT		2	/* Interrupt (ANSI).  */
 #define	SIGQUIT		3	/* Quit (POSIX).  */
@@ -71,12 +60,6 @@
 #define	_NSIG		65	/* Biggest signal number + 1
 				   (including real-time signals).  */
 
-#define SIGRTMIN        (__libc_current_sigrtmin ())
-#define SIGRTMAX        (__libc_current_sigrtmax ())
-
-/* These are the hard limits of the kernel.  These values should not be
-   used directly at user level.  */
 #define __SIGRTMIN	37
-#define __SIGRTMAX	(_NSIG - 1)
 
 #endif	/* <signal.h> included.  */

libc/sysdeps/linux/mips/bits/signum.h

@@ -19,16 +19,6 @@
 
 #ifdef	_SIGNAL_H
 
-/* Fake signal functions.  */
-#define SIG_ERR ((__sighandler_t) -1)		/* Error return.  */
-#define SIG_DFL ((__sighandler_t) 0)		/* Default action.  */
-#define SIG_IGN ((__sighandler_t) 1)		/* Ignore signal.  */
-
-#ifdef __USE_UNIX98
-# define SIG_HOLD	((__sighandler_t) 2)	/* Add signal to hold mask.  */
-#endif
-
-
 #define SIGHUP		 1	/* Hangup (POSIX).  */
 #define SIGINT		 2	/* Interrupt (ANSI).  */
 #define SIGQUIT		 3	/* Quit (POSIX).  */
@@ -64,16 +54,7 @@
 #define SIGXCPU		30	/* CPU limit exceeded (4.2 BSD).  */
 #define SIGXFSZ		31	/* File size limit exceeded (4.2 BSD).  */
 
-
+/* Biggest signal number + 1 (including real-time signals).  */
-#define _NSIG		129	/* Biggest signal number + 1
+#define _NSIG		129
-				   (including real-time signals).  */
-
-#define SIGRTMIN	(__libc_current_sigrtmin ())
-#define SIGRTMAX	(__libc_current_sigrtmax ())
-
-/* These are the hard limits of the kernel.  These values should not be
-   used directly at user level.  */
-#define __SIGRTMIN	32
-#define __SIGRTMAX	(_NSIG - 1)
 
 #endif	/* <signal.h> included.  */

libc/sysdeps/linux/sparc/bits/signum.h

@@ -19,15 +19,6 @@
 
 #ifdef	_SIGNAL_H
 
-/* Fake signal functions.  */
-#define SIG_ERR ((__sighandler_t) -1) /* Error return.  */
-#define SIG_DFL ((__sighandler_t) 0) /* Default action.  */
-#define SIG_IGN ((__sighandler_t) 1) /* Ignore signal.  */
-
-#ifdef __USE_UNIX98
-# define SIG_HOLD	((__sighandler_t) 2)	/* Add signal to hold mask.  */
-#endif
-
 /*
  * Linux/SPARC has different signal numbers that Linux/i386: I'm trying
  * to make it OSF/1 binary compatible, at least for normal binaries.
@@ -70,15 +61,4 @@
 #define SIGUSR1		30
 #define SIGUSR2		31
 
-#define	_NSIG		65	/* Biggest signal number + 1
-				   (including real-time signals).  */
-
-#define SIGRTMIN        (__libc_current_sigrtmin ())
-#define SIGRTMAX        (__libc_current_sigrtmax ())
-
-/* These are the hard limits of the kernel.  These values should not be
-   used directly at user level.  */
-#define __SIGRTMIN	32
-#define __SIGRTMAX	(_NSIG - 1)
-
 #endif	/* <signal.h> included.  */