Now with system call restarting support by all targets remove
uneeded conditionals.
Signed-off-by: Timothy Edward Baldwin <t.e.baldwi...@members.leeds.ac.uk>
---
linux-user/aarch64/syscall.h | 2 --
linux-user/alpha/syscall.h | 2 --
linux-user/arm/syscall.h | 2 --
linux-user/cris/syscall.h | 2 --
linux-user/i386/syscall.h | 2 --
linux-user/m68k/syscall.h | 2 --
linux-user/microblaze/syscall.h | 2 --
linux-user/mips/syscall.h | 2 --
linux-user/mips64/syscall.h | 2 --
linux-user/openrisc/syscall.h | 2 --
linux-user/ppc/syscall.h | 2 --
linux-user/s390x/syscall.h | 2 --
linux-user/sh4/syscall.h | 2 --
linux-user/signal.c | 3 ---
linux-user/sparc/syscall.h | 2 --
linux-user/sparc64/syscall.h | 2 --
linux-user/syscall.c | 4 ++--
linux-user/unicore32/syscall.h | 2 --
linux-user/x86_64/syscall.h | 2 --
19 files changed, 2 insertions(+), 39 deletions(-)
diff --git a/linux-user/aarch64/syscall.h b/linux-user/aarch64/syscall.h
index bc1f01b..dc72a15 100644
--- a/linux-user/aarch64/syscall.h
+++ b/linux-user/aarch64/syscall.h
@@ -11,5 +11,3 @@ struct target_pt_regs {
#define TARGET_MINSIGSTKSZ 2048
#define TARGET_MLOCKALL_MCL_CURRENT 1
#define TARGET_MLOCKALL_MCL_FUTURE 2
-
-#define TARGET_USE_ERESTARTSYS 1
diff --git a/linux-user/alpha/syscall.h b/linux-user/alpha/syscall.h
index 554a4bf..245cff2 100644
--- a/linux-user/alpha/syscall.h
+++ b/linux-user/alpha/syscall.h
@@ -255,5 +255,3 @@ struct target_pt_regs {
#define TARGET_MINSIGSTKSZ 4096
#define TARGET_MLOCKALL_MCL_CURRENT 0x2000
#define TARGET_MLOCKALL_MCL_FUTURE 0x4000
-
-#define TARGET_USE_ERESTARTSYS 1
diff --git a/linux-user/arm/syscall.h b/linux-user/arm/syscall.h
index 38c925a..3844a96 100644
--- a/linux-user/arm/syscall.h
+++ b/linux-user/arm/syscall.h
@@ -48,5 +48,3 @@ struct target_pt_regs {
#define TARGET_MINSIGSTKSZ 2048
#define TARGET_MLOCKALL_MCL_CURRENT 1
#define TARGET_MLOCKALL_MCL_FUTURE 2
-
-#define TARGET_USE_ERESTARTSYS 1
diff --git a/linux-user/cris/syscall.h b/linux-user/cris/syscall.h
index 29218e2..2957b0d 100644
--- a/linux-user/cris/syscall.h
+++ b/linux-user/cris/syscall.h
@@ -44,5 +44,3 @@ struct target_pt_regs {
#define TARGET_MLOCKALL_MCL_FUTURE 2
#endif
-
-#define TARGET_USE_ERESTARTSYS 1
diff --git a/linux-user/i386/syscall.h b/linux-user/i386/syscall.h
index f7d9fbe..906aaac 100644
--- a/linux-user/i386/syscall.h
+++ b/linux-user/i386/syscall.h
@@ -150,5 +150,3 @@ struct target_vm86plus_struct {
#define TARGET_MINSIGSTKSZ 2048
#define TARGET_MLOCKALL_MCL_CURRENT 1
#define TARGET_MLOCKALL_MCL_FUTURE 2
-
-#define TARGET_USE_ERESTARTSYS 1
diff --git a/linux-user/m68k/syscall.h b/linux-user/m68k/syscall.h
index c923e56..9218493 100644
--- a/linux-user/m68k/syscall.h
+++ b/linux-user/m68k/syscall.h
@@ -23,5 +23,3 @@ struct target_pt_regs {
#define TARGET_MLOCKALL_MCL_FUTURE 2
void do_m68k_simcall(CPUM68KState *, int);
-
-#define TARGET_USE_ERESTARTSYS 1
diff --git a/linux-user/microblaze/syscall.h b/linux-user/microblaze/syscall.h
index c38e700..3c1ed27 100644
--- a/linux-user/microblaze/syscall.h
+++ b/linux-user/microblaze/syscall.h
@@ -54,5 +54,3 @@ struct target_pt_regs {
#define TARGET_MLOCKALL_MCL_FUTURE 2
#endif
-
-#define TARGET_USE_ERESTARTSYS 1
diff --git a/linux-user/mips/syscall.h b/linux-user/mips/syscall.h
index cede30c..e34f80c 100644
--- a/linux-user/mips/syscall.h
+++ b/linux-user/mips/syscall.h
@@ -227,5 +227,3 @@ struct target_pt_regs {
#define TARGET_MINSIGSTKSZ 2048
#define TARGET_MLOCKALL_MCL_CURRENT 1
#define TARGET_MLOCKALL_MCL_FUTURE 2
-
-#define TARGET_USE_ERESTARTSYS 1
diff --git a/linux-user/mips64/syscall.h b/linux-user/mips64/syscall.h
index 88716c1..33afb8d 100644
--- a/linux-user/mips64/syscall.h
+++ b/linux-user/mips64/syscall.h
@@ -224,5 +224,3 @@ struct target_pt_regs {
#define TARGET_MINSIGSTKSZ 2048
#define TARGET_MLOCKALL_MCL_CURRENT 1
#define TARGET_MLOCKALL_MCL_FUTURE 2
-
-#define TARGET_USE_ERESTARTSYS 1
diff --git a/linux-user/openrisc/syscall.h b/linux-user/openrisc/syscall.h
index 74787ed..8ac0365 100644
--- a/linux-user/openrisc/syscall.h
+++ b/linux-user/openrisc/syscall.h
@@ -27,5 +27,3 @@ struct target_pt_regs {
#define TARGET_MINSIGSTKSZ 2048
#define TARGET_MLOCKALL_MCL_CURRENT 1
#define TARGET_MLOCKALL_MCL_FUTURE 2
-
-#define TARGET_USE_ERESTARTSYS 1
diff --git a/linux-user/ppc/syscall.h b/linux-user/ppc/syscall.h
index e75da7f..532cbbd 100644
--- a/linux-user/ppc/syscall.h
+++ b/linux-user/ppc/syscall.h
@@ -71,5 +71,3 @@ struct target_revectored_struct {
#define TARGET_MINSIGSTKSZ 2048
#define TARGET_MLOCKALL_MCL_CURRENT 0x2000
#define TARGET_MLOCKALL_MCL_FUTURE 0x4000
-
-#define TARGET_USE_ERESTARTSYS 1
diff --git a/linux-user/s390x/syscall.h b/linux-user/s390x/syscall.h
index 914ec98..35f170a 100644
--- a/linux-user/s390x/syscall.h
+++ b/linux-user/s390x/syscall.h
@@ -27,5 +27,3 @@ struct target_pt_regs {
#define TARGET_MINSIGSTKSZ 2048
#define TARGET_MLOCKALL_MCL_CURRENT 1
#define TARGET_MLOCKALL_MCL_FUTURE 2
-
-#define TARGET_USE_ERESTARTSYS 1
diff --git a/linux-user/sh4/syscall.h b/linux-user/sh4/syscall.h
index 1c0bdfd..7aa4f23 100644
--- a/linux-user/sh4/syscall.h
+++ b/linux-user/sh4/syscall.h
@@ -15,5 +15,3 @@ struct target_pt_regs {
#define TARGET_MINSIGSTKSZ 2048
#define TARGET_MLOCKALL_MCL_CURRENT 1
#define TARGET_MLOCKALL_MCL_FUTURE 2
-
-#define TARGET_USE_ERESTARTSYS 1
diff --git a/linux-user/signal.c b/linux-user/signal.c
index 3741517..c247626 100644
--- a/linux-user/signal.c
+++ b/linux-user/signal.c
@@ -212,10 +212,7 @@ int block_signals(void)
pending |= 2;
ts->signal_pending = pending;
-#ifdef TARGET_USE_ERESTARTSYS
return pending & 1;
-#endif
- return 0;
}
/* Wrapper for sigprocmask function
diff --git a/linux-user/sparc/syscall.h b/linux-user/sparc/syscall.h
index 3844b59..58573b9 100644
--- a/linux-user/sparc/syscall.h
+++ b/linux-user/sparc/syscall.h
@@ -18,5 +18,3 @@ struct target_pt_regs {
#define TARGET_MINSIGSTKSZ 4096
#define TARGET_MLOCKALL_MCL_CURRENT 0x2000
#define TARGET_MLOCKALL_MCL_FUTURE 0x4000
-
-#define TARGET_USE_ERESTARTSYS 1
diff --git a/linux-user/sparc64/syscall.h b/linux-user/sparc64/syscall.h
index 0adc5ad..8398d3f 100644
--- a/linux-user/sparc64/syscall.h
+++ b/linux-user/sparc64/syscall.h
@@ -19,5 +19,3 @@ struct target_pt_regs {
#define TARGET_MINSIGSTKSZ 4096
#define TARGET_MLOCKALL_MCL_CURRENT 0x2000
#define TARGET_MLOCKALL_MCL_FUTURE 0x4000
-
-#define TARGET_USE_ERESTARTSYS 1
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index f89b730..8d30854 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -594,7 +594,7 @@ abi_long convert_syscall_return_value(abi_long ret) {
return ret;
}
-#if defined(CONFIG_SAFE_SYSCALL) && defined(TARGET_USE_ERESTARTSYS)
+#ifdef CONFIG_SAFE_SYSCALL
#define safe_syscall0(type, name) \
static type safe_##name (void) \
@@ -5697,7 +5697,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
struct statfs stfs;
void *p;
-#if defined(DEBUG_ERESTARTSYS) && defined(TARGET_USE_ERESTARTSYS)
+#ifdef DEBUG_ERESTARTSYS
{
static int flag;
flag = !flag;
diff --git a/linux-user/unicore32/syscall.h b/linux-user/unicore32/syscall.h
index 4887d06..385a975 100644
--- a/linux-user/unicore32/syscall.h
+++ b/linux-user/unicore32/syscall.h
@@ -58,5 +58,3 @@ struct target_pt_regs {
#define TARGET_MLOCKALL_MCL_FUTURE 2
#endif /* __UC32_SYSCALL_H__ */
-
-#define TARGET_USE_ERESTARTSYS 1
diff --git a/linux-user/x86_64/syscall.h b/linux-user/x86_64/syscall.h
index d41a93a..88b3c3f 100644
--- a/linux-user/x86_64/syscall.h
+++ b/linux-user/x86_64/syscall.h
@@ -100,5 +100,3 @@ struct target_msqid64_ds {
#define TARGET_MINSIGSTKSZ 2048
#define TARGET_MLOCKALL_MCL_CURRENT 1
#define TARGET_MLOCKALL_MCL_FUTURE 2
-
-#define TARGET_USE_ERESTARTSYS 1
--
2.1.4
