[testsuite patch] don't add ARM options for a thumb1 multilib

[Janis Johnson]

Test gcc.dg/pr59418.c adds ARM-specific options for an ARM target, but
those options conflict with flags for a thumb1 multilib.  Don't add
the extra ARM flags for a thumb1 multilib.  Tested with arm-none-linux-gnu
for mainline and 4.9 with a variety of multilib flags.

OK for mainline and the 4.9 branch?

Janis

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

        * gcc.dg/pr59418.c: Don't add ARM options for a Thumb1 multilib.

Index: gcc/testsuite/gcc.dg/pr59418.c
===================================================================
--- gcc/testsuite/gcc.dg/pr59418.c      (revision 437379)
+++ gcc/testsuite/gcc.dg/pr59418.c      (working copy)
@@ -3,7 +3,7 @@
 
 /* { dg-do compile } */
 /* { dg-options "-Os -g" } */
-/* { dg-options "-march=armv7-a -mfloat-abi=hard -Os -g" { target arm*-*-* } } 
*/
+/* { dg-options "-march=armv7-a -mfloat-abi=hard -Os -g" { target { arm*-*-* 
&& { ! arm_thumb1 } } } } */
 
 extern int printf (const char *__format, ...);