From: Janis Johnson <janisjo@codesourcery.com>
Date: Tue, 15 Jan 2013 18:22:50 +0000 (+0000)
Subject: fma.c: Skip for conflicting multilib options.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5dec2613e80ab6b80aa6f31149d6f905402478f7;p=gcc.git

fma.c: Skip for conflicting multilib options.

	* gcc.target/arm/fma.c: Skip for conflicting multilib options.
	* gcc.target/arm/fma-sp.c: Likewise.

From-SVN: r195213
---

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 340bbcecd8e..16d6e88d192 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-15  Janis Johnson  <janisjo@codesourcery.com>
+
+	* gcc.target/arm/fma.c: Skip for conflicting multilib options.
+	* gcc.target/arm/fma-sp.c: Likewise.
+
 2013-01-15  Vladimir Makarov  <vmakarov@redhat.com>
 
 	PR rtl-optimization/pr55153
diff --git a/gcc/testsuite/gcc.target/arm/fma-sp.c b/gcc/testsuite/gcc.target/arm/fma-sp.c
index 457b55c8c22..e1884545f0d 100644
--- a/gcc/testsuite/gcc.target/arm/fma-sp.c
+++ b/gcc/testsuite/gcc.target/arm/fma-sp.c
@@ -1,5 +1,9 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mthumb" } */
+/* { dg-skip-if "avoid conflicts with multilib options" { ! arm_thumb2_ok } { "-march=*" } { "" } } */
+/* { dg-skip-if "avoid conflicts with multilib options" { *-*-* } { "-mcpu=*" } { "-mcpu=cortex-m4" } } */
+/* { dg-skip-if "avoid conflicts with multilib options" { *-*-* } { "-mfpu=*" } { "-mfpu=fpv4-sp-d16" } } */
+/* { dg-skip-if "avoid conflicts with multilib options" { *-*-* } { "-mfloat-abi=*" } { "-mfloat-abi=hard" } } */
+/* { dg-options "-O2 -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mthumb -mfloat-abi=hard" } */
 
 #include "fma.h"
 
diff --git a/gcc/testsuite/gcc.target/arm/fma.c b/gcc/testsuite/gcc.target/arm/fma.c
index 1809aa8d434..704559a5791 100644
--- a/gcc/testsuite/gcc.target/arm/fma.c
+++ b/gcc/testsuite/gcc.target/arm/fma.c
@@ -1,5 +1,9 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -mcpu=cortex-a15 -mfpu=vfpv4" } */
+/* { dg-skip-if "avoid conflicts with multilib options" { ! arm_thumb2_ok } { "-mthumb" } { "" } } */
+/* { dg-skip-if "avoid conflicts with multilib options" { *-*-* } { "-mcpu=*" } { "-mcpu=cortex-a15" } } */
+/* { dg-skip-if "avoid conflicts with multilib options" { *-*-* } { "-mfpu=*" } { "-mfpu=vfpv4" } } */
+/* { dg-skip-if "avoid conflicts with multilib options" { *-*-* } { "-mfloat-abi=*" } { "-mfloat-abi=hard" } } */
+/* { dg-options "-O2 -mcpu=cortex-a15 -mfpu=vfpv4 -mfloat-abi=hard" } */
 
 #include "fma.h"