[src/trunk]: src/sys/compat/linux bring the reverse signal mapping array into...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2d62e6636d0b
branches:  trunk
changeset: 524856:2d62e6636d0b
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Mar 31 22:40:16 2002 +0000

description:
bring the reverse signal mapping array into linux_signo.c

diffstat:

 sys/compat/linux/arch/alpha/files.linux_alpha     |   3 +--
 sys/compat/linux/arch/alpha/linux_sigarray.c      |  12 ++----------
 sys/compat/linux/arch/arm/files.linux_arm         |   3 +--
 sys/compat/linux/arch/arm/linux_sigarray.c        |  14 +++-----------
 sys/compat/linux/arch/i386/files.linux_i386       |   3 +--
 sys/compat/linux/arch/i386/linux_sigarray.c       |  14 +++-----------
 sys/compat/linux/arch/m68k/files.linux_m68k       |   3 +--
 sys/compat/linux/arch/m68k/linux_sigarray.c       |  12 ++----------
 sys/compat/linux/arch/mips/files.linux_mips       |   3 +--
 sys/compat/linux/arch/mips/linux_sigarray.c       |  12 ++----------
 sys/compat/linux/arch/powerpc/files.linux_powerpc |   3 +--
 sys/compat/linux/arch/powerpc/linux_sigarray.c    |  12 ++----------
 sys/compat/linux/common/linux_signo.c             |  20 ++++++++++++++++++--
 13 files changed, 38 insertions(+), 76 deletions(-)

diffs (299 lines):

diff -r 51b9b25a2aea -r 2d62e6636d0b sys/compat/linux/arch/alpha/files.linux_alpha
--- a/sys/compat/linux/arch/alpha/files.linux_alpha     Sun Mar 31 22:22:43 2002 +0000
+++ b/sys/compat/linux/arch/alpha/files.linux_alpha     Sun Mar 31 22:40:16 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.linux_alpha,v 1.4 2000/11/17 03:55:17 erh Exp $
+#      $NetBSD: files.linux_alpha,v 1.5 2002/03/31 22:40:16 christos Exp $
 #
 # Config file description for alpha-dependent Linux compat code.
 
@@ -6,7 +6,6 @@
 file   compat/linux/arch/alpha/linux_syscalls.c        compat_linux
 file   compat/linux/arch/alpha/linux_sysent.c          compat_linux
 file   compat/linux/arch/alpha/linux_pipe.c            compat_linux
-file   compat/linux/arch/alpha/linux_sigarray.c        compat_linux
 file   compat/linux/arch/alpha/linux_exec_alpha.c      compat_linux
 file   compat/linux/common/linux_sigaction.c           compat_linux
 file   compat/linux/common/linux_olduname.c            compat_linux
