*.c: Remove excess braces from target selectors.

* gcc.target/i386/*.c: Remove excess braces from target selectors. From-SVN: r251419

*.c: Remove excess braces from target selectors.
* gcc.target/i386/*.c: Remove excess braces from target selectors. From-SVN: r251419
4e395d91 · Uros Bizjak · Uros Bizjak · 9f1c93df · 4e395d91 · 4e395d91
Commit 4e395d91 authored Aug 29, 2017 by Uros Bizjak Committed by Uros Bizjak Aug 29, 2017
84 changed files
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
 2017-08-29  Uros Bizjak  <ubizjak@gmail.com>

+	* gcc.target/i386/*.c: Remove excess braces from target selectors.
+
+2017-08-29  Uros Bizjak  <ubizjak@gmail.com>
+
 	* gcc.target/i386/20030926-1.c: Add dg-additional-options.
 	* gcc.target/i386/abi-2.c: Ditto.
 	* gcc.target/i386/interrupt-sibcall-2.c: Ditto.

--- a/gcc/testsuite/gcc.target/i386/bmi-andn-2.c
+++ b/gcc/testsuite/gcc.target/i386/bmi-andn-2.c
-/* { dg-do run { target { bmi } } } */
+/* { dg-do run { target bmi } } */
 /* { dg-options "-O2 -mbmi -fno-inline" } */

 #include <x86intrin.h>

--- a/gcc/testsuite/gcc.target/i386/bmi-bextr-2.c
+++ b/gcc/testsuite/gcc.target/i386/bmi-bextr-2.c
-/* { dg-do run { target { bmi } } } */
-/* { dg-require-effective-target bmi  } */
+/* { dg-do run { target bmi } } */
 /* { dg-options "-O2 -mbmi -fno-inline" } */

 #include <x86intrin.h>

--- a/gcc/testsuite/gcc.target/i386/bmi-bextr-4.c
+++ b/gcc/testsuite/gcc.target/i386/bmi-bextr-4.c
-/* { dg-do run { target { bmi } } } */
-/* { dg-require-effective-target bmi  } */
+/* { dg-do run { target bmi } } */
 /* { dg-options "-O2 -mbmi -fno-inline" } */

 #include <x86intrin.h>

--- a/gcc/testsuite/gcc.target/i386/bmi-blsi-2.c
+++ b/gcc/testsuite/gcc.target/i386/bmi-blsi-2.c
-/* { dg-do run { target { bmi } } } */
+/* { dg-do run { target bmi } } */
 /* { dg-options "-O2 -mbmi -fno-inline" } */

 #include <x86intrin.h>

--- a/gcc/testsuite/gcc.target/i386/bmi-blsmsk-2.c
+++ b/gcc/testsuite/gcc.target/i386/bmi-blsmsk-2.c
-/* { dg-do run { target { bmi } } } */
+/* { dg-do run { target bmi } } */
 /* { dg-options "-O2 -mbmi -fno-inline" } */

 #include <x86intrin.h>

--- a/gcc/testsuite/gcc.target/i386/bmi-blsr-2.c
+++ b/gcc/testsuite/gcc.target/i386/bmi-blsr-2.c
-/* { dg-do run { target { bmi } } } */
+/* { dg-do run { target bmi } } */
 /* { dg-options "-O2 -mbmi -fno-inline" } */

 #include <x86intrin.h>

--- a/gcc/testsuite/gcc.target/i386/bmi-tzcnt-2.c
+++ b/gcc/testsuite/gcc.target/i386/bmi-tzcnt-2.c
-/* { dg-do run { target { bmi } } } */
+/* { dg-do run { target bmi } } */
 /* { dg-options "-O2 -mbmi -fno-inline" } */

 #include <x86intrin.h>

--- a/gcc/testsuite/gcc.target/i386/bmi2-bzhi32-1.c
+++ b/gcc/testsuite/gcc.target/i386/bmi2-bzhi32-1.c
-/* { dg-do run { target { bmi2 } } } */
+/* { dg-do run { target bmi2 } } */
 /* { dg-options "-mbmi2 -O2" } */

 #include <x86intrin.h>

--- a/gcc/testsuite/gcc.target/i386/bmi2-mulx32-1.c
+++ b/gcc/testsuite/gcc.target/i386/bmi2-mulx32-1.c
-/* { dg-do run { target { bmi2 && { ia32 } } } } */
+/* { dg-do run { target { bmi2 && ia32 } } } */
 /* { dg-options "-mbmi2 -O2" } */

 #include "bmi2-check.h"

--- a/gcc/testsuite/gcc.target/i386/bmi2-mulx32-1a.c
+++ b/gcc/testsuite/gcc.target/i386/bmi2-mulx32-1a.c
-/* { dg-do compile { target { ia32 } } } */
+/* { dg-do compile { target ia32 } } */
 /* { dg-options "-O2 -mbmi2 -dp" } */

 #include "bmi2-mulx32-1.c"

--- a/gcc/testsuite/gcc.target/i386/bmi2-mulx32-2.c
+++ b/gcc/testsuite/gcc.target/i386/bmi2-mulx32-2.c
-/* { dg-do run { target { bmi2 && { ia32 } } } } */
+/* { dg-do run { target { bmi2 && ia32 } } } */
 /* { dg-options "-mbmi2 -O2" } */

 #include <x86intrin.h>

