linux-user: move generic signal definitions to generic/signal.h

No code change.

Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20180529194207.31503-10-laurent@vivier.eu>

diff --git a/linux-user/aarch64/target_signal.h b/linux-user/aarch64/target_signal.h
index 18599b14472d9b428b866f0e4cb8ba1a7a605180..ddd73169f0f09a4611a5ddbf57a16ca34fadf47e 100644 (file)
--- a/linux-user/aarch64/target_signal.h
+++ b/linux-user/aarch64/target_signal.h
@@ -19,5 +19,7 @@ typedef struct target_sigaltstack {
 #define TARGET_MINSIGSTKSZ 2048
 #define TARGET_SIGSTKSZ 8192
 
+#include "../generic/signal.h"
+
 #define TARGET_ARCH_HAS_SETUP_FRAME
 #endif /* AARCH64_TARGET_SIGNAL_H */

diff --git a/linux-user/arm/target_signal.h b/linux-user/arm/target_signal.h
index f80eb0a215431b4799df3d62aa2357a5fd4b2394..ea123c40f38dab7f85d762d0c88b363bc6f1c6ca 100644 (file)
--- a/linux-user/arm/target_signal.h
+++ b/linux-user/arm/target_signal.h
@@ -19,5 +19,7 @@ typedef struct target_sigaltstack {
 #define TARGET_MINSIGSTKSZ     2048
 #define TARGET_SIGSTKSZ                8192
 
+#include "../generic/signal.h"
+
 #define TARGET_ARCH_HAS_SETUP_FRAME
 #endif /* ARM_TARGET_SIGNAL_H */

diff --git a/linux-user/cris/target_signal.h b/linux-user/cris/target_signal.h
index bf404a85fd64c9448b28d86703270db1759a33a8..1cb5548f85ea13bcf2a6310278c3490485718c10 100644 (file)
--- a/linux-user/cris/target_signal.h
+++ b/linux-user/cris/target_signal.h
@@ -19,5 +19,7 @@ typedef struct target_sigaltstack {
 #define TARGET_MINSIGSTKSZ    2048
 #define TARGET_SIGSTKSZ       8192
 
+#include "../generic/signal.h"
+
 #define TARGET_ARCH_HAS_SETUP_FRAME
 #endif /* CRIS_TARGET_SIGNAL_H */

diff --git a/linux-user/generic/signal.h b/linux-user/generic/signal.h
new file mode 100644 (file)
index 0000000..e1083f8
--- /dev/null
+++ b/linux-user/generic/signal.h
@@ -0,0 +1,57 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation, or (at your option) any
+ * later version. See the COPYING file in the top-level directory.
+ */
+
+#ifndef GENERIC_SIGNAL_H
+#define GENERIC_SIGNAL_H
+
+#define TARGET_SA_NOCLDSTOP     0x00000001
+#define TARGET_SA_NOCLDWAIT     0x00000002 /* not supported yet */
+#define TARGET_SA_SIGINFO       0x00000004
+#define TARGET_SA_ONSTACK       0x08000000
+#define TARGET_SA_RESTART       0x10000000
+#define TARGET_SA_NODEFER       0x40000000
+#define TARGET_SA_RESETHAND     0x80000000
+#define TARGET_SA_RESTORER      0x04000000
+
+#define TARGET_SIGHUP            1
+#define TARGET_SIGINT            2
+#define TARGET_SIGQUIT           3
+#define TARGET_SIGILL            4
+#define TARGET_SIGTRAP           5
+#define TARGET_SIGABRT           6
+#define TARGET_SIGIOT            6
+#define TARGET_SIGBUS            7
+#define TARGET_SIGFPE            8
+#define TARGET_SIGKILL           9
+#define TARGET_SIGUSR1          10
+#define TARGET_SIGSEGV          11
+#define TARGET_SIGUSR2          12
+#define TARGET_SIGPIPE          13
+#define TARGET_SIGALRM          14
+#define TARGET_SIGTERM          15
+#define TARGET_SIGSTKFLT        16
+#define TARGET_SIGCHLD          17
+#define TARGET_SIGCONT          18
+#define TARGET_SIGSTOP          19
+#define TARGET_SIGTSTP          20
+#define TARGET_SIGTTIN          21
+#define TARGET_SIGTTOU          22
+#define TARGET_SIGURG           23
+#define TARGET_SIGXCPU          24
+#define TARGET_SIGXFSZ          25
+#define TARGET_SIGVTALRM        26
+#define TARGET_SIGPROF          27
+#define TARGET_SIGWINCH         28
+#define TARGET_SIGIO            29
+#define TARGET_SIGPWR           30
+#define TARGET_SIGSYS           31
+#define TARGET_SIGRTMIN         32
+
+#define TARGET_SIG_BLOCK          0    /* for blocking signals */
+#define TARGET_SIG_UNBLOCK        1    /* for unblocking signals */
+#define TARGET_SIG_SETMASK        2    /* for setting the signal mask */
+#endif

diff --git a/linux-user/i386/target_signal.h b/linux-user/i386/target_signal.h
index 8a284f4b579b0d68e8b3da3a0b6d6702e7af305f..f55e78fd33e7c4419bdb0f53f7c2fca67f83c8e5 100644 (file)
--- a/linux-user/i386/target_signal.h
+++ b/linux-user/i386/target_signal.h
@@ -19,5 +19,7 @@ typedef struct target_sigaltstack {
 #define TARGET_MINSIGSTKSZ     2048
 #define TARGET_SIGSTKSZ                8192
 
+#include "../generic/signal.h"
+
 #define TARGET_ARCH_HAS_SETUP_FRAME
 #endif /* I386_TARGET_SIGNAL_H */

diff --git a/linux-user/m68k/target_signal.h b/linux-user/m68k/target_signal.h
index 0cf26b79e58e197b7f346395b63e38ab402da060..314e808844a4f5c6f327cdf20e89a4359af33552 100644 (file)
--- a/linux-user/m68k/target_signal.h
+++ b/linux-user/m68k/target_signal.h
@@ -19,5 +19,7 @@ typedef struct target_sigaltstack {
 #define TARGET_MINSIGSTKSZ     2048
 #define TARGET_SIGSTKSZ        8192
 
+#include "../generic/signal.h"
+
 #define TARGET_ARCH_HAS_SETUP_FRAME
 #endif /* M68K_TARGET_SIGNAL_H */

diff --git a/linux-user/microblaze/target_signal.h b/linux-user/microblaze/target_signal.h
index 86adcc1fc963075639836fe0384f3b410d5606af..35efd5e928ae1c93e8a272cbd5e56dc4f8cdd476 100644 (file)
--- a/linux-user/microblaze/target_signal.h
+++ b/linux-user/microblaze/target_signal.h
@@ -19,5 +19,7 @@ typedef struct target_sigaltstack {
 #define TARGET_MINSIGSTKSZ    2048
 #define TARGET_SIGSTKSZ       8192
 
+#include "../generic/signal.h"
+
 #define TARGET_ARCH_HAS_SETUP_FRAME
 #endif /* MICROBLAZE_TARGET_SIGNAL_H */

diff --git a/linux-user/nios2/target_signal.h b/linux-user/nios2/target_signal.h
index 1f09f1e6bba289fc910df531b44997763d69b437..7776bcdbfd444602be6b002be88a30081eff90ef 100644 (file)
--- a/linux-user/nios2/target_signal.h
+++ b/linux-user/nios2/target_signal.h
@@ -16,4 +16,6 @@ typedef struct target_sigaltstack {
 #define TARGET_MINSIGSTKSZ    2048
 #define TARGET_SIGSTKSZ       8192
 
+#include "../generic/signal.h"
+
 #endif /* TARGET_SIGNAL_H */

diff --git a/linux-user/openrisc/target_signal.h b/linux-user/openrisc/target_signal.h
index 590383302ca9f94c99e4b3094aeb5edcf1cb8b8e..3ccbb974d9b032520786b278db6b7c94dda7ee0a 100644 (file)
--- a/linux-user/openrisc/target_signal.h
+++ b/linux-user/openrisc/target_signal.h
@@ -16,4 +16,6 @@ typedef struct target_sigaltstack {
 #define TARGET_MINSIGSTKSZ    2048
 #define TARGET_SIGSTKSZ       8192
 
+#include "../generic/signal.h"
+
 #endif /* OPENRISC_TARGET_SIGNAL_H */

diff --git a/linux-user/ppc/target_signal.h b/linux-user/ppc/target_signal.h
index 6f9e67e321df9334efea16847cbcfba9ea2c42a7..4453e2e7efd7dee2a0a44420ef80ec497e22bb1a 100644 (file)
--- a/linux-user/ppc/target_signal.h
+++ b/linux-user/ppc/target_signal.h
@@ -19,6 +19,8 @@ typedef struct target_sigaltstack {
 #define TARGET_MINSIGSTKSZ    2048
 #define TARGET_SIGSTKSZ       8192
 
+#include "../generic/signal.h"
+
 #if !defined(TARGET_PPC64)
 #define TARGET_ARCH_HAS_SETUP_FRAME
 #endif

diff --git a/linux-user/riscv/target_signal.h b/linux-user/riscv/target_signal.h
index c7fa357008beda84f70fab73cdcfbb75c904a3c0..c8b14558001dfc860afa4bac22587b7bb1938501 100644 (file)
--- a/linux-user/riscv/target_signal.h
+++ b/linux-user/riscv/target_signal.h
@@ -13,4 +13,6 @@ typedef struct target_sigaltstack {
 #define TARGET_MINSIGSTKSZ 2048
 #define TARGET_SIGSTKSZ 8192
 
+#include "../generic/signal.h"
+
 #endif /* TARGET_SIGNAL_H */

diff --git a/linux-user/s390x/target_signal.h b/linux-user/s390x/target_signal.h
index 8f41ccf9b2b3127aedddb57e93a692f35ff9be0c..b58bc7c20f63c5bf49d75a550bc5190c43e0d739 100644 (file)
--- a/linux-user/s390x/target_signal.h
+++ b/linux-user/s390x/target_signal.h
@@ -16,5 +16,7 @@ typedef struct target_sigaltstack {
 #define TARGET_MINSIGSTKSZ     2048
 #define TARGET_SIGSTKSZ        8192
 
+#include "../generic/signal.h"
+
 #define TARGET_ARCH_HAS_SETUP_FRAME
 #endif /* S390X_TARGET_SIGNAL_H */

diff --git a/linux-user/sh4/target_signal.h b/linux-user/sh4/target_signal.h
index 2bdc24c48e4952ae9ab27eb514dd8792a5115c9e..434970a9900a1c4eeb50513489c2ffce2db49d40 100644 (file)
--- a/linux-user/sh4/target_signal.h
+++ b/linux-user/sh4/target_signal.h
@@ -19,5 +19,7 @@ typedef struct target_sigaltstack {
 #define TARGET_MINSIGSTKSZ    2048
 #define TARGET_SIGSTKSZ       8192
 
+#include "../generic/signal.h"
+
 #define TARGET_ARCH_HAS_SETUP_FRAME
 #endif /* SH4_TARGET_SIGNAL_H */

diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
index 85e0d870d8db2dfcff8685c635618cef938bbdae..44dc7831d66aa9f624559bf491f0220635348346 100644 (file)
--- a/linux-user/syscall_defs.h
+++ b/linux-user/syscall_defs.h
@@ -471,15 +471,6 @@ int do_sigaction(int sig, const struct target_sigaction *act,
 #define TARGET_SA_NODEFER       0x00000020
 #define TARGET_SA_RESTART       0x00000040
 #define TARGET_SA_NOCLDWAIT     0x00000080
-#else
-#define TARGET_SA_NOCLDSTOP    0x00000001
-#define TARGET_SA_NOCLDWAIT    0x00000002 /* not supported yet */
-#define TARGET_SA_SIGINFO      0x00000004
-#define TARGET_SA_ONSTACK      0x08000000
-#define TARGET_SA_RESTART      0x10000000
-#define TARGET_SA_NODEFER      0x40000000
-#define TARGET_SA_RESETHAND    0x80000000
-#define TARGET_SA_RESTORER     0x04000000
 #endif
 
 #include "target_signal.h"
@@ -650,47 +641,6 @@ int do_sigaction(int sig, const struct target_sigaction *act,
 #define TARGET_SIG_UNBLOCK     1
 #define TARGET_SIG_SETMASK     2
 
-#else
-
-/* OpenRISC Using the general signals */
-#define TARGET_SIGHUP           1
-#define TARGET_SIGINT           2
-#define TARGET_SIGQUIT          3
-#define TARGET_SIGILL           4
-#define TARGET_SIGTRAP          5
-#define TARGET_SIGABRT          6
-#define TARGET_SIGIOT           6
-#define TARGET_SIGBUS           7
-#define TARGET_SIGFPE           8
-#define TARGET_SIGKILL          9
-#define TARGET_SIGUSR1         10
-#define TARGET_SIGSEGV         11
-#define TARGET_SIGUSR2         12
-#define TARGET_SIGPIPE         13
-#define TARGET_SIGALRM         14
-#define TARGET_SIGTERM         15
-#define TARGET_SIGSTKFLT       16
-#define TARGET_SIGCHLD         17
-#define TARGET_SIGCONT         18
-#define TARGET_SIGSTOP         19
-#define TARGET_SIGTSTP         20
-#define TARGET_SIGTTIN         21
-#define TARGET_SIGTTOU         22
-#define TARGET_SIGURG          23
-#define TARGET_SIGXCPU         24
-#define TARGET_SIGXFSZ         25
-#define TARGET_SIGVTALRM       26
-#define TARGET_SIGPROF         27
-#define TARGET_SIGWINCH                28
-#define TARGET_SIGIO           29
-#define TARGET_SIGPWR          30
-#define TARGET_SIGSYS          31
-#define TARGET_SIGRTMIN         32
-
-#define TARGET_SIG_BLOCK          0    /* for blocking signals */
-#define TARGET_SIG_UNBLOCK        1    /* for unblocking signals */
-#define TARGET_SIG_SETMASK        2    /* for setting the signal mask */
-
 #endif
 
 #if defined(TARGET_ALPHA)

diff --git a/linux-user/tilegx/target_signal.h b/linux-user/tilegx/target_signal.h
index 4cb8c56adf9851a7fc09e7ea26a0ea5892bf4a22..655be13009bb71141d7b62b6169c2293c322fb58 100644 (file)
--- a/linux-user/tilegx/target_signal.h
+++ b/linux-user/tilegx/target_signal.h
@@ -18,4 +18,6 @@ typedef struct target_sigaltstack {
 #define TARGET_MINSIGSTKSZ    2048
 #define TARGET_SIGSTKSZ       8192
 
+#include "../generic/signal.h"
+
 #endif /* TILEGX_TARGET_SIGNAL_H */

diff --git a/linux-user/x86_64/target_signal.h b/linux-user/x86_64/target_signal.h
index be054d1e59e1f74a2d7546e49024ebb05306ac22..4c4380f7b94922bd435b7368ee51e5a91444f75a 100644 (file)
--- a/linux-user/x86_64/target_signal.h
+++ b/linux-user/x86_64/target_signal.h
@@ -19,4 +19,6 @@ typedef struct target_sigaltstack {
 #define TARGET_MINSIGSTKSZ     2048
 #define TARGET_SIGSTKSZ                8192
 
+#include "../generic/signal.h"
+
 #endif /* X86_64_TARGET_SIGNAL_H */

diff --git a/linux-user/xtensa/target_signal.h b/linux-user/xtensa/target_signal.h
index de03c0a5642d6ce5d8409a5556e7f6c34c409fdf..c60bf656f6b67f4e305d790e8dd618c8000951ee 100644 (file)
--- a/linux-user/xtensa/target_signal.h
+++ b/linux-user/xtensa/target_signal.h
@@ -18,4 +18,6 @@ typedef struct target_sigaltstack {
 #define TARGET_MINSIGSTKSZ    2048
 #define TARGET_SIGSTKSZ       8192
 
+#include "../generic/signal.h"
+
 #endif