aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans-Peter Nilsson <hp@axis.com>2012-07-22 15:45:07 +0000
committerHans-Peter Nilsson <hp@gcc.gnu.org>2012-07-22 15:45:07 +0000
commit8a0678fa7e10bc211cef5bd3d71f9d5cf95c55fa (patch)
tree6ab010fc4d5de412b63069ab80efb59efacb782b
parent888b670f9eb00d573a2660300776b39febd12a68 (diff)
downloadgcc-8a0678fa7e10bc211cef5bd3d71f9d5cf95c55fa.zip
gcc-8a0678fa7e10bc211cef5bd3d71f9d5cf95c55fa.tar.gz
gcc-8a0678fa7e10bc211cef5bd3d71f9d5cf95c55fa.tar.bz2
Handle recent changes in default atomics for cris*-*-linux*.
* gcc.target/cris/torture/sync-mis-xchg-i-1ml.c, gcc.target/cris/torture/sync-mis-xchg-i-2ml.c, gcc.target/cris/torture/sync-mis-xchg-i-3ml.c, gcc.target/cris/torture/sync-mis-xchg-s-1ml.c, gcc.target/cris/torture/sync-mis-op-i-1ml.c, gcc.target/cris/torture/sync-mis-op-i-2ml.c, gcc.target/cris/torture/sync-mis-op-i-3ml.c, gcc.target/cris/torture/sync-mis-op-s-1ml.c: New tests. * gcc.target/cris/torture/sync-mis-op-i-2a.c: Make sure -mno-unaligned-atomic-may-use-library is in effect for cris*-*-linux*. * gcc.target/cris/torture/sync-mis-xchg-i-1.c, gcc.target/cris/torture/sync-mis-xchg-i-2.c, gcc.target/cris/torture/sync-mis-xchg-i-3.c, gcc.target/cris/torture/sync-mis-xchg-i-2a.c, gcc.target/cris/torture/sync-mis-xchg-s-1.c, gcc.target/cris/torture/sync-mis-op-i-1.c, gcc.target/cris/torture/sync-mis-op-i-2.c, gcc.target/cris/torture/sync-mis-op-i-1a.c, gcc.target/cris/torture/sync-mis-op-i-3.c, gcc.target/cris/torture/sync-mis-op-i-3a.c, gcc.target/cris/torture/sync-mis-op-s-1a.c, gcc.target/cris/torture/sync-mis-xchg-i-1a.c, gcc.target/cris/torture/sync-mis-xchg-i-3a.c, gcc.target/cris/torture/sync-mis-xchg-s-1a.c: Similar. * gcc.target/cris/torture/sync-mis-op-s-1.c: Ditto. (main): Remove local variable x. [mis_ok]: Check that atomics don't fail. From-SVN: r189757
-rw-r--r--gcc/testsuite/ChangeLog32
-rw-r--r--gcc/testsuite/gcc.target/cris/torture/sync-mis-op-i-1.c2
-rw-r--r--gcc/testsuite/gcc.target/cris/torture/sync-mis-op-i-1a.c1
-rw-r--r--gcc/testsuite/gcc.target/cris/torture/sync-mis-op-i-1ml.c4
-rw-r--r--gcc/testsuite/gcc.target/cris/torture/sync-mis-op-i-2.c2
-rw-r--r--gcc/testsuite/gcc.target/cris/torture/sync-mis-op-i-2a.c1
-rw-r--r--gcc/testsuite/gcc.target/cris/torture/sync-mis-op-i-2ml.c4
-rw-r--r--gcc/testsuite/gcc.target/cris/torture/sync-mis-op-i-3.c2
-rw-r--r--gcc/testsuite/gcc.target/cris/torture/sync-mis-op-i-3a.c1
-rw-r--r--gcc/testsuite/gcc.target/cris/torture/sync-mis-op-i-3ml.c4
-rw-r--r--gcc/testsuite/gcc.target/cris/torture/sync-mis-op-s-1.c19
-rw-r--r--gcc/testsuite/gcc.target/cris/torture/sync-mis-op-s-1a.c1
-rw-r--r--gcc/testsuite/gcc.target/cris/torture/sync-mis-op-s-1ml.c4
-rw-r--r--gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-i-1.c2
-rw-r--r--gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-i-1a.c1
-rw-r--r--gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-i-1ml.c4
-rw-r--r--gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-i-2.c2
-rw-r--r--gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-i-2a.c1
-rw-r--r--gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-i-2ml.c4
-rw-r--r--gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-i-3.c2
-rw-r--r--gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-i-3a.c1
-rw-r--r--gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-i-3ml.c4
-rw-r--r--gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-s-1.c2
-rw-r--r--gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-s-1a.c1
-rw-r--r--gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-s-1ml.c4
25 files changed, 96 insertions, 9 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 2731f8d..f2bb333 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,35 @@
+2012-07-22 Hans-Peter Nilsson <hp@axis.com>
+
+ Handle recent changes in default atomics for cris*-*-linux*.
+ * gcc.target/cris/torture/sync-mis-xchg-i-1ml.c,
+ gcc.target/cris/torture/sync-mis-xchg-i-2ml.c,
+ gcc.target/cris/torture/sync-mis-xchg-i-3ml.c,
+ gcc.target/cris/torture/sync-mis-xchg-s-1ml.c,
+ gcc.target/cris/torture/sync-mis-op-i-1ml.c,
+ gcc.target/cris/torture/sync-mis-op-i-2ml.c,
+ gcc.target/cris/torture/sync-mis-op-i-3ml.c,
+ gcc.target/cris/torture/sync-mis-op-s-1ml.c: New tests.
+ * gcc.target/cris/torture/sync-mis-op-i-2a.c: Make sure
+ -mno-unaligned-atomic-may-use-library is in effect for
+ cris*-*-linux*.
+ * gcc.target/cris/torture/sync-mis-xchg-i-1.c,
+ gcc.target/cris/torture/sync-mis-xchg-i-2.c,
+ gcc.target/cris/torture/sync-mis-xchg-i-3.c,
+ gcc.target/cris/torture/sync-mis-xchg-i-2a.c,
+ gcc.target/cris/torture/sync-mis-xchg-s-1.c,
+ gcc.target/cris/torture/sync-mis-op-i-1.c,
+ gcc.target/cris/torture/sync-mis-op-i-2.c,
+ gcc.target/cris/torture/sync-mis-op-i-1a.c,
+ gcc.target/cris/torture/sync-mis-op-i-3.c,
+ gcc.target/cris/torture/sync-mis-op-i-3a.c,
+ gcc.target/cris/torture/sync-mis-op-s-1a.c,
+ gcc.target/cris/torture/sync-mis-xchg-i-1a.c,
+ gcc.target/cris/torture/sync-mis-xchg-i-3a.c,
+ gcc.target/cris/torture/sync-mis-xchg-s-1a.c: Similar.
+ * gcc.target/cris/torture/sync-mis-op-s-1.c: Ditto.
+ (main): Remove local variable x.
+ [mis_ok]: Check that atomics don't fail.
+
2012-07-21 Andrew Pinski <apinski@cavium.com>
* gcc.dg/tree-ssa/vrp72.c: New test.
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
index 733ec4b..dd8704c 100644
--- 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
@@ -1,4 +1,4 @@
/* { dg-do run { target *-*-linux* } } */
/* { dg-additional-sources "../sync-1.c" } */
-/* { dg-options "-Dop -Dtype=int" } */
+/* { 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 4cd2333..8055fd3 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,4 +2,5 @@
/* { 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
new file mode 100644
index 0000000..c8cef18
--- /dev/null
+++ b/gcc/testsuite/gcc.target/cris/torture/sync-mis-op-i-1ml.c
@@ -0,0 +1,4 @@
+/* { 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
index 97d0bf0..3c162e9 100644
--- 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
@@ -1,4 +1,4 @@
/* { dg-do run { target *-*-linux* } } */
/* { dg-additional-sources "../sync-1.c" } */
-/* { dg-options "-Dop -Dtype=int -Dmisalignment=2" } */
+/* { 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 3596e9e..61e1c204 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,4 +2,5 @@
/* { 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
new file mode 100644
index 0000000..0d78e90
--- /dev/null
+++ b/gcc/testsuite/gcc.target/cris/torture/sync-mis-op-i-2ml.c
@@ -0,0 +1,4 @@
+/* { 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
index 0747946..626a3d5 100644
--- 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
@@ -1,4 +1,4 @@
/* { dg-do run { target *-*-linux* } } */
/* { dg-additional-sources "../sync-1.c" } */
-/* { dg-options "-Dop -Dtype=int -Dmisalignment=3" } */
+/* { 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 46a04f4..339e74c 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,4 +2,5 @@
/* { 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
new file mode 100644
index 0000000..17c6d34
--- /dev/null
+++ b/gcc/testsuite/gcc.target/cris/torture/sync-mis-op-i-3ml.c
@@ -0,0 +1,4 @@
+/* { 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 21b5269..f2835aa 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,6 +1,6 @@
/* { dg-do run { target *-*-linux* } } */
/* { dg-additional-sources "../sync-1.c" } */
-/* { dg-options "-Dop -Dtype=short" } */
+/* { dg-options "-Dop -Dtype=short -mno-unaligned-atomic-may-use-library" } */
/* Make sure we get a SIGTRAP or equivalent when passing unaligned
but otherwise valid pointers to the atomic builtins. */
@@ -76,7 +76,6 @@ void trap_handler(int signum)
int main(void)
{
- type x = 0;
type ret;
#ifndef TRAP_USING_ABORT
@@ -86,7 +85,9 @@ int main(void)
#endif
#endif
+#ifndef mis_ok
trap_expected = 1;
+#endif
#if op
sfa (&s.i, &s.i, 42);
@@ -98,10 +99,24 @@ int main(void)
should do it. */
trap_expected = 0;
+#ifdef mis_ok
+ /* We're missing a sequence point, but we shouldn't have the initial
+ value. */
+ if (s.i == (type) 0xdeadbeef)
+ abort ();
+ exit (0);
+#endif
+
sfa (&x, &x, 1);
#else
acen (&s.i, &x, &ret);
+#ifdef mis_ok
+ if (s.i != 2 || x != 2 || ret != (type) 0xdeadbeef)
+ abort ();
+ exit (0);
+#endif
+
trap_expected = 0;
acen (&x, &x, &ret);
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 fc91e7c..ba63917 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,4 +2,5 @@
/* { 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
new file mode 100644
index 0000000..3685c50
--- /dev/null
+++ b/gcc/testsuite/gcc.target/cris/torture/sync-mis-op-s-1ml.c
@@ -0,0 +1,4 @@
+/* { 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
index 1072cac..da25614 100644
--- 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
@@ -1,4 +1,4 @@
/* { dg-do run { target *-*-linux* } } */
/* { dg-additional-sources "../sync-1.c" } */
-/* { dg-options "-Dxchg -Dtype=int" } */
+/* { 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 af6ef8a..09a7a9e 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,4 +2,5 @@
/* { 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
new file mode 100644
index 0000000..d757a68
--- /dev/null
+++ b/gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-i-1ml.c
@@ -0,0 +1,4 @@
+/* { 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
index b02f487..e8a4253 100644
--- 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
@@ -1,4 +1,4 @@
/* { dg-do run { target *-*-linux* } } */
/* { dg-additional-sources "../sync-1.c" } */
-/* { dg-options "-Dxchg -Dtype=int -Dmisalignment=2" } */
+/* { 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 8c79184..2b97613 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,4 +2,5 @@
/* { 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
new file mode 100644
index 0000000..fb711e0
--- /dev/null
+++ b/gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-i-2ml.c
@@ -0,0 +1,4 @@
+/* { 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
index 637aecf..4a3511b 100644
--- 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
@@ -1,4 +1,4 @@
/* { dg-do run { target *-*-linux* } } */
/* { dg-additional-sources "../sync-1.c" } */
-/* { dg-options "-Dxchg -Dtype=int -Dmisalignment=3" } */
+/* { 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 e7c90a3..94a25e3 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,4 +2,5 @@
/* { 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
new file mode 100644
index 0000000..32f8ebb
--- /dev/null
+++ b/gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-i-3ml.c
@@ -0,0 +1,4 @@
+/* { 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
index 7374285..d8dede9 100644
--- 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
@@ -1,4 +1,4 @@
/* { dg-do run { target *-*-linux* } } */
/* { dg-additional-sources "../sync-1.c" } */
-/* { dg-options "-Dxchg -Dtype=short" } */
+/* { 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 5dcef52..6f5eb02 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,4 +2,5 @@
/* { 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
new file mode 100644
index 0000000..a6f501c
--- /dev/null
+++ b/gcc/testsuite/gcc.target/cris/torture/sync-mis-xchg-s-1ml.c
@@ -0,0 +1,4 @@
+/* { 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"