--- a/gcc/testsuite/gcc.target/i386/bmi2-mulx32-2a.c
+++ b/gcc/testsuite/gcc.target/i386/bmi2-mulx32-2a.c
-/* { dg-do compile { target { ia32 } } } */
+/* { dg-do compile { target ia32 } } */
 /* { dg-options "-O2 -mbmi2" } */

 #include "bmi2-mulx32-2.c"

--- a/gcc/testsuite/gcc.target/i386/bmi2-pdep32-1.c
+++ b/gcc/testsuite/gcc.target/i386/bmi2-pdep32-1.c
-/* { dg-do run { target { bmi2 } } } */
+/* { dg-do run { target bmi2 } } */
 /* { dg-options "-mbmi2 -O2" } */

 #include <x86intrin.h>

--- a/gcc/testsuite/gcc.target/i386/bmi2-pext32-1.c
+++ b/gcc/testsuite/gcc.target/i386/bmi2-pext32-1.c
-/* { dg-do run { target { bmi2 } } } */
+/* { dg-do run { target bmi2 } } */
 /* { dg-options "-mbmi2 -O2" } */

 #include <x86intrin.h>

--- a/gcc/testsuite/gcc.target/i386/bmi2-rorx32-1.c
+++ b/gcc/testsuite/gcc.target/i386/bmi2-rorx32-1.c
-/* { dg-do run { target { bmi2 } } } */
+/* { dg-do run { target bmi2 } } */
 /* { dg-options "-mbmi2 -O2 -dp" } */

 #include "bmi2-check.h"

--- a/gcc/testsuite/gcc.target/i386/bmi2-sarx32-1.c
+++ b/gcc/testsuite/gcc.target/i386/bmi2-sarx32-1.c
-/* { dg-do run { target { bmi2 } } } */
+/* { dg-do run { target bmi2 } } */
 /* { dg-options "-mbmi2 -O2 -dp" } */

 #include "bmi2-check.h"

--- a/gcc/testsuite/gcc.target/i386/bmi2-shlx32-1.c
+++ b/gcc/testsuite/gcc.target/i386/bmi2-shlx32-1.c
-/* { dg-do run { target { bmi2 } } } */
+/* { dg-do run { target bmi2 } } */
 /* { dg-options "-mbmi2 -O2 -dp" } */

 #include "bmi2-check.h"

--- a/gcc/testsuite/gcc.target/i386/bmi2-shrx32-1.c
+++ b/gcc/testsuite/gcc.target/i386/bmi2-shrx32-1.c
-/* { dg-do run { target { bmi2 } } } */
+/* { dg-do run { target bmi2 } } */
 /* { dg-options "-mbmi2 -O2 -dp" } */

 #include "bmi2-check.h"

--- a/gcc/testsuite/gcc.target/i386/fentry-override.c
+++ b/gcc/testsuite/gcc.target/i386/fentry-override.c
 /* Test -mfentry override */
-/* { dg-do compile { target { { *-*-linux* } && { ! ia32 } } } } */
+/* { dg-do compile { target { *-*-linux* && { ! ia32 } } } } */
 /* { dg-options "-mfentry" } */
 /* { dg-final { scan-assembler-not "__fentry__" } } */
 /* Origin: Andi Kleen */

--- a/gcc/testsuite/gcc.target/i386/fentry.c
+++ b/gcc/testsuite/gcc.target/i386/fentry.c
 /* Test -mfentry */
-/* { dg-do compile { target { { *-*-linux* } && { ! ia32 } } } } */
+/* { dg-do compile { target { *-*-linux* && { ! ia32 } } } } */
 /* { dg-options "-fprofile -mfentry" } */
 /* { dg-final { scan-assembler "__fentry__" } } */
 /* Origin: Andi Kleen */

--- a/gcc/testsuite/gcc.target/i386/interrupt-sibcall-2.c
+++ b/gcc/testsuite/gcc.target/i386/interrupt-sibcall-2.c
 /* { dg-do compile } */
 /* { dg-options "-O3 -mgeneral-regs-only -mno-cld" } */
 /* { dg-additional-options "-mpreferred-stack-boundary=3" { target { ! ia32 } } }  */
-/* { dg-additional-options "-mpreferred-stack-boundary=2" { target { ia32 } } } */
+/* { dg-additional-options "-mpreferred-stack-boundary=2" { target ia32 } } */

 extern void foo (void *) __attribute__ ((interrupt));
 extern void bar (void) __attribute__ ((no_caller_saved_registers));

--- a/gcc/testsuite/gcc.target/i386/memcpy-strategy-1.c
+++ b/gcc/testsuite/gcc.target/i386/memcpy-strategy-1.c
@@ -2,7 +2,7 @@
 /* { dg-skip-if "" { *-*-* } { "-march=*" } { "-march=atom" } } */
 /* { dg-options "-O2 -march=atom -mmemcpy-strategy=vector_loop:-1:align" } */
 /* { dg-final { scan-assembler-times "movdqa" 8 { target { ! ia32 } } } } */
-/* { dg-final { scan-assembler-times "movdqa" 4 { target { ia32 } } } } */
+/* { dg-final { scan-assembler-times "movdqa" 4 { target ia32 } } } */

 char a[2048];
 char b[2048];

