From: Hans-Peter Nilsson <hp@axis.com>
Date: Sun, 22 Jul 2012 15:45:07 +0000 (+0000)
Subject: Handle recent changes in default atomics for cris*-*-linux*.
X-Git-Tag: releases/gcc-4.8.0~4339
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8a0678fa7e10bc211cef5bd3d71f9d5cf95c55fa;p=thirdparty%2Fgcc.git

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
---

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 2731f8d26e3e..f2bb333adbea 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 733ec4bac57b..dd8704cc92dc 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 4cd233316e26..8055fd380e9f 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 000000000000..c8cef184149f
--- /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 97d0bf067b0e..3c162e96a4df 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 3596e9ea5b18..61e1c2047b40 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 000000000000..0d78e90019d7
--- /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 07479469f49d..626a3d5cba42 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 46a04f42c0ea..339e74cd86c6 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 000000000000..17c6d34d11a3
--- /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 21b5269eced5..f2835aa06c11 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 fc91e7c9a8a0..ba639172ba93 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 000000000000..3685c5047311
--- /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 1072caca9ca2..da25614e23b6 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 af6ef8ac748d..09a7a9ea3a0d 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 000000000000..d757a683b17b
--- /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 b02f4875b025..e8a425328eb2 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 8c7918470c64..2b97613de3ce 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 000000000000..fb711e0ef78b
--- /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 637aecfd288c..4a3511bf2fbd 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 e7c90a360d39..94a25e37f044 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 000000000000..32f8ebbd9bf0
--- /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 73742854ed5d..d8dede9c1f61 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 5dcef52207d3..6f5eb02afedd 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 000000000000..a6f501c10cc8
--- /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"