diff -r 51b9b25a2aea -r 2d62e6636d0b sys/compat/linux/arch/alpha/linux_sigarray.c
--- a/sys/compat/linux/arch/alpha/linux_sigarray.c      Sun Mar 31 22:22:43 2002 +0000
+++ b/sys/compat/linux/arch/alpha/linux_sigarray.c      Sun Mar 31 22:40:16 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: linux_sigarray.c,v 1.7 2002/03/31 22:22:45 christos Exp $      */
+/*     $NetBSD: linux_sigarray.c,v 1.8 2002/03/31 22:40:16 christos Exp $      */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -36,15 +36,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_sigarray.c,v 1.7 2002/03/31 22:22:45 christos Exp $");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/signal.h>
-
-#include <compat/linux/common/linux_signal.h>
+__KERNEL_RCSID(1, "$NetBSD: linux_sigarray.c,v 1.8 2002/03/31 22:40:16 christos Exp $");
 
 const int linux_to_native_signo[LINUX__NSIG] = {
        0,
diff -r 51b9b25a2aea -r 2d62e6636d0b sys/compat/linux/arch/arm/files.linux_arm
--- a/sys/compat/linux/arch/arm/files.linux_arm Sun Mar 31 22:22:43 2002 +0000
+++ b/sys/compat/linux/arch/arm/files.linux_arm Sun Mar 31 22:40:16 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.linux_arm,v 1.2 2002/01/23 15:52:59 bjh21 Exp $
+#      $NetBSD: files.linux_arm,v 1.3 2002/03/31 22:40:16 christos Exp $
 #
 # Config file description for ARM-dependent Linux compat code.
 
@@ -7,5 +7,4 @@
 file   compat/linux/arch/arm/linux_syscalls.c          compat_linux
 file   compat/linux/arch/arm/linux_sysent.c            compat_linux
 file   compat/linux/arch/arm/linux_sys_machdep.c       compat_linux
-file   compat/linux/arch/arm/linux_sigarray.c          compat_linux
 file   compat/linux/arch/arm/linux_commons.c           compat_linux
diff -r 51b9b25a2aea -r 2d62e6636d0b sys/compat/linux/arch/arm/linux_sigarray.c
--- a/sys/compat/linux/arch/arm/linux_sigarray.c        Sun Mar 31 22:22:43 2002 +0000
+++ b/sys/compat/linux/arch/arm/linux_sigarray.c        Sun Mar 31 22:40:16 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: linux_sigarray.c,v 1.2 2002/03/31 22:22:45 christos Exp $      */
+/*     $NetBSD: linux_sigarray.c,v 1.3 2002/03/31 22:40:16 christos Exp $      */
 
 /*-
  * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@@ -36,17 +36,9 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_sigarray.c,v 1.2 2002/03/31 22:22:45 christos Exp $");
+__KERNEL_RCSID(1, "$NetBSD: linux_sigarray.c,v 1.3 2002/03/31 22:40:16 christos Exp $");
 
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/signal.h>
-
-#include <compat/linux/common/linux_signal.h>
-
-int const linux_to_native_signo[LINUX__NSIG] = {
+const int linux_to_native_signo[LINUX__NSIG] = {
        0,
        SIGHUP,
        SIGINT,
diff -r 51b9b25a2aea -r 2d62e6636d0b sys/compat/linux/arch/i386/files.linux_i386
--- a/sys/compat/linux/arch/i386/files.linux_i386       Sun Mar 31 22:22:43 2002 +0000
+++ b/sys/compat/linux/arch/i386/files.linux_i386       Sun Mar 31 22:40:16 2002 +0000
@@ -1,11 +1,10 @@
-#      $NetBSD: files.linux_i386,v 1.4 1999/12/12 00:00:16 tron Exp $
+#      $NetBSD: files.linux_i386,v 1.5 2002/03/31 22:40:17 christos Exp $
 #
 # Config file description for i386-dependent Linux compat code.
 
 file   compat/linux/arch/i386/linux_machdep.c          compat_linux
 file   compat/linux/arch/i386/linux_syscalls.c         compat_linux
 file   compat/linux/arch/i386/linux_sysent.c           compat_linux
-file   compat/linux/arch/i386/linux_sigarray.c         compat_linux
 file   compat/linux/arch/i386/linux_commons.c          compat_linux
 file   compat/linux/arch/i386/linux_ptrace.c           compat_linux
 
diff -r 51b9b25a2aea -r 2d62e6636d0b sys/compat/linux/arch/i386/linux_sigarray.c
--- a/sys/compat/linux/arch/i386/linux_sigarray.c       Sun Mar 31 22:22:43 2002 +0000
+++ b/sys/compat/linux/arch/i386/linux_sigarray.c       Sun Mar 31 22:40:16 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: linux_sigarray.c,v 1.21 2002/03/31 22:22:45 christos Exp $     */
+/*     $NetBSD: linux_sigarray.c,v 1.22 2002/03/31 22:40:17 christos Exp $     */
 
 /*-
  * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@@ -36,17 +36,9 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_sigarray.c,v 1.21 2002/03/31 22:22:45 christos Exp $");
+__KERNEL_RCSID(1, "$NetBSD: linux_sigarray.c,v 1.22 2002/03/31 22:40:17 christos Exp $");
 
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/signal.h>
-
-#include <compat/linux/common/linux_signal.h>
-
-int const linux_to_native_signo[LINUX__NSIG] = {
+const int linux_to_native_signo[LINUX__NSIG] = {
        0,              /* 0 */
        SIGHUP,         /* 1 */
        SIGINT,         /* 2 */
diff -r 51b9b25a2aea -r 2d62e6636d0b sys/compat/linux/arch/m68k/files.linux_m68k
--- a/sys/compat/linux/arch/m68k/files.linux_m68k       Sun Mar 31 22:22:43 2002 +0000
+++ b/sys/compat/linux/arch/m68k/files.linux_m68k       Sun Mar 31 22:40:16 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.linux_m68k,v 1.2 2000/12/12 19:02:00 jdolecek Exp $
+#      $NetBSD: files.linux_m68k,v 1.3 2002/03/31 22:40:17 christos Exp $
 #
 # Config file description for m68k-dependent Linux compat code.
 
@@ -6,7 +6,6 @@
 file   compat/linux/arch/m68k/linux_machdep.c          compat_linux
 file   compat/linux/arch/m68k/linux_syscalls.c         compat_linux
 file   compat/linux/arch/m68k/linux_sysent.c           compat_linux
-file   compat/linux/arch/m68k/linux_sigarray.c         compat_linux
 
 file   compat/linux/common/linux_pipe.c                compat_linux
 file   compat/linux/common/linux_file64.c              compat_linux
diff -r 51b9b25a2aea -r 2d62e6636d0b sys/compat/linux/arch/m68k/linux_sigarray.c
--- a/sys/compat/linux/arch/m68k/linux_sigarray.c       Sun Mar 31 22:22:43 2002 +0000
+++ b/sys/compat/linux/arch/m68k/linux_sigarray.c       Sun Mar 31 22:40:16 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: linux_sigarray.c,v 1.5 2002/03/31 22:22:46 christos Exp $      */
+/*     $NetBSD: linux_sigarray.c,v 1.6 2002/03/31 22:40:17 christos Exp $      */
 
 /*-
  * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@@ -36,15 +36,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_sigarray.c,v 1.5 2002/03/31 22:22:46 christos Exp $");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/signal.h>
-
-#include <compat/linux/common/linux_signal.h>
+__KERNEL_RCSID(1, "$NetBSD: linux_sigarray.c,v 1.6 2002/03/31 22:40:17 christos Exp $");
 
 const int linux_to_native_signo[LINUX__NSIG] = {
        0,
diff -r 51b9b25a2aea -r 2d62e6636d0b sys/compat/linux/arch/mips/files.linux_mips
--- a/sys/compat/linux/arch/mips/files.linux_mips       Sun Mar 31 22:22:43 2002 +0000
+++ b/sys/compat/linux/arch/mips/files.linux_mips       Sun Mar 31 22:40:16 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.linux_mips,v 1.2 2001/09/30 20:52:40 manu Exp $
+#      $NetBSD: files.linux_mips,v 1.3 2002/03/31 22:40:18 christos Exp $
 #
 # Config file description for mips-dependent Linux compat code.
 
@@ -6,7 +6,6 @@
 file   compat/linux/arch/mips/linux_ptrace.c           compat_linux
 file   compat/linux/arch/mips/linux_syscalls.c         compat_linux
 file   compat/linux/arch/mips/linux_sysent.c           compat_linux
-file   compat/linux/arch/mips/linux_sigarray.c         compat_linux
 
 file   compat/linux/common/linux_pipe.c                compat_linux
 file   compat/linux/common/linux_ipccall.c             compat_linux
diff -r 51b9b25a2aea -r 2d62e6636d0b sys/compat/linux/arch/mips/linux_sigarray.c
--- a/sys/compat/linux/arch/mips/linux_sigarray.c       Sun Mar 31 22:22:43 2002 +0000
+++ b/sys/compat/linux/arch/mips/linux_sigarray.c       Sun Mar 31 22:40:16 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: linux_sigarray.c,v 1.4 2002/03/31 22:22:46 christos Exp $ */
+/*     $NetBSD: linux_sigarray.c,v 1.5 2002/03/31 22:40:18 christos Exp $ */
 
 /*-
  * Copyright (c) 1995, 1998, 2001 The NetBSD Foundation, Inc.
@@ -36,15 +36,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_sigarray.c,v 1.4 2002/03/31 22:22:46 christos Exp $");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/signal.h>
-
-#include <compat/linux/common/linux_signal.h>
+__KERNEL_RCSID(1, "$NetBSD: linux_sigarray.c,v 1.5 2002/03/31 22:40:18 christos Exp $");
 
 /* 
  * From Linux's include/asm-mips/signal.h 
diff -r 51b9b25a2aea -r 2d62e6636d0b sys/compat/linux/arch/powerpc/files.linux_powerpc
--- a/sys/compat/linux/arch/powerpc/files.linux_powerpc Sun Mar 31 22:22:43 2002 +0000
+++ b/sys/compat/linux/arch/powerpc/files.linux_powerpc Sun Mar 31 22:40:16 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.linux_powerpc,v 1.2 2001/09/03 21:10:56 manu Exp $
+#      $NetBSD: files.linux_powerpc,v 1.3 2002/03/31 22:40:18 christos Exp $
 #
 # Config file description for powerpc-dependent Linux compat code.
 
@@ -6,7 +6,6 @@
 file   compat/linux/arch/powerpc/linux_ptrace.c                compat_linux
 file   compat/linux/arch/powerpc/linux_syscalls.c              compat_linux
 file   compat/linux/arch/powerpc/linux_sysent.c                compat_linux
-file   compat/linux/arch/powerpc/linux_sigarray.c              compat_linux
 file   compat/linux/arch/powerpc/linux_exec_powerpc.c          compat_linux
 file   compat/linux/arch/powerpc/linux_sp_wrap_powerpc.S       compat_linux
 
diff -r 51b9b25a2aea -r 2d62e6636d0b sys/compat/linux/arch/powerpc/linux_sigarray.c
--- a/sys/compat/linux/arch/powerpc/linux_sigarray.c    Sun Mar 31 22:22:43 2002 +0000
+++ b/sys/compat/linux/arch/powerpc/linux_sigarray.c    Sun Mar 31 22:40:16 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: linux_sigarray.c,v 1.3 2002/03/31 22:22:46 christos Exp $ */
+/*     $NetBSD: linux_sigarray.c,v 1.4 2002/03/31 22:40:18 christos Exp $ */
 
 /*-
  * Copyright (c) 1995, 1998, 2001 The NetBSD Foundation, Inc.
@@ -36,15 +36,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_sigarray.c,v 1.3 2002/03/31 22:22:46 christos Exp $");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/signal.h>
-
-#include <compat/linux/common/linux_signal.h>
+__KERNEL_RCSID(1, "$NetBSD: linux_sigarray.c,v 1.4 2002/03/31 22:40:18 christos Exp $");
 
 const int linux_to_native_signo[LINUX__NSIG] = {
        0,                      /* 0 */
diff -r 51b9b25a2aea -r 2d62e6636d0b sys/compat/linux/common/linux_signo.c
--- a/sys/compat/linux/common/linux_signo.c     Sun Mar 31 22:22:43 2002 +0000
+++ b/sys/compat/linux/common/linux_signo.c     Sun Mar 31 22:40:16 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: linux_signo.c,v 1.1 2002/03/31 22:22:47 christos Exp $ */
+/*     $NetBSD: linux_signo.c,v 1.2 2002/03/31 22:40:19 christos Exp $ */
 /*-
  * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_signo.c,v 1.1 2002/03/31 22:22:47 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_signo.c,v 1.2 2002/03/31 22:40:19 christos Exp $");
 
 #include <sys/types.h>
 #include <sys/signal.h>
@@ -119,3 +119,19 @@
        LINUX_SIGRTMIN + 29,    /* 62 */
        LINUX_SIGRTMIN + 30,    /* 63 */
 };
+
+#if defined(__i386__)
+#include <compat/linux/arch/i386/linux_sigarray.c>
+#elif defined(__m68k__)
+#include <compat/linux/arch/m68k/linux_sigarray.c>
+#elif defined(__alpha__)
+#include <compat/linux/arch/alpha/linux_sigarray.c>
+#elif defined(__powerpc__)
+#include <compat/linux/arch/powerpc/linux_sigarray.c>
+#elif defined(__mips__)
+#include <compat/linux/arch/mips/linux_sigarray.c>
+#elif defined(__arm__)
+#include <compat/linux/arch/arm/linux_sigarray.c>
+#else
+const int linux_to_native_signo[NSIG];
+#endif