--- a/gcc/testsuite/gcc.target/i386/memcpy-strategy-2.c
+++ b/gcc/testsuite/gcc.target/i386/memcpy-strategy-2.c
@@ -2,7 +2,7 @@
 /* { dg-skip-if "" { *-*-* } { "-march=*" } { "-march=atom" } } */
 /* { dg-options "-O2 -march=atom -mmemcpy-strategy=vector_loop:3000:align,libcall:-1:align" } */
 /* { dg-final { scan-assembler-times "movdqa" 8 { target { ! ia32 } } } } */
-/* { dg-final { scan-assembler-times "movdqa" 4 { target { ia32 } } } } */
+/* { dg-final { scan-assembler-times "movdqa" 4 { target ia32 } } } */

 char a[2048];
 char b[2048];

--- a/gcc/testsuite/gcc.target/i386/memcpy-vector_loop-1.c
+++ b/gcc/testsuite/gcc.target/i386/memcpy-vector_loop-1.c
@@ -2,7 +2,7 @@
 /* { dg-skip-if "" { *-*-* } { "-march=*" } { "-march=atom" } } */
 /* { dg-options "-O2 -march=atom -minline-all-stringops -mstringop-strategy=vector_loop" } */
 /* { dg-final { scan-assembler-times "movdqa" 8 { target { ! ia32 } } } } */
-/* { dg-final { scan-assembler-times "movdqa" 4 { target { ia32 } } } } */
+/* { dg-final { scan-assembler-times "movdqa" 4 { target ia32 } } } */

 char a[2048];
 char b[2048];

--- a/gcc/testsuite/gcc.target/i386/nop-mcount.c
+++ b/gcc/testsuite/gcc.target/i386/nop-mcount.c
 /* Test -mnop-mcount */
-/* { dg-do compile { target { { *-*-linux* } && nonpic } } } */
+/* { dg-do compile { target { *-*-linux* && nonpic } } } */
 /* { dg-options "-pg -mfentry -mrecord-mcount -mnop-mcount" } */
 /* { dg-final { scan-assembler-not "__fentry__" } } */
 /* Origin: Andi Kleen */

--- a/gcc/testsuite/gcc.target/i386/noplt-gd-2.c
+++ b/gcc/testsuite/gcc.target/i386/noplt-gd-2.c
-/* { dg-do run { target { *-*-linux* } } } */
+/* { dg-do run { target *-*-linux* } } */
 /* { dg-options "-O2 -fpic -fno-plt" } */
 /* { dg-additional-sources noplt-gd-1.c } */


--- a/gcc/testsuite/gcc.target/i386/noplt-ld-2.c
+++ b/gcc/testsuite/gcc.target/i386/noplt-ld-2.c
-/* { dg-do run { target { *-*-linux* } } } */
+/* { dg-do run { target *-*-linux* } } */
 /* { dg-options "-O2 -fpic -fno-plt" } */
 /* { dg-additional-sources noplt-ld-1.c } */


--- a/gcc/testsuite/gcc.target/i386/pad-2.c
+++ b/gcc/testsuite/gcc.target/i386/pad-2.c
@@ -2,7 +2,7 @@
 /* { dg-skip-if "" { *-*-* } { "-march=*" } { "-march=atom" } } */
 /* { dg-options "-O2 -fomit-frame-pointer -march=atom" } */
 /* { dg-final { scan-assembler-times "nop" 8 { target { ! x86_64-*-mingw* } } } } */
-/* { dg-final { scan-assembler-times "nop" 6 { target { x86_64-*-mingw* } } } } */
+/* { dg-final { scan-assembler-times "nop" 6 { target x86_64-*-mingw* } } } */
 /* { dg-final { scan-assembler-not "rep" } } */

 void

--- a/gcc/testsuite/gcc.target/i386/pad-5b.c
+++ b/gcc/testsuite/gcc.target/i386/pad-5b.c
@@ -2,7 +2,7 @@
 /* { dg-skip-if "" { *-*-* } { "-march=*" } { "-march=atom" } } */
 /* { dg-options "-O2 -fomit-frame-pointer -march=atom" } */
 /* { dg-final { scan-assembler-times "nop" 4 { target { ! x86_64-*-mingw* } } } } */
-/* { dg-final { scan-assembler-times "nop" 2 { target { x86_64-*-mingw* } } } } */
+/* { dg-final { scan-assembler-times "nop" 2 { target x86_64-*-mingw* } } } */
 /* { dg-final { scan-assembler-not "rep" } } */

 int

--- a/gcc/testsuite/gcc.target/i386/pad-6b.c
+++ b/gcc/testsuite/gcc.target/i386/pad-6b.c
@@ -2,7 +2,7 @@
 /* { dg-skip-if "" { *-*-* } { "-march=*" } { "-march=atom" } } */
 /* { dg-options "-O2 -fomit-frame-pointer -march=atom" } */
 /* { dg-final { scan-assembler-times "nop" 6 { target { ! x86_64-*-mingw* } } } } */
-/* { dg-final { scan-assembler-times "nop" 4 { target { x86_64-*-mingw* } } } } */
+/* { dg-final { scan-assembler-times "nop" 4 { target x86_64-*-mingw* } } } */
 /* { dg-final { scan-assembler-not "rep" } } */

 int

