[arm] Fix gcc.target/arm/xor-and.c

This test is naughty because it doesn't use the proper effective target checks
and add-options mechanisms for setting a Thumb1 target, which leads to Thumb1 hard-float errors
when testing a toolchain configured with --with-cpu=cortex-a15 --with-fpu=neon-vfpv4 --with-float=hard --with-mode=thumb.

This patch fixes that in the obvious way.

	* gcc.target/arm/xor-and.c: Fix armv6 effective target checks
	and options.

From-SVN: r256782

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9449d5e8f69885bdf0ebea50d9e0f70bc5e53840..2e5a53b1d70e492a746d23a2b84958327efec38b 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2018-01-17  Kyrylo Tkachov <kyrylo.tkachov@arm.com>
+
+       * gcc.target/arm/xor-and.c: Fix armv6 effective target checks
+       and options.
+
 2018-01-17  Jakub Jelinek  <jakub@redhat.com>
 
        PR rtl-optimization/83771

diff --git a/gcc/testsuite/gcc.target/arm/xor-and.c b/gcc/testsuite/gcc.target/arm/xor-and.c
index 3715530cd7bf9ad8abb24cb21cd51ae3802079e8..9afa81d3ec10c983ba2555c867f6f00a85f80150 100644 (file)
--- a/gcc/testsuite/gcc.target/arm/xor-and.c
+++ b/gcc/testsuite/gcc.target/arm/xor-and.c
@@ -1,6 +1,7 @@
 /* { dg-do compile } */
-/* { dg-options "-O -march=armv6" } */
-/* { dg-prune-output "switch .* conflicts with" } */
+/* { dg-require-effective-target arm_arch_v6_ok } */
+/* { dg-add-options arm_arch_v6 } */
+/* { dg-options "-O" }  */
 
 unsigned short foo (unsigned short x)
 {