diff mbox

[testsuite] fix ARM tests with options that conflict with thumb1

Message ID 53E93C6C.30509@mentor.com
State New
Headers show

Commit Message

Janis Johnson Aug. 11, 2014, 9:58 p.m. UTC
Two tests in gcc.target/arm add options that conflict with thumb1
multilib flags; skip them.  Tested with arm-none-linux-gnu for mainline
and 4.9 for a variety of multilib flags.

OK for mainline and 4.9 branch?

Janis
2014-08-11  Janis Johnson  <janisjo@codesourcery.com>

	* gcc.target/arm/pr48784.c: Skip for thumb1 multilib.
	* gcc.target/arm/pr59985.c: Likewise.

Comments

Mike Stump Aug. 11, 2014, 11:48 p.m. UTC | #1
On Aug 11, 2014, at 2:58 PM, Janis Johnson <janis_johnson@mentor.com> wrote:
> Two tests in gcc.target/arm add options that conflict with thumb1
> multilib flags; skip them.  Tested with arm-none-linux-gnu for mainline
> and 4.9 for a variety of multilib flags.
> 
> OK for mainline and 4.9 branch?

So, my take is you can self-review things like this if you would like.  Doesn’t look controversial and likely you understand the issues better than most.

Ok.

Nit, if you discover a way to figure out incompatible options, it would be nicer to use it.  The usual gcc rules are, last option wins, which generally precludes noticing conflicting options.  I only mention this here, in case people want to contemplate conflicting options.
Mike Stump Aug. 11, 2014, 11:53 p.m. UTC | #2
[ dup, sorry ]

On Aug 11, 2014, at 2:58 PM, Janis Johnson <janis_johnson@mentor.com> wrote:
> Two tests in gcc.target/arm add options that conflict with thumb1
> multilib flags; skip them.  Tested with arm-none-linux-gnu for mainline
> and 4.9 for a variety of multilib flags.
> 
> OK for mainline and 4.9 branch?

So, my take is you can self-review things like this if you would like.  Doesn’t look controversial and likely you understand the issues better than most.

Ok.

Nit, if you discover a way to figure out incompatible options, it would be nicer to use it.  The usual gcc rules are, last option wins, which generally precludes noticing conflicting options.  I only mention this here, in case people want to contemplate conflicting options.
diff mbox

Patch

Index: gcc/testsuite/gcc.target/arm/pr58784.c
===================================================================
--- gcc/testsuite/gcc.target/arm/pr58784.c	(revision 437379)
+++ gcc/testsuite/gcc.target/arm/pr58784.c	(working copy)
@@ -1,4 +1,5 @@ 
 /* { dg-do compile } */
+/* { dg-skip-if "incompatible options" { arm_thumb1 } { "*" } { "" } } */
 /* { dg-options "-march=armv7-a -mfloat-abi=hard -mfpu=neon -marm -O2" } */
 
 typedef struct __attribute__ ((__packed__))
Index: gcc/testsuite/gcc.target/arm/pr59985.C
===================================================================
--- gcc/testsuite/gcc.target/arm/pr59985.C	(revision 437379)
+++ gcc/testsuite/gcc.target/arm/pr59985.C	(working copy)
@@ -1,4 +1,5 @@ 
 /* { dg-do compile } */
+/* { dg-skip-if "incompatible options" { arm_thumb1 } { "*" } { "" } } */
 /* { dg-options "-g -fcompare-debug -O2 -march=armv7-a -mtune=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=hard" } */
 
 extern void *f1 (unsigned long, unsigned long);