--- a/gcc/testsuite/gcc.target/i386/pad-8.c
+++ b/gcc/testsuite/gcc.target/i386/pad-8.c
@@ -2,7 +2,7 @@
 /* { dg-skip-if "" { *-*-* } { "-march=*" } { "-march=atom" } } */
 /* { dg-options "-O2 -fomit-frame-pointer -march=atom" } */
 /* { dg-final { scan-assembler-times "nop" 6 { target { ! x86_64-*-mingw* } } } } */
-/* { dg-final { scan-assembler-times "nop" 4 { target { x86_64-*-mingw* } } } } */
+/* { dg-final { scan-assembler-times "nop" 4 { target x86_64-*-mingw* } } } */
 /* { dg-final { scan-assembler-not "rep" } } */

 int

--- a/gcc/testsuite/gcc.target/i386/pad-9.c
+++ b/gcc/testsuite/gcc.target/i386/pad-9.c
@@ -2,7 +2,7 @@
 /* { dg-skip-if "" { *-*-* } { "-march=*" } { "-march=atom" } } */
 /* { dg-options "-O2 -fomit-frame-pointer -march=atom" } */
 /* { dg-final { scan-assembler-times "nop" 4 { target { ! x86_64-*-mingw* } } } } */
-/* { dg-final { scan-assembler-times "nop" 2 { target { x86_64-*-mingw* } } } } */
+/* { dg-final { scan-assembler-times "nop" 2 { target x86_64-*-mingw* } } } */
 /* { dg-final { scan-assembler-not "rep" } } */

 extern void bar (void);

--- a/gcc/testsuite/gcc.target/i386/pr49504.c
+++ b/gcc/testsuite/gcc.target/i386/pr49504.c
 /* PR target/49504 */
-/* { dg-do run { target { x32 } } } */
+/* { dg-do run { target x32 } } */
 /* { dg-options "-O" } */

 unsigned long long 

--- a/gcc/testsuite/gcc.target/i386/pr52876.c
+++ b/gcc/testsuite/gcc.target/i386/pr52876.c
-/* { dg-do run { target { x32 } } } */
+/* { dg-do run { target x32 } } */
 /* { dg-options "-O2 -mx32 -maddress-mode=long" } */

 extern void abort (void);

--- a/gcc/testsuite/gcc.target/i386/pr55433.c
+++ b/gcc/testsuite/gcc.target/i386/pr55433.c
-/* { dg-do compile { target { *-*-darwin* } } } */
+/* { dg-do compile { target *-*-darwin* } } */
 /* { dg-options "-O1" } */

 typedef unsigned long long tick_t;

--- a/gcc/testsuite/gcc.target/i386/pr56225.c
+++ b/gcc/testsuite/gcc.target/i386/pr56225.c
 /* PR target/56225 */
-/* { dg-do compile { target { ia32 } } } */
+/* { dg-do compile { target ia32 } } */
 /* { dg-options "-O2 -march=pentium3 -mtune=generic" } */

 void bar (int);

--- a/gcc/testsuite/gcc.target/i386/pr56348.c
+++ b/gcc/testsuite/gcc.target/i386/pr56348.c
 /* PR target/56348 */
-/* { dg-do compile { target { ia32 } } } */
+/* { dg-do compile { target ia32 } } */
 /* { dg-options "-O2 -fPIC -mfpmath=sse -msse2" } */

 typedef unsigned int size_t;

--- a/gcc/testsuite/gcc.target/i386/pr56564-1.c
+++ b/gcc/testsuite/gcc.target/i386/pr56564-1.c
@@ -21,5 +21,5 @@ bar (void)
 /* { dg-final { scan-tree-dump-times "&s" 1 "optimized" } } */
 /* { dg-final { scan-tree-dump-times "&t" 0 "optimized" } } */
 /* { dg-final { scan-tree-dump-times "return 0" 1 "optimized" } } */
-/* { dg-final { scan-assembler ".align\[ \t]*16\[^:]*\[\n\r]s:" { target { *-*-linux* } } } } */
-/* { dg-final { scan-assembler ".align\[ \t]*16\[^:]*\[\n\r]t:" { target { *-*-linux* } } } } */
+/* { dg-final { scan-assembler ".align\[ \t]*16\[^:]*\[\n\r]s:" { target *-*-linux* } } } */
+/* { dg-final { scan-assembler ".align\[ \t]*16\[^:]*\[\n\r]t:" { target *-*-linux* } } } */
--- a/gcc/testsuite/gcc.target/i386/pr56564-2.c
+++ b/gcc/testsuite/gcc.target/i386/pr56564-2.c
@@ -20,5 +20,5 @@ bar (void)
 /* { dg-final { scan-tree-dump-times "&s" 0 "optimized" } } */
 /* { dg-final { scan-tree-dump-times "&t" 0 "optimized" } } */
 /* { dg-final { scan-tree-dump-times "return 0" 2 "optimized" } } */
