This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[cris-decc0 4/9] gcc/testsuite: gcc.target/cris: Remove crisv32-* and cris-linux-* tests.
- From: Hans-Peter Nilsson <hp at axis dot com>
- To: <gcc-patches at gcc dot gnu dot org>
- Date: Wed, 22 Jan 2020 07:07:52 +0100
- Subject: [cris-decc0 4/9] gcc/testsuite: gcc.target/cris: Remove crisv32-* and cris-linux-* tests.
- Ironport-sdr: 4b9GxKM1s3+5+uXJOIWxZ8Eqc3Wd6RswezE2CL0CxjNi9iEtD2uNi9W7K4AHY+IdaMfY48457/ IUZyBBfIO8DS7rhjwgzWw9NPBJxO5iQ7RbPSqWusgybHcegvto/im6ndsdsAGUzzrok1pRw/TB IS80hWmCDuLvxBwFc0SIFpFRpS/OlWkrW1Rz0F2ecPy2/YOL3lnIJLv+eHfZJwLMKQg1ZfnoCe xWoLQ+Ls0bwhn7kwa0lL6RiNhx9B7N0kjosIUdftKlSBIiTzQwx7XpCFqO5IpB2P9wmeoDI7Wi e/g=
testsuite:
* gcc.target/cris/: Adjust for removing crisv32-* and cris-linux-*.
Part of the removal of crisv32-* and cris-*-linux* (cris-elf remains).
After this, within gcc.target, grep -i v32 and grep -i linux
finds no matches, except for a comment in
gcc.target/cris/asmreg-1.c, now grammar-corrected.
---
gcc/testsuite/gcc.target/cris/asm-other.S | 11 ++++-------
gcc/testsuite/gcc.target/cris/asmreg-1.c | 2 +-
gcc/testsuite/gcc.target/cris/cris.exp | 2 +-
gcc/testsuite/gcc.target/cris/inasm-other.c | 8 +++-----
gcc/testsuite/gcc.target/cris/sync-1-v10.c | 1 -
gcc/testsuite/gcc.target/cris/sync-1-v32.c | 5 -----
gcc/testsuite/gcc.target/cris/sync-2i.c | 1 -
gcc/testsuite/gcc.target/cris/sync-2s.c | 1 -
gcc/testsuite/gcc.target/cris/sync-3i.c | 1 -
gcc/testsuite/gcc.target/cris/sync-3s.c | 1 -
gcc/testsuite/gcc.target/cris/sync-4i.c | 1 -
gcc/testsuite/gcc.target/cris/sync-4s.c | 1 -
gcc/testsuite/gcc.target/cris/torture/cris-torture.exp | 2 +-
gcc/testsuite/gcc.target/cris/torture/sync-mis-op-i-1.c | 4 ----
gcc/testsuite/gcc.target/cris/torture/sync-mis-op-i-1a.c | 1 -
gcc/testsuite/gcc.target/cris/torture/sync-mis-op-i-1ml.c | 4 ----
gcc/testsuite/gcc.target/cris/torture/sync-mis-op-i-2.c | 4 ----
gcc/testsuite/gcc.target/cris/torture/sync-mis-op-i-2a.c | 1 -
gcc/testsuite/gcc.target/cris/torture/sync-mis-op-i-2ml.c | 4 ----
gcc/testsuite/gcc.target/cris/torture/sync-mis-op-i-3.c | 4 ----
gcc/testsuite/gcc.target/cris/torture/sync-mis-op-i-3a.c | 1 -
gcc/testsuite/gcc.target/cris/torture/sync-mis-op-i-3ml.c | 4 ----
gcc/testsuite/gcc.target/cris/torture/sync-mis-op-s-1.c | 13 +------------
gcc/testsuite/gcc.target/cris/torture/sync-mis-op-s-1a.c | 1 -
gcc/testsuite/gcc.target/cris/torture/sync-mis-op-s-1ml.c | 4 ----
gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-i-1.c | 4 ----
gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-i-1a.c | 1 -
gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-i-1ml.c | 4 ----
gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-i-2.c | 4 ----
gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-i-2a.c | 1 -
gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-i-2ml.c | 4 ----
gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-i-3.c | 4 ----
gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-i-3a.c | 1 -
gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-i-3ml.c | 4 ----
gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-s-1.c | 4 ----
gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-s-1a.c | 1 -
gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-s-1ml.c | 4 ----
37 files changed, 11 insertions(+), 107 deletions(-)
delete mode 100644 gcc/testsuite/gcc.target/cris/sync-1-v32.c
delete mode 100644 gcc/testsuite/gcc.target/cris/torture/sync-mis-op-i-1.c
delete mode 100644 gcc/testsuite/gcc.target/cris/torture/sync-mis-op-i-1ml.c
delete mode 100644 gcc/testsuite/gcc.target/cris/torture/sync-mis-op-i-2.c
delete mode 100644 gcc/testsuite/gcc.target/cris/torture/sync-mis-op-i-2ml.c
delete mode 100644 gcc/testsuite/gcc.target/cris/torture/sync-mis-op-i-3.c
delete mode 100644 gcc/testsuite/gcc.target/cris/torture/sync-mis-op-i-3ml.c
delete mode 100644 gcc/testsuite/gcc.target/cris/torture/sync-mis-op-s-1ml.c
delete mode 100644 gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-i-1.c
delete mode 100644 gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-i-1ml.c
delete mode 100644 gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-i-2.c
delete mode 100644 gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-i-2ml.c
delete mode 100644 gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-i-3.c
delete mode 100644 gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-i-3ml.c
delete mode 100644 gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-s-1.c
delete mode 100644 gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-s-1ml.c
diff --git a/gcc/testsuite/gcc.target/cris/asm-other.S b/gcc/testsuite/gcc.target/cris/asm-other.S
index 4fe7ebfc41c..6f34f11fdcf 100644
--- a/gcc/testsuite/gcc.target/cris/asm-other.S
+++ b/gcc/testsuite/gcc.target/cris/asm-other.S
@@ -1,13 +1,10 @@
/* { dg-do assemble } */
-/* { dg-options "-DOTHER_ISA=0 -march=v0" { target crisv32-*-* } } */
-/* { dg-options "-DOTHER_ISA=32 -march=v32" { target cris-*-* } } */
+/* The base test-case is sort-of-disabled or rather made
+ always-pass, but remains included by other tests. */
-/* Make sure we can assemble for the "other" variant, with the twist
- that the gcc option -march=v0 isn't valid for the assembler. */
+/* Make sure we can *assemble* for another variant. */
.text
-#if OTHER_ISA == 32
- addoq 42,$r1,$acr
-#else
+#ifdef OTHER_ISA
0:
move.d [$r2=$r0+42],$r1
bwf 0b
diff --git a/gcc/testsuite/gcc.target/cris/asmreg-1.c b/gcc/testsuite/gcc.target/cris/asmreg-1.c
index f430fafbeea..d77d1514667 100644
--- a/gcc/testsuite/gcc.target/cris/asmreg-1.c
+++ b/gcc/testsuite/gcc.target/cris/asmreg-1.c
@@ -3,7 +3,7 @@
/* { dg-final { scan-assembler "\\\.ifnc \\\$r9-\\\$r10-\\\$r11-\\\$r12" } } */
/* Sanity check for asm register operands in syscall failed for
- cris-axis-linux-gnu due to regmove bug.
+ cris-axis-linux-gnu due to a regmove bug.
Hans-Peter Nilsson <hp@axis.com>. */
extern void lseek64 (int, long long, int);
diff --git a/gcc/testsuite/gcc.target/cris/cris.exp b/gcc/testsuite/gcc.target/cris/cris.exp
index c85c849e860..386ff3790b3 100644
--- a/gcc/testsuite/gcc.target/cris/cris.exp
+++ b/gcc/testsuite/gcc.target/cris/cris.exp
@@ -18,7 +18,7 @@
# looping over tests.
# Exit immediately if this isn't a CRIS target.
-if { ![istarget cris-*-*] && ![istarget crisv32-*-*] } then {
+if { ![istarget cris-*-*] } then {
return
}
diff --git a/gcc/testsuite/gcc.target/cris/inasm-other.c b/gcc/testsuite/gcc.target/cris/inasm-other.c
index c1c043f56d3..deeb09d8df6 100644
--- a/gcc/testsuite/gcc.target/cris/inasm-other.c
+++ b/gcc/testsuite/gcc.target/cris/inasm-other.c
@@ -1,6 +1,6 @@
/* { dg-do assemble } */
-/* { dg-options "-DOTHER_ISA=0 -march=v0" { target crisv32-*-* } } */
-/* { dg-options "-DOTHER_ISA=32 -march=v32" { target cris-*-* } } */
+/* The base test-case is sort-of-disabled or rather made
+ always-pass, but remains included by other tests. */
/* Make sure we can (generate code and) assemble for the "other"
variant, with the twist that the gcc option -march=v0 isn't
@@ -13,9 +13,7 @@
void f(void)
{
-#if OTHER_ISA == 32
- asm volatile ("addoq 42,$r11,$acr");
-#else
+#ifdef OTHER_ISA
asm volatile ("0: move.d [$r12=$sp+42],$r10\n\t"
"bwf 0b\n\t"
"nop");
diff --git a/gcc/testsuite/gcc.target/cris/sync-1-v10.c b/gcc/testsuite/gcc.target/cris/sync-1-v10.c
index 861fc8c538d..fd88f2125e8 100644
--- a/gcc/testsuite/gcc.target/cris/sync-1-v10.c
+++ b/gcc/testsuite/gcc.target/cris/sync-1-v10.c
@@ -1,5 +1,4 @@
/* Check that we can assemble both base atomic variants. */
/* { dg-do assemble } */
/* { dg-options "-O2 -march=v10" { target { ! march_option } } } */
-/* { dg-additional-options "-mno-unaligned-atomic-may-use-library" { target cris*-*-linux* } } */
#include "sync-1.c"
diff --git a/gcc/testsuite/gcc.target/cris/sync-1-v32.c b/gcc/testsuite/gcc.target/cris/sync-1-v32.c
deleted file mode 100644
index 3c1d076ab78..00000000000
--- a/gcc/testsuite/gcc.target/cris/sync-1-v32.c
+++ /dev/null
@@ -1,5 +0,0 @@
-/* Check that we can assemble both base atomic variants. */
-/* { dg-do assemble } */
-/* { dg-options "-O2 -march=v32" } */
-/* { dg-additional-options "-mno-unaligned-atomic-may-use-library" { target cris*-*-linux* } } */
-#include "sync-1.c"
diff --git a/gcc/testsuite/gcc.target/cris/sync-2i.c b/gcc/testsuite/gcc.target/cris/sync-2i.c
index d491d3c0869..e43aa5356f5 100644
--- a/gcc/testsuite/gcc.target/cris/sync-2i.c
+++ b/gcc/testsuite/gcc.target/cris/sync-2i.c
@@ -2,7 +2,6 @@
/* { dg-do compile } */
/* { dg-options "-O2 -Dop -Dtype=int" } */
/* { dg-additional-options "-mtrap-using-break8 -mtrap-unaligned-atomic" { target cris-*-elf } } */
-/* { dg-additional-options "-mno-unaligned-atomic-may-use-library" { target cris*-*-linux* } } */
/* { dg-final { scan-assembler "\tbreak 8" } } */
/* { dg-final { scan-assembler "\tbtstq \\(2-1\\)," } } */
/* { dg-final { scan-assembler-not "\tand" } } */
diff --git a/gcc/testsuite/gcc.target/cris/sync-2s.c b/gcc/testsuite/gcc.target/cris/sync-2s.c
index 06ff98a2769..9be7dc6bcb5 100644
--- a/gcc/testsuite/gcc.target/cris/sync-2s.c
+++ b/gcc/testsuite/gcc.target/cris/sync-2s.c
@@ -2,7 +2,6 @@
/* { dg-do compile } */
/* { dg-options "-O2 -Dop -Dtype=short" } */
/* { dg-additional-options "-mtrap-using-break8 -mtrap-unaligned-atomic" { target cris-*-elf } } */
-/* { dg-additional-options "-mno-unaligned-atomic-may-use-library" { target cris*-*-linux* } } */
/* { dg-final { scan-assembler "\tbreak 8" } } */
/* { dg-final { scan-assembler "\tbtstq \\(1-1\\)," } } */
/* { dg-final { scan-assembler-not "\tand" } } */
diff --git a/gcc/testsuite/gcc.target/cris/sync-3i.c b/gcc/testsuite/gcc.target/cris/sync-3i.c
index 9e67d61cb35..114e0a846e8 100644
--- a/gcc/testsuite/gcc.target/cris/sync-3i.c
+++ b/gcc/testsuite/gcc.target/cris/sync-3i.c
@@ -4,7 +4,6 @@
/* { dg-do compile } */
/* { dg-options "-O2 -Dxchg -Dtype=int" } */
/* { dg-additional-options "-mtrap-using-break8 -mtrap-unaligned-atomic" { target cris-*-elf } } */
-/* { dg-additional-options "-mno-unaligned-atomic-may-use-library" { target cris*-*-linux* } } */
/* { dg-final { scan-assembler "\tbreak 8" } } */
/* { dg-final { scan-assembler "\tbtstq \\(2-1\\)," { xfail *-*-* } } } */
/* { dg-final { scan-assembler-not "\tand" { xfail *-*-* } } } */
diff --git a/gcc/testsuite/gcc.target/cris/sync-3s.c b/gcc/testsuite/gcc.target/cris/sync-3s.c
index 8e87a3b6221..facbb39ed94 100644
--- a/gcc/testsuite/gcc.target/cris/sync-3s.c
+++ b/gcc/testsuite/gcc.target/cris/sync-3s.c
@@ -4,7 +4,6 @@
/* { dg-do compile } */
/* { dg-options "-O2 -Dxchg -Dtype=short" } */
/* { dg-additional-options "-mtrap-using-break8 -mtrap-unaligned-atomic" { target cris-*-elf } } */
-/* { dg-additional-options "-mno-unaligned-atomic-may-use-library" { target cris*-*-linux* } } */
/* { dg-final { scan-assembler "\tbreak 8" } } */
/* { dg-final { scan-assembler "\tbtstq \\(1-1\\)," { xfail *-*-* } } } */
/* { dg-final { scan-assembler-not "\tand" { xfail *-*-* } } } */
diff --git a/gcc/testsuite/gcc.target/cris/sync-4i.c b/gcc/testsuite/gcc.target/cris/sync-4i.c
index 78a7012ccdb..9756c696386 100644
--- a/gcc/testsuite/gcc.target/cris/sync-4i.c
+++ b/gcc/testsuite/gcc.target/cris/sync-4i.c
@@ -1,7 +1,6 @@
/* Check that we don't get alignment-checking code, int. */
/* { dg-do compile } */
/* { dg-options "-O2 -Dtype=int -mno-trap-unaligned-atomic" } */
-/* { dg-additional-options "-mno-unaligned-atomic-may-use-library" { target cris*-*-linux* } } */
/* { dg-final { scan-assembler-not "\tbreak\[ \t\]" } } */
/* { dg-final { scan-assembler-not "\tbtstq\[ \t\]\[^5\]" } } */
/* { dg-final { scan-assembler-not "\tand" } } */
diff --git a/gcc/testsuite/gcc.target/cris/sync-4s.c b/gcc/testsuite/gcc.target/cris/sync-4s.c
index 6691a48283f..2d644303a79 100644
--- a/gcc/testsuite/gcc.target/cris/sync-4s.c
+++ b/gcc/testsuite/gcc.target/cris/sync-4s.c
@@ -1,7 +1,6 @@
/* Check that we don't get alignment-checking code, short. */
/* { dg-do compile } */
/* { dg-options "-O2 -Dtype=short -mno-trap-unaligned-atomic" } */
-/* { dg-additional-options "-mno-unaligned-atomic-may-use-library" { target cris*-*-linux* } } */
/* { dg-final { scan-assembler-not "\tbreak\[ \t\]" } } */
/* { dg-final { scan-assembler-not "\tbtstq\[ \t\]\[^5\]" } } */
/* { dg-final { scan-assembler-not "\tand" } } */
diff --git a/gcc/testsuite/gcc.target/cris/torture/cris-torture.exp b/gcc/testsuite/gcc.target/cris/torture/cris-torture.exp
index d9fb8530042..c03e657e250 100644
--- a/gcc/testsuite/gcc.target/cris/torture/cris-torture.exp
+++ b/gcc/testsuite/gcc.target/cris/torture/cris-torture.exp
@@ -18,7 +18,7 @@
# optimization options.
# Exit immediately if this isn't a CRIS target.
-if { ![istarget cris-*-*] && ![istarget crisv32-*-*] } then {
+if { ![istarget cris-*-*] } then {
return
}
diff --git a/gcc/testsuite/gcc.target/cris/torture/sync-mis-op-i-1.c b/gcc/testsuite/gcc.target/cris/torture/sync-mis-op-i-1.c
deleted file mode 100644
index dd8704cc92d..00000000000
--- a/gcc/testsuite/gcc.target/cris/torture/sync-mis-op-i-1.c
+++ /dev/null
@@ -1,4 +0,0 @@
-/* { dg-do run { target *-*-linux* } } */
-/* { dg-additional-sources "../sync-1.c" } */
-/* { dg-options "-Dop -Dtype=int -mno-unaligned-atomic-may-use-library" } */
-#include "sync-mis-op-s-1.c"
diff --git a/gcc/testsuite/gcc.target/cris/torture/sync-mis-op-i-1a.c b/gcc/testsuite/gcc.target/cris/torture/sync-mis-op-i-1a.c
index 8055fd380e9..4cd233316e2 100644
--- a/gcc/testsuite/gcc.target/cris/torture/sync-mis-op-i-1a.c
+++ b/gcc/testsuite/gcc.target/cris/torture/sync-mis-op-i-1a.c
@@ -2,5 +2,4 @@
/* { dg-additional-sources "../sync-1.c" } */
/* { dg-options "-Dop -Dtype=int -DTRAP_USING_ABORT -mno-trap-using-break8" } */
/* { dg-additional-options "-mtrap-unaligned-atomic" { target cris-*-elf } } */
-/* { dg-additional-options "-mno-unaligned-atomic-may-use-library" { target cris*-*-linux* } } */
#include "sync-mis-op-s-1.c"
diff --git a/gcc/testsuite/gcc.target/cris/torture/sync-mis-op-i-1ml.c b/gcc/testsuite/gcc.target/cris/torture/sync-mis-op-i-1ml.c
deleted file mode 100644
index c8cef184149..00000000000
--- a/gcc/testsuite/gcc.target/cris/torture/sync-mis-op-i-1ml.c
+++ /dev/null
@@ -1,4 +0,0 @@
-/* { dg-do run { target *-*-linux* } } */
-/* { dg-additional-sources "../sync-1.c" } */
-/* { dg-options "-Dop -Dtype=int -Dmis_ok" } */
-#include "sync-mis-op-s-1.c"
diff --git a/gcc/testsuite/gcc.target/cris/torture/sync-mis-op-i-2.c b/gcc/testsuite/gcc.target/cris/torture/sync-mis-op-i-2.c
deleted file mode 100644
index 3c162e96a4d..00000000000
--- a/gcc/testsuite/gcc.target/cris/torture/sync-mis-op-i-2.c
+++ /dev/null
@@ -1,4 +0,0 @@
-/* { dg-do run { target *-*-linux* } } */
-/* { dg-additional-sources "../sync-1.c" } */
-/* { dg-options "-Dop -Dtype=int -Dmisalignment=2 -mno-unaligned-atomic-may-use-library" } */
-#include "sync-mis-op-s-1.c"
diff --git a/gcc/testsuite/gcc.target/cris/torture/sync-mis-op-i-2a.c b/gcc/testsuite/gcc.target/cris/torture/sync-mis-op-i-2a.c
index 61e1c2047b4..3596e9ea5b1 100644
--- a/gcc/testsuite/gcc.target/cris/torture/sync-mis-op-i-2a.c
+++ b/gcc/testsuite/gcc.target/cris/torture/sync-mis-op-i-2a.c
@@ -2,5 +2,4 @@
/* { dg-additional-sources "../sync-1.c" } */
/* { dg-options "-Dop -Dtype=int -Dmisalignment=2 -DTRAP_USING_ABORT -mno-trap-using-break8" } */
/* { dg-additional-options "-mtrap-unaligned-atomic" { target cris-*-elf } } */
-/* { dg-additional-options "-mno-unaligned-atomic-may-use-library" { target cris*-*-linux* } } */
#include "sync-mis-op-s-1.c"
diff --git a/gcc/testsuite/gcc.target/cris/torture/sync-mis-op-i-2ml.c b/gcc/testsuite/gcc.target/cris/torture/sync-mis-op-i-2ml.c
deleted file mode 100644
index 0d78e90019d..00000000000
--- a/gcc/testsuite/gcc.target/cris/torture/sync-mis-op-i-2ml.c
+++ /dev/null
@@ -1,4 +0,0 @@
-/* { dg-do run { target *-*-linux* } } */
-/* { dg-additional-sources "../sync-1.c" } */
-/* { dg-options "-Dop -Dtype=int -Dmisalignment=2 -Dmis_ok" } */
-#include "sync-mis-op-s-1.c"
diff --git a/gcc/testsuite/gcc.target/cris/torture/sync-mis-op-i-3.c b/gcc/testsuite/gcc.target/cris/torture/sync-mis-op-i-3.c
deleted file mode 100644
index 626a3d5cba4..00000000000
--- a/gcc/testsuite/gcc.target/cris/torture/sync-mis-op-i-3.c
+++ /dev/null
@@ -1,4 +0,0 @@
-/* { dg-do run { target *-*-linux* } } */
-/* { dg-additional-sources "../sync-1.c" } */
-/* { dg-options "-Dop -Dtype=int -Dmisalignment=3 -mno-unaligned-atomic-may-use-library" } */
-#include "sync-mis-op-s-1.c"
diff --git a/gcc/testsuite/gcc.target/cris/torture/sync-mis-op-i-3a.c b/gcc/testsuite/gcc.target/cris/torture/sync-mis-op-i-3a.c
index 339e74cd86c..46a04f42c0e 100644
--- a/gcc/testsuite/gcc.target/cris/torture/sync-mis-op-i-3a.c
+++ b/gcc/testsuite/gcc.target/cris/torture/sync-mis-op-i-3a.c
@@ -2,5 +2,4 @@
/* { dg-additional-sources "../sync-1.c" } */
/* { dg-options "-Dop -Dtype=int -Dmisalignment=3 -DTRAP_USING_ABORT -mno-trap-using-break8" } */
/* { dg-additional-options "-mtrap-unaligned-atomic" { target cris-*-elf } } */
-/* { dg-additional-options "-mno-unaligned-atomic-may-use-library" { target cris*-*-linux* } } */
#include "sync-mis-op-s-1.c"
diff --git a/gcc/testsuite/gcc.target/cris/torture/sync-mis-op-i-3ml.c b/gcc/testsuite/gcc.target/cris/torture/sync-mis-op-i-3ml.c
deleted file mode 100644
index 17c6d34d11a..00000000000
--- a/gcc/testsuite/gcc.target/cris/torture/sync-mis-op-i-3ml.c
+++ /dev/null
@@ -1,4 +0,0 @@
-/* { dg-do run { target *-*-linux* } } */
-/* { dg-additional-sources "../sync-1.c" } */
-/* { dg-options "-Dop -Dtype=int -Dmisalignment=3 -Dmis_ok" } */
-#include "sync-mis-op-s-1.c"
diff --git a/gcc/testsuite/gcc.target/cris/torture/sync-mis-op-s-1.c b/gcc/testsuite/gcc.target/cris/torture/sync-mis-op-s-1.c
index f2835aa06c1..9a50732ef32 100644
--- a/gcc/testsuite/gcc.target/cris/torture/sync-mis-op-s-1.c
+++ b/gcc/testsuite/gcc.target/cris/torture/sync-mis-op-s-1.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target *-*-linux* } } */
+/* { dg-do run { target { ! *-*-* } } } */
/* { dg-additional-sources "../sync-1.c" } */
/* { dg-options "-Dop -Dtype=short -mno-unaligned-atomic-may-use-library" } */
@@ -47,12 +47,8 @@ type ret = 42;
void my_abort (void) __asm__ (SYMSTR (abort)) __attribute__ ((__used__));
void my_abort (void)
#else
-#ifdef __gnu_linux__
-void trap_handler(int signum)
-#else
#error "can't catch break 8"
#endif
-#endif
{
if (1
#ifndef TRAP_USING_ABORT
@@ -78,13 +74,6 @@ int main(void)
{
type ret;
-#ifndef TRAP_USING_ABORT
-#ifdef __gnu_linux__
- if (signal (SIGTRAP, trap_handler) == SIG_ERR)
- abort ();
-#endif
-#endif
-
#ifndef mis_ok
trap_expected = 1;
#endif
diff --git a/gcc/testsuite/gcc.target/cris/torture/sync-mis-op-s-1a.c b/gcc/testsuite/gcc.target/cris/torture/sync-mis-op-s-1a.c
index ba639172ba9..fc91e7c9a8a 100644
--- a/gcc/testsuite/gcc.target/cris/torture/sync-mis-op-s-1a.c
+++ b/gcc/testsuite/gcc.target/cris/torture/sync-mis-op-s-1a.c
@@ -2,5 +2,4 @@
/* { dg-additional-sources "../sync-1.c" } */
/* { dg-options "-Dop -Dtype=short -DTRAP_USING_ABORT -mno-trap-using-break8" } */
/* { dg-additional-options "-mtrap-unaligned-atomic" { target cris-*-elf } } */
-/* { dg-additional-options "-mno-unaligned-atomic-may-use-library" { target cris*-*-linux* } } */
#include "sync-mis-op-s-1.c"
diff --git a/gcc/testsuite/gcc.target/cris/torture/sync-mis-op-s-1ml.c b/gcc/testsuite/gcc.target/cris/torture/sync-mis-op-s-1ml.c
deleted file mode 100644
index 3685c504731..00000000000
--- a/gcc/testsuite/gcc.target/cris/torture/sync-mis-op-s-1ml.c
+++ /dev/null
@@ -1,4 +0,0 @@
-/* { dg-do run { target *-*-linux* } } */
-/* { dg-additional-sources "../sync-1.c" } */
-/* { dg-options "-Dop -Dtype=short -Dmis_ok" } */
-#include "sync-mis-op-s-1.c"
diff --git a/gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-i-1.c b/gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-i-1.c
deleted file mode 100644
index da25614e23b..00000000000
--- a/gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-i-1.c
+++ /dev/null
@@ -1,4 +0,0 @@
-/* { dg-do run { target *-*-linux* } } */
-/* { dg-additional-sources "../sync-1.c" } */
-/* { dg-options "-Dxchg -Dtype=int -mno-unaligned-atomic-may-use-library" } */
-#include "sync-mis-op-s-1.c"
diff --git a/gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-i-1a.c b/gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-i-1a.c
index 09a7a9ea3a0..af6ef8ac748 100644
--- a/gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-i-1a.c
+++ b/gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-i-1a.c
@@ -2,5 +2,4 @@
/* { dg-additional-sources "../sync-1.c" } */
/* { dg-options "-Dxchg -Dtype=int -DTRAP_USING_ABORT -mno-trap-using-break8" } */
/* { dg-additional-options "-mtrap-unaligned-atomic" { target cris-*-elf } } */
-/* { dg-additional-options "-mno-unaligned-atomic-may-use-library" { target cris*-*-linux* } } */
#include "sync-mis-op-s-1.c"
diff --git a/gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-i-1ml.c b/gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-i-1ml.c
deleted file mode 100644
index d757a683b17..00000000000
--- a/gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-i-1ml.c
+++ /dev/null
@@ -1,4 +0,0 @@
-/* { dg-do run { target *-*-linux* } } */
-/* { dg-additional-sources "../sync-1.c" } */
-/* { dg-options "-Dxchg -Dtype=int -Dmis_ok" } */
-#include "sync-mis-op-s-1.c"
diff --git a/gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-i-2.c b/gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-i-2.c
deleted file mode 100644
index e8a425328eb..00000000000
--- a/gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-i-2.c
+++ /dev/null
@@ -1,4 +0,0 @@
-/* { dg-do run { target *-*-linux* } } */
-/* { dg-additional-sources "../sync-1.c" } */
-/* { dg-options "-Dxchg -Dtype=int -Dmisalignment=2 -mno-unaligned-atomic-may-use-library" } */
-#include "sync-mis-op-s-1.c"
diff --git a/gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-i-2a.c b/gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-i-2a.c
index 2b97613de3c..8c7918470c6 100644
--- a/gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-i-2a.c
+++ b/gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-i-2a.c
@@ -2,5 +2,4 @@
/* { dg-additional-sources "../sync-1.c" } */
/* { dg-options "-Dxchg -Dtype=int -Dmisalignment=2 -DTRAP_USING_ABORT -mno-trap-using-break8" } */
/* { dg-additional-options "-mtrap-unaligned-atomic" { target cris-*-elf } } */
-/* { dg-additional-options "-mno-unaligned-atomic-may-use-library" { target cris*-*-linux* } } */
#include "sync-mis-op-s-1.c"
diff --git a/gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-i-2ml.c b/gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-i-2ml.c
deleted file mode 100644
index fb711e0ef78..00000000000
--- a/gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-i-2ml.c
+++ /dev/null
@@ -1,4 +0,0 @@
-/* { dg-do run { target *-*-linux* } } */
-/* { dg-additional-sources "../sync-1.c" } */
-/* { dg-options "-Dxchg -Dtype=int -Dmisalignment=2 -Dmis_ok" } */
-#include "sync-mis-op-s-1.c"
diff --git a/gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-i-3.c b/gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-i-3.c
deleted file mode 100644
index 4a3511bf2fb..00000000000
--- a/gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-i-3.c
+++ /dev/null
@@ -1,4 +0,0 @@
-/* { dg-do run { target *-*-linux* } } */
-/* { dg-additional-sources "../sync-1.c" } */
-/* { dg-options "-Dxchg -Dtype=int -Dmisalignment=3 -mno-unaligned-atomic-may-use-library" } */
-#include "sync-mis-op-s-1.c"
diff --git a/gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-i-3a.c b/gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-i-3a.c
index 94a25e37f04..e7c90a360d3 100644
--- a/gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-i-3a.c
+++ b/gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-i-3a.c
@@ -2,5 +2,4 @@
/* { dg-additional-sources "../sync-1.c" } */
/* { dg-options "-Dxchg -Dtype=int -Dmisalignment=3 -DTRAP_USING_ABORT -mno-trap-using-break8" } */
/* { dg-additional-options "-mtrap-unaligned-atomic" { target cris-*-elf } } */
-/* { dg-additional-options "-mno-unaligned-atomic-may-use-library" { target cris*-*-linux* } } */
#include "sync-mis-op-s-1.c"
diff --git a/gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-i-3ml.c b/gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-i-3ml.c
deleted file mode 100644
index 32f8ebbd9bf..00000000000
--- a/gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-i-3ml.c
+++ /dev/null
@@ -1,4 +0,0 @@
-/* { dg-do run { target *-*-linux* } } */
-/* { dg-additional-sources "../sync-1.c" } */
-/* { dg-options "-Dxchg -Dtype=int -Dmisalignment=3 -Dmis_ok" } */
-#include "sync-mis-op-s-1.c"
diff --git a/gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-s-1.c b/gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-s-1.c
deleted file mode 100644
index d8dede9c1f6..00000000000
--- a/gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-s-1.c
+++ /dev/null
@@ -1,4 +0,0 @@
-/* { dg-do run { target *-*-linux* } } */
-/* { dg-additional-sources "../sync-1.c" } */
-/* { dg-options "-Dxchg -Dtype=short -mno-unaligned-atomic-may-use-library" } */
-#include "sync-mis-op-s-1.c"
diff --git a/gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-s-1a.c b/gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-s-1a.c
index 6f5eb02afed..5dcef52207d 100644
--- a/gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-s-1a.c
+++ b/gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-s-1a.c
@@ -2,5 +2,4 @@
/* { dg-additional-sources "../sync-1.c" } */
/* { dg-options "-Dxchg -Dtype=short -DTRAP_USING_ABORT -mno-trap-using-break8" } */
/* { dg-additional-options "-mtrap-unaligned-atomic" { target cris-*-elf } } */
-/* { dg-additional-options "-mno-unaligned-atomic-may-use-library" { target cris*-*-linux* } } */
#include "sync-mis-op-s-1.c"
diff --git a/gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-s-1ml.c b/gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-s-1ml.c
deleted file mode 100644
index a6f501c10cc..00000000000
--- a/gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-s-1ml.c
+++ /dev/null
@@ -1,4 +0,0 @@
-/* { dg-do run { target *-*-linux* } } */
-/* { dg-additional-sources "../sync-1.c" } */
-/* { dg-options "-Dxchg -Dtype=short -Dmis_ok" } */
-#include "sync-mis-op-s-1.c"
--
2.11.0