-/* { dg-final { scan-assembler ".align\[ \t]*16\[^:]*\[\n\r]s:" { target { *-*-linux* } } } } */
-/* { dg-final { scan-assembler ".align\[ \t]*16\[^:]*\[\n\r]t:" { target { *-*-linux* } } } } */
+/* { dg-final { scan-assembler ".align\[ \t]*16\[^:]*\[\n\r]s:" { target *-*-linux* } } } */
+/* { dg-final { scan-assembler ".align\[ \t]*16\[^:]*\[\n\r]t:" { target *-*-linux* } } } */
--- a/gcc/testsuite/gcc.target/i386/pr56564-3.c
+++ b/gcc/testsuite/gcc.target/i386/pr56564-3.c
@@ -24,5 +24,5 @@ bar (void)
 /* { dg-final { scan-tree-dump-times "&s" 1 "optimized" } } */
 /* { dg-final { scan-tree-dump-times "&t" 1 "optimized" } } */
 /* { dg-final { scan-tree-dump-times "return 0" 0 "optimized" } } */
-/* { dg-final { scan-assembler-not ".align\[ \t]*16\[^:]*\[\n\r]s:" { target { *-*-linux* } } } } */
-/* { dg-final { scan-assembler ".align\[ \t]*16\[^:]*\[\n\r]t:" { target { *-*-linux* } } } } */
+/* { dg-final { scan-assembler-not ".align\[ \t]*16\[^:]*\[\n\r]s:" { target *-*-linux* } } } */
+/* { dg-final { scan-assembler ".align\[ \t]*16\[^:]*\[\n\r]t:" { target *-*-linux* } } } */
--- a/gcc/testsuite/gcc.target/i386/pr56564-4.c
+++ b/gcc/testsuite/gcc.target/i386/pr56564-4.c
@@ -17,5 +17,5 @@ bar (void)
  return ((__UINTPTR_TYPE__) &t[0]) & 15;
 }

-/* { dg-final { scan-assembler-not ".align\[ \t]*16\[^:]*\[\n\r]s:" { target { *-*-linux* } } } } */
-/* { dg-final { scan-assembler ".align\[ \t]*16\[^:]*\[\n\r]t:" { target { *-*-linux* } } } } */
+/* { dg-final { scan-assembler-not ".align\[ \t]*16\[^:]*\[\n\r]s:" { target *-*-linux* } } } */
+/* { dg-final { scan-assembler ".align\[ \t]*16\[^:]*\[\n\r]t:" { target *-*-linux* } } } */
--- a/gcc/testsuite/gcc.target/i386/pr57293.c
+++ b/gcc/testsuite/gcc.target/i386/pr57293.c
-/* { dg-do compile  { target { ia32 } } } */
+/* { dg-do compile  { target ia32 } } */
 /* { dg-options "-O2 -fomit-frame-pointer" } */
 /* { dg-final { scan-assembler-not "%ebp" } } */


--- a/gcc/testsuite/gcc.target/i386/pr58853.c
+++ b/gcc/testsuite/gcc.target/i386/pr58853.c
 /* { dg-do compile } */
 /* { dg-options "-minline-all-stringops" } */
-/* { dg-additional-options "-mtune=pentiumpro" { target { ia32 } } } */
+/* { dg-additional-options "-mtune=pentiumpro" { target ia32 } } */

 void
 my_memcpy (char *dest, const char *src, int n)

--- a/gcc/testsuite/gcc.target/i386/pr59794-1.c
+++ b/gcc/testsuite/gcc.target/i386/pr59794-1.c
 /* PR target/59794 */
-/* { dg-do compile { target { ia32 } } } */
+/* { dg-do compile { target ia32 } } */
 /* { dg-options "-O2 -mno-mmx" } */
 /* { dg-skip-if "no MMX vector" { *-*-mingw* } } */


--- a/gcc/testsuite/gcc.target/i386/pr59794-4.c
+++ b/gcc/testsuite/gcc.target/i386/pr59794-4.c
 /* PR target/59794 */
-/* { dg-do compile { target { ia32 } } } */
+/* { dg-do compile { target ia32 } } */
 /* { dg-options "-O2 -mno-mmx" } */
 /* { dg-skip-if "no MMX vector" { *-*-mingw* } } */


--- a/gcc/testsuite/gcc.target/i386/pr59794-5.c
+++ b/gcc/testsuite/gcc.target/i386/pr59794-5.c
 /* PR target/59794 */
-/* { dg-do compile { target { ia32 } } } */
+/* { dg-do compile { target ia32 } } */
 /* { dg-options "-O2 -mno-sse" } */
 /* { dg-skip-if "no SSE vector" { *-*-mingw* } } */


--- a/gcc/testsuite/gcc.target/i386/pr61296-1.c
+++ b/gcc/testsuite/gcc.target/i386/pr61296-1.c
 /* PR target/61296 */
-/* { dg-do compile { target { *-*-linux* } } } */
+/* { dg-do compile { target *-*-linux* } } */
 /* { dg-options "-O2" } */

 struct foo

--- a/gcc/testsuite/gcc.target/i386/pr61296-2.c
+++ b/gcc/testsuite/gcc.target/i386/pr61296-2.c
 /* PR target/61296 */
-/* { dg-do compile { target { *-*-linux* } } } */
+/* { dg-do compile { target *-*-linux* } } */
 /* { dg-options "-O2 -malign-data=cacheline" } */

 struct foo

--- a/gcc/testsuite/gcc.target/i386/pr61296-3.c
+++ b/gcc/testsuite/gcc.target/i386/pr61296-3.c
 /* PR target/61296 */
-/* { dg-do compile { target { *-*-linux* } } } */
+/* { dg-do compile { target *-*-linux* } } */
 /* { dg-options "-O2 -malign-data=abi" } */

 struct foo

--- a/gcc/testsuite/gcc.target/i386/pr61296-4.c
+++ b/gcc/testsuite/gcc.target/i386/pr61296-4.c
 /* PR target/61296 */
-/* { dg-do compile { target { *-*-linux* } } } */
+/* { dg-do compile { target *-*-linux* } } */
 /* { dg-options "-O2 -malign-data=cacheline -malign-data=abi" } */

 struct foo

--- a/gcc/testsuite/gcc.target/i386/pr61296-5.c
+++ b/gcc/testsuite/gcc.target/i386/pr61296-5.c
 /* PR target/61296 */
-/* { dg-do compile { target { *-*-linux* } } } */
+/* { dg-do compile { target *-*-linux* } } */
 /* { dg-options "-O2 -malign-data=abi -malign-data=cacheline" } */

 struct foo

--- a/gcc/testsuite/gcc.target/i386/pr61296-6.c
+++ b/gcc/testsuite/gcc.target/i386/pr61296-6.c
 /* PR target/61296 */
-/* { dg-do compile { target { *-*-linux* } } } */
+/* { dg-do compile { target *-*-linux* } } */
 /* { dg-options "-O2 -malign-data=cacheline -malign-data=compat" } */

 struct foo

--- a/gcc/testsuite/gcc.target/i386/pr61296-7.c
+++ b/gcc/testsuite/gcc.target/i386/pr61296-7.c
 /* PR target/61296 */
-/* { dg-do compile { target { *-*-linux* } } } */
+/* { dg-do compile { target *-*-linux* } } */
 /* { dg-options "-O2 -malign-data=compat -malign-data=abi" } */

 struct foo

--- a/gcc/testsuite/gcc.target/i386/pr61446.c
+++ b/gcc/testsuite/gcc.target/i386/pr61446.c
 /* PR rtl-optimization/61446 */

-/* { dg-do compile { target { ia32 } } } */
+/* { dg-do compile { target ia32 } } */
 /* { dg-options "-O2 -march=corei7 -mfpmath=387" } */

 unsigned long long

--- a/gcc/testsuite/gcc.target/i386/pr65105-1.c
+++ b/gcc/testsuite/gcc.target/i386/pr65105-1.c
 /* PR target/pr65105 */
-/* { dg-do run { target { ia32 } } } */
+/* { dg-do run { target ia32 } } */
 /* { dg-options "-O2 -msse2 -mtune=slm -mno-stackrealign -save-temps" } */
 /* { dg-require-effective-target sse2 } */
 /* { dg-final { scan-assembler "por" } } */

--- a/gcc/testsuite/gcc.target/i386/pr65105-2.c
+++ b/gcc/testsuite/gcc.target/i386/pr65105-2.c
 /* PR target/pr65105 */
-/* { dg-do compile { target { ia32 } } } */
+/* { dg-do compile { target ia32 } } */
 /* { dg-options "-O2 -msse2 -mno-stackrealign" } */
 /* { dg-final { scan-assembler "por" } } */


--- a/gcc/testsuite/gcc.target/i386/pr65105-3.c
+++ b/gcc/testsuite/gcc.target/i386/pr65105-3.c
 /* PR target/pr65105 */
-/* { dg-do compile { target { ia32 } } } */
+/* { dg-do compile { target ia32 } } */
 /* { dg-options "-O2 -march=slm -msse4.2 -mno-stackrealign" } */
 /* { dg-final { scan-assembler "pand" } } */
 /* { dg-final { scan-assembler "por" } } */

--- a/gcc/testsuite/gcc.target/i386/pr65105-5.c
+++ b/gcc/testsuite/gcc.target/i386/pr65105-5.c
 /* PR target/pr65105 */
-/* { dg-do compile { target { ia32 } } } */
+/* { dg-do compile { target ia32 } } */
 /* { dg-options "-O2 -march=core-avx2 -mno-stackrealign" } */
 /* { dg-final { scan-assembler "pandn" } } */
 /* { dg-final { scan-assembler "pxor" } } */

--- a/gcc/testsuite/gcc.target/i386/pr66703.c
+++ b/gcc/testsuite/gcc.target/i386/pr66703.c
-/* { dg-do run { target { ia32 } } } */
+/* { dg-do run { target ia32 } } */
 /* { dg-options "-O0 -mtune=pentium" } */

 #include "readeflags-1.c"
--- a/gcc/testsuite/gcc.target/i386/pr66813.c
+++ b/gcc/testsuite/gcc.target/i386/pr66813.c
-/* { dg-do compile { target { ia32 } } } */
+/* { dg-do compile { target ia32 } } */
 /* { dg-options "-march=pentium" } */

 void f_s(void) { short x; asm("" : "=@ccc"(x)); }

--- a/gcc/testsuite/gcc.target/i386/pr66814.c
+++ b/gcc/testsuite/gcc.target/i386/pr66814.c
-/* { dg-do compile { target { ia32 } } } */
+/* { dg-do compile { target ia32 } } */
 /* { dg-options "-march=i586 -mavx512f -O2" } */

 #include "avx512f-klogic-2.c"
--- a/gcc/testsuite/gcc.target/i386/pr67761.c
+++ b/gcc/testsuite/gcc.target/i386/pr67761.c
 /* PR target/pr67761 */
-/* { dg-do compile { target { ia32 } } } */
+/* { dg-do compile { target ia32 } } */
 /* { dg-options "-O2 -march=slm -mno-stackrealign -g" } */
 /* { dg-final { scan-assembler "paddq" } } */


--- a/gcc/testsuite/gcc.target/i386/pr68937-5.c
+++ b/gcc/testsuite/gcc.target/i386/pr68937-5.c
-/* { dg-do compile { target { *-*-linux* } } } */
+/* { dg-do compile { target *-*-linux* } } */
 /* { dg-options "-O2 -fpic -fno-plt -funroll-loops" } */

 extern void *f();

--- a/gcc/testsuite/gcc.target/i386/pr68990.c
+++ b/gcc/testsuite/gcc.target/i386/pr68990.c
-/* { dg-do compile { target { ia32 } } } */
+/* { dg-do compile { target ia32 } } */
 /* { dg-options "-O3 -march=x86-64" } */
 /* { dg-final { scan-assembler-not "cmpl\[ \t]+(\[%a-z]+), \\1" } } */


--- a/gcc/testsuite/gcc.target/i386/pr69454-1.c
+++ b/gcc/testsuite/gcc.target/i386/pr69454-1.c
-/* { dg-do compile { target { ia32 } } } */
+/* { dg-do compile { target ia32 } } */
 /* { dg-options "-O2 -msse2 -mno-accumulate-outgoing-args -mpreferred-stack-boundary=2" } */

 typedef struct { long long w64[2]; } V128;

--- a/gcc/testsuite/gcc.target/i386/pr69454-2.c
+++ b/gcc/testsuite/gcc.target/i386/pr69454-2.c
-/* { dg-do compile { target { ia32 } } } */
+/* { dg-do compile { target ia32 } } */
 /* { dg-options "-O2 -msse2 -mno-accumulate-outgoing-args -mpreferred-stack-boundary=2" } */

 extern void fn2 ();

--- a/gcc/testsuite/gcc.target/i386/pr69677.c
+++ b/gcc/testsuite/gcc.target/i386/pr69677.c
-/* { dg-do compile { target { ia32 } } } */
+/* { dg-do compile { target ia32 } } */
 /* { dg-options "-O2 -mno-avx -march=corei7 -fdump-rtl-final" } */

 extern const unsigned int a[];

--- a/gcc/testsuite/gcc.target/i386/pr70160.c
+++ b/gcc/testsuite/gcc.target/i386/pr70160.c
-/* { dg-do compile { target { ia32 } } } */
+/* { dg-do compile { target ia32 } } */
 /* { dg-options "-O2 -msse2 -Wno-uninitialized -Wno-maybe-uninitialized" } */

 long long a;

--- a/gcc/testsuite/gcc.target/i386/pr70302.c
+++ b/gcc/testsuite/gcc.target/i386/pr70302.c
-/* { dg-do compile { target { ia32 } } } */
+/* { dg-do compile { target ia32 } } */
 /* { dg-options "-O2 -msse2" } */

 long a, c, e;

--- a/gcc/testsuite/gcc.target/i386/pr70453.c
+++ b/gcc/testsuite/gcc.target/i386/pr70453.c
 /* PR target/70453 */
-/* { dg-do assemble { target { lp64 } } } */
+/* { dg-do assemble { target lp64 } } */
 /* { dg-require-effective-target avx512vbmi } */
 /* { dg-options "-Og -fschedule-insns -mavx512vbmi" } */


--- a/gcc/testsuite/gcc.target/i386/pr70750-1.c
+++ b/gcc/testsuite/gcc.target/i386/pr70750-1.c
@@ -7,5 +7,5 @@ f (int (**p) (void))
  return p[1]();
 }

-/* { dg-final { scan-assembler "jmp\[ \t\].*\\(%rdi\\)" { target { lp64 } } } } */
-/* { dg-final { scan-assembler "jmp\[ \t\]\\*%rax" { target { x32 } } } } */
+/* { dg-final { scan-assembler "jmp\[ \t\].*\\(%rdi\\)" { target lp64 } } } */
+/* { dg-final { scan-assembler "jmp\[ \t\]\\*%rax" { target x32 } } } */
--- a/gcc/testsuite/gcc.target/i386/pr70750-2.c
+++ b/gcc/testsuite/gcc.target/i386/pr70750-2.c
@@ -7,5 +7,5 @@ f (int (**p) (void))
  return -p[1]();
 }

-/* { dg-final { scan-assembler "call\[ \t\].*\\(%rdi\\)" { target { lp64 } } } } */
-/* { dg-final { scan-assembler "call\[ \t\]\\*%rax" { target { x32 } } } } */
+/* { dg-final { scan-assembler "call\[ \t\].*\\(%rdi\\)" { target lp64 } } } */
+/* { dg-final { scan-assembler "call\[ \t\]\\*%rax" { target x32 } } } */
--- a/gcc/testsuite/gcc.target/i386/pr70799-1.c
+++ b/gcc/testsuite/gcc.target/i386/pr70799-1.c
 /* PR target/pr70799 */
-/* { dg-do compile { target { ia32 } } } */
+/* { dg-do compile { target ia32 } } */
 /* { dg-options "-O2 -march=slm -mno-stackrealign" } */
 /* { dg-final { scan-assembler "pxor" } } */
 /* { dg-final { scan-assembler "pcmpeqd" } } */

--- a/gcc/testsuite/gcc.target/i386/pr70799-2.c
+++ b/gcc/testsuite/gcc.target/i386/pr70799-2.c
 /* PR target/pr70799 */
-/* { dg-do compile { target { ia32 } } } */
+/* { dg-do compile { target ia32 } } */
 /* { dg-options "-O2 -march=slm -mno-stackrealign" } */
 /* { dg-final { scan-assembler "psllq" } } */
 /* { dg-final { scan-assembler "psrlq" } } */

--- a/gcc/testsuite/gcc.target/i386/pr70799-3.c
+++ b/gcc/testsuite/gcc.target/i386/pr70799-3.c
 /* PR target/pr70799 */
-/* { dg-do compile { target { ia32 } } } */
+/* { dg-do compile { target ia32 } } */
 /* { dg-options "-O2 -march=slm -fno-split-wide-types -mno-stackrealign" } */
 /* { dg-final { scan-assembler "psllq" } } */
 /* { dg-final { scan-assembler "psrlq" } } */

--- a/gcc/testsuite/gcc.target/i386/pr70799-4.c
+++ b/gcc/testsuite/gcc.target/i386/pr70799-4.c
 /* PR target/pr70799 */
-/* { dg-do compile { target { ia32 } } } */
+/* { dg-do compile { target ia32 } } */
 /* { dg-options "-O2 -march=slm -mno-stackrealign" } */
 /* { dg-final { scan-assembler "psllq" } } */
 /* { dg-final { scan-assembler "psrlq" } } */

--- a/gcc/testsuite/gcc.target/i386/pr70799-5.c
+++ b/gcc/testsuite/gcc.target/i386/pr70799-5.c
 /* PR target/pr70799 */
-/* { dg-do compile { target { ia32 } } } */
+/* { dg-do compile { target ia32 } } */
 /* { dg-options "-O2 -march=slm -mavx512vl -mno-stackrealign" } */
 /* { dg-final { scan-assembler "psllq" } } */
 /* { dg-final { scan-assembler "psraq" } } */

--- a/gcc/testsuite/gcc.target/i386/pr71958.c
+++ b/gcc/testsuite/gcc.target/i386/pr71958.c
-/* { dg-do compile { target { x32 } } } */
+/* { dg-do compile { target x32 } } */
 /* { dg-options "-mabi=ms" } */
 /* { dg-error "-mabi=ms not supported with X32 ABI" "" { target *-*-* } 0 } */


--- a/gcc/testsuite/gcc.target/i386/pr78794.c
+++ b/gcc/testsuite/gcc.target/i386/pr78794.c
 /* PR target/pr78794 */
-/* { dg-do compile { target { ia32 } } } */
+/* { dg-do compile { target ia32 } } */
 /* { dg-options "-O2 -march=slm -mno-bmi -mno-stackrealign" } */
 /* { dg-final { scan-assembler "pandn" } } */


--- a/gcc/testsuite/gcc.target/i386/record-mcount.c
+++ b/gcc/testsuite/gcc.target/i386/record-mcount.c
 /* Test -mrecord-mcount */
-/* { dg-do compile { target { *-*-linux* } && { nonpic } } } */
+/* { dg-do compile { target { *-*-linux* && nonpic } } } */
 /* { dg-options "-pg -mrecord-mcount" } */
 /* { dg-final { scan-assembler "mcount_loc" } } */
 /* Origin: Andi Kleen */

--- a/gcc/testsuite/gcc.target/i386/struct-size.c
+++ b/gcc/testsuite/gcc.target/i386/struct-size.c
-/* { dg-do compile { target { *-*-linux* } } } */
+/* { dg-do compile { target *-*-linux* } } */
 /* { dg-options "-Wno-pedantic" } */

 struct S {

--- a/gcc/testsuite/gcc.target/i386/vararg-1.c
+++ b/gcc/testsuite/gcc.target/i386/vararg-1.c
 /* PR middle-end/36858 */
 /* { dg-do run } */
 /* { dg-options "-w -msse2" } */
-/* { dg-additional-options "-mpreferred-stack-boundary=2" { target { ia32 } } } */
+/* { dg-additional-options "-mpreferred-stack-boundary=2" { target ia32 } } */
 /* { dg-require-effective-target sse2 } */

 #include "sse2-check.h"

--- a/gcc/testsuite/gcc.target/i386/vararg-2.c
+++ b/gcc/testsuite/gcc.target/i386/vararg-2.c
 /* PR middle-end/36859 */
 /* { dg-do run } */
 /* { dg-options "-w -msse2" } */
-/* { dg-additional-options "-mpreferred-stack-boundary=2" { target { ia32 } } } */
+/* { dg-additional-options "-mpreferred-stack-boundary=2" { target ia32 } } */
 /* { dg-require-effective-target sse2 } */

 #include "sse2-check.h"