From 4e395d91ad396f1f03b28a97cb9d25bd6b85e755 Mon Sep 17 00:00:00 2001
From: Uros Bizjak <ubizjak@gmail.com>
Date: Tue, 29 Aug 2017 20:28:32 +0200
Subject: [PATCH] *.c: Remove excess braces from target selectors.

	* gcc.target/i386/*.c: Remove excess braces from target selectors.

From-SVN: r251419
---
 gcc/testsuite/ChangeLog                              | 4 ++++
 gcc/testsuite/gcc.target/i386/bmi-andn-2.c           | 2 +-
 gcc/testsuite/gcc.target/i386/bmi-bextr-2.c          | 3 +--
 gcc/testsuite/gcc.target/i386/bmi-bextr-4.c          | 3 +--
 gcc/testsuite/gcc.target/i386/bmi-blsi-2.c           | 2 +-
 gcc/testsuite/gcc.target/i386/bmi-blsmsk-2.c         | 2 +-
 gcc/testsuite/gcc.target/i386/bmi-blsr-2.c           | 2 +-
 gcc/testsuite/gcc.target/i386/bmi-tzcnt-2.c          | 2 +-
 gcc/testsuite/gcc.target/i386/bmi2-bzhi32-1.c        | 2 +-
 gcc/testsuite/gcc.target/i386/bmi2-mulx32-1.c        | 2 +-
 gcc/testsuite/gcc.target/i386/bmi2-mulx32-1a.c       | 2 +-
 gcc/testsuite/gcc.target/i386/bmi2-mulx32-2.c        | 2 +-
 gcc/testsuite/gcc.target/i386/bmi2-mulx32-2a.c       | 2 +-
 gcc/testsuite/gcc.target/i386/bmi2-pdep32-1.c        | 2 +-
 gcc/testsuite/gcc.target/i386/bmi2-pext32-1.c        | 2 +-
 gcc/testsuite/gcc.target/i386/bmi2-rorx32-1.c        | 2 +-
 gcc/testsuite/gcc.target/i386/bmi2-sarx32-1.c        | 2 +-
 gcc/testsuite/gcc.target/i386/bmi2-shlx32-1.c        | 2 +-
 gcc/testsuite/gcc.target/i386/bmi2-shrx32-1.c        | 2 +-
 gcc/testsuite/gcc.target/i386/fentry-override.c      | 2 +-
 gcc/testsuite/gcc.target/i386/fentry.c               | 2 +-
 gcc/testsuite/gcc.target/i386/interrupt-sibcall-2.c  | 2 +-
 gcc/testsuite/gcc.target/i386/memcpy-strategy-1.c    | 2 +-
 gcc/testsuite/gcc.target/i386/memcpy-strategy-2.c    | 2 +-
 gcc/testsuite/gcc.target/i386/memcpy-vector_loop-1.c | 2 +-
 gcc/testsuite/gcc.target/i386/nop-mcount.c           | 2 +-
 gcc/testsuite/gcc.target/i386/noplt-gd-2.c           | 2 +-
 gcc/testsuite/gcc.target/i386/noplt-ld-2.c           | 2 +-
 gcc/testsuite/gcc.target/i386/pad-2.c                | 2 +-
 gcc/testsuite/gcc.target/i386/pad-5b.c               | 2 +-
 gcc/testsuite/gcc.target/i386/pad-6b.c               | 2 +-
 gcc/testsuite/gcc.target/i386/pad-8.c                | 2 +-
 gcc/testsuite/gcc.target/i386/pad-9.c                | 2 +-
 gcc/testsuite/gcc.target/i386/pr49504.c              | 2 +-
 gcc/testsuite/gcc.target/i386/pr52876.c              | 2 +-
 gcc/testsuite/gcc.target/i386/pr55433.c              | 2 +-
 gcc/testsuite/gcc.target/i386/pr56225.c              | 2 +-
 gcc/testsuite/gcc.target/i386/pr56348.c              | 2 +-
 gcc/testsuite/gcc.target/i386/pr56564-1.c            | 4 ++--
 gcc/testsuite/gcc.target/i386/pr56564-2.c            | 4 ++--
 gcc/testsuite/gcc.target/i386/pr56564-3.c            | 4 ++--
 gcc/testsuite/gcc.target/i386/pr56564-4.c            | 4 ++--
 gcc/testsuite/gcc.target/i386/pr57293.c              | 2 +-
 gcc/testsuite/gcc.target/i386/pr58853.c              | 2 +-
 gcc/testsuite/gcc.target/i386/pr59794-1.c            | 2 +-
 gcc/testsuite/gcc.target/i386/pr59794-4.c            | 2 +-
 gcc/testsuite/gcc.target/i386/pr59794-5.c            | 2 +-
 gcc/testsuite/gcc.target/i386/pr61296-1.c            | 2 +-
 gcc/testsuite/gcc.target/i386/pr61296-2.c            | 2 +-
 gcc/testsuite/gcc.target/i386/pr61296-3.c            | 2 +-
 gcc/testsuite/gcc.target/i386/pr61296-4.c            | 2 +-
 gcc/testsuite/gcc.target/i386/pr61296-5.c            | 2 +-
 gcc/testsuite/gcc.target/i386/pr61296-6.c            | 2 +-
 gcc/testsuite/gcc.target/i386/pr61296-7.c            | 2 +-
 gcc/testsuite/gcc.target/i386/pr61446.c              | 2 +-
 gcc/testsuite/gcc.target/i386/pr65105-1.c            | 2 +-
 gcc/testsuite/gcc.target/i386/pr65105-2.c            | 2 +-
 gcc/testsuite/gcc.target/i386/pr65105-3.c            | 2 +-
 gcc/testsuite/gcc.target/i386/pr65105-5.c            | 2 +-
 gcc/testsuite/gcc.target/i386/pr66703.c              | 2 +-
 gcc/testsuite/gcc.target/i386/pr66813.c              | 2 +-
 gcc/testsuite/gcc.target/i386/pr66814.c              | 2 +-
 gcc/testsuite/gcc.target/i386/pr67761.c              | 2 +-
 gcc/testsuite/gcc.target/i386/pr68937-5.c            | 2 +-
 gcc/testsuite/gcc.target/i386/pr68990.c              | 2 +-
 gcc/testsuite/gcc.target/i386/pr69454-1.c            | 2 +-
 gcc/testsuite/gcc.target/i386/pr69454-2.c            | 2 +-
 gcc/testsuite/gcc.target/i386/pr69677.c              | 2 +-
 gcc/testsuite/gcc.target/i386/pr70160.c              | 2 +-
 gcc/testsuite/gcc.target/i386/pr70302.c              | 2 +-
 gcc/testsuite/gcc.target/i386/pr70453.c              | 2 +-
 gcc/testsuite/gcc.target/i386/pr70750-1.c            | 4 ++--
 gcc/testsuite/gcc.target/i386/pr70750-2.c            | 4 ++--
 gcc/testsuite/gcc.target/i386/pr70799-1.c            | 2 +-
 gcc/testsuite/gcc.target/i386/pr70799-2.c            | 2 +-
 gcc/testsuite/gcc.target/i386/pr70799-3.c            | 2 +-
 gcc/testsuite/gcc.target/i386/pr70799-4.c            | 2 +-
 gcc/testsuite/gcc.target/i386/pr70799-5.c            | 2 +-
 gcc/testsuite/gcc.target/i386/pr71958.c              | 2 +-
 gcc/testsuite/gcc.target/i386/pr78794.c              | 2 +-
 gcc/testsuite/gcc.target/i386/record-mcount.c        | 2 +-
 gcc/testsuite/gcc.target/i386/struct-size.c          | 2 +-
 gcc/testsuite/gcc.target/i386/vararg-1.c             | 2 +-
 gcc/testsuite/gcc.target/i386/vararg-2.c             | 2 +-
 84 files changed, 93 insertions(+), 91 deletions(-)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1a4207c..ab80105 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,9 @@
 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.
diff --git a/gcc/testsuite/gcc.target/i386/bmi-andn-2.c b/gcc/testsuite/gcc.target/i386/bmi-andn-2.c
index bb998f3..b9dabbe 100644
--- a/gcc/testsuite/gcc.target/i386/bmi-andn-2.c
+++ b/gcc/testsuite/gcc.target/i386/bmi-andn-2.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { bmi } } } */
+/* { dg-do run { target bmi } } */
 /* { dg-options "-O2 -mbmi -fno-inline" } */
 
 #include <x86intrin.h>
diff --git a/gcc/testsuite/gcc.target/i386/bmi-bextr-2.c b/gcc/testsuite/gcc.target/i386/bmi-bextr-2.c
index 2ce6259..92e3394 100644
--- a/gcc/testsuite/gcc.target/i386/bmi-bextr-2.c
+++ b/gcc/testsuite/gcc.target/i386/bmi-bextr-2.c
@@ -1,5 +1,4 @@
-/* { dg-do run { target { bmi } } } */
-/* { dg-require-effective-target bmi  } */
+/* { dg-do run { target bmi } } */
 /* { dg-options "-O2 -mbmi -fno-inline" } */
 
 #include <x86intrin.h>
diff --git a/gcc/testsuite/gcc.target/i386/bmi-bextr-4.c b/gcc/testsuite/gcc.target/i386/bmi-bextr-4.c
index 2318847..63c402b 100644
--- a/gcc/testsuite/gcc.target/i386/bmi-bextr-4.c
+++ b/gcc/testsuite/gcc.target/i386/bmi-bextr-4.c
@@ -1,5 +1,4 @@
-/* { dg-do run { target { bmi } } } */
-/* { dg-require-effective-target bmi  } */
+/* { dg-do run { target bmi } } */
 /* { dg-options "-O2 -mbmi -fno-inline" } */
 
 #include <x86intrin.h>
diff --git a/gcc/testsuite/gcc.target/i386/bmi-blsi-2.c b/gcc/testsuite/gcc.target/i386/bmi-blsi-2.c
index b6633a9..df2411a 100644
--- a/gcc/testsuite/gcc.target/i386/bmi-blsi-2.c
+++ b/gcc/testsuite/gcc.target/i386/bmi-blsi-2.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { bmi } } } */
+/* { dg-do run { target bmi } } */
 /* { dg-options "-O2 -mbmi -fno-inline" } */
 
 #include <x86intrin.h>
diff --git a/gcc/testsuite/gcc.target/i386/bmi-blsmsk-2.c b/gcc/testsuite/gcc.target/i386/bmi-blsmsk-2.c
index be0ebf9..cac119e 100644
--- a/gcc/testsuite/gcc.target/i386/bmi-blsmsk-2.c
+++ b/gcc/testsuite/gcc.target/i386/bmi-blsmsk-2.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { bmi } } } */
+/* { dg-do run { target bmi } } */
 /* { dg-options "-O2 -mbmi -fno-inline" } */
 
 #include <x86intrin.h>
diff --git a/gcc/testsuite/gcc.target/i386/bmi-blsr-2.c b/gcc/testsuite/gcc.target/i386/bmi-blsr-2.c
index b3fc4e5..d376bb3 100644
--- a/gcc/testsuite/gcc.target/i386/bmi-blsr-2.c
+++ b/gcc/testsuite/gcc.target/i386/bmi-blsr-2.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { bmi } } } */
+/* { dg-do run { target bmi } } */
 /* { dg-options "-O2 -mbmi -fno-inline" } */
 
 #include <x86intrin.h>
diff --git a/gcc/testsuite/gcc.target/i386/bmi-tzcnt-2.c b/gcc/testsuite/gcc.target/i386/bmi-tzcnt-2.c
index 1a9235b..ab3c30c 100644
--- a/gcc/testsuite/gcc.target/i386/bmi-tzcnt-2.c
+++ b/gcc/testsuite/gcc.target/i386/bmi-tzcnt-2.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { bmi } } } */
+/* { dg-do run { target bmi } } */
 /* { dg-options "-O2 -mbmi -fno-inline" } */
 
 #include <x86intrin.h>
diff --git a/gcc/testsuite/gcc.target/i386/bmi2-bzhi32-1.c b/gcc/testsuite/gcc.target/i386/bmi2-bzhi32-1.c
index 68df8b7..5a4b271 100644
--- a/gcc/testsuite/gcc.target/i386/bmi2-bzhi32-1.c
+++ b/gcc/testsuite/gcc.target/i386/bmi2-bzhi32-1.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { bmi2 } } } */
+/* { dg-do run { target bmi2 } } */
 /* { dg-options "-mbmi2 -O2" } */
 
 #include <x86intrin.h>
diff --git a/gcc/testsuite/gcc.target/i386/bmi2-mulx32-1.c b/gcc/testsuite/gcc.target/i386/bmi2-mulx32-1.c
index 5e60287..96141ae 100644
--- a/gcc/testsuite/gcc.target/i386/bmi2-mulx32-1.c
+++ b/gcc/testsuite/gcc.target/i386/bmi2-mulx32-1.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { bmi2 && { ia32 } } } } */
+/* { dg-do run { target { bmi2 && ia32 } } } */
 /* { dg-options "-mbmi2 -O2" } */
 
 #include "bmi2-check.h"
diff --git a/gcc/testsuite/gcc.target/i386/bmi2-mulx32-1a.c b/gcc/testsuite/gcc.target/i386/bmi2-mulx32-1a.c
index cf3bb08..c7c44ae 100644
--- a/gcc/testsuite/gcc.target/i386/bmi2-mulx32-1a.c
+++ b/gcc/testsuite/gcc.target/i386/bmi2-mulx32-1a.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ia32 } } } */
+/* { dg-do compile { target ia32 } } */
 /* { dg-options "-O2 -mbmi2 -dp" } */
 
 #include "bmi2-mulx32-1.c"
diff --git a/gcc/testsuite/gcc.target/i386/bmi2-mulx32-2.c b/gcc/testsuite/gcc.target/i386/bmi2-mulx32-2.c
index 7c99b2d..82c3a4f 100644
--- a/gcc/testsuite/gcc.target/i386/bmi2-mulx32-2.c
+++ b/gcc/testsuite/gcc.target/i386/bmi2-mulx32-2.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { bmi2 && { ia32 } } } } */
+/* { dg-do run { target { bmi2 && ia32 } } } */
 /* { dg-options "-mbmi2 -O2" } */
 
 #include <x86intrin.h>
diff --git a/gcc/testsuite/gcc.target/i386/bmi2-mulx32-2a.c b/gcc/testsuite/gcc.target/i386/bmi2-mulx32-2a.c
index 356d593..6cb06f2 100644
--- a/gcc/testsuite/gcc.target/i386/bmi2-mulx32-2a.c
+++ b/gcc/testsuite/gcc.target/i386/bmi2-mulx32-2a.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ia32 } } } */
+/* { dg-do compile { target ia32 } } */
 /* { dg-options "-O2 -mbmi2" } */
 
 #include "bmi2-mulx32-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/bmi2-pdep32-1.c b/gcc/testsuite/gcc.target/i386/bmi2-pdep32-1.c
index 5aecf57..7e0ca47 100644
--- a/gcc/testsuite/gcc.target/i386/bmi2-pdep32-1.c
+++ b/gcc/testsuite/gcc.target/i386/bmi2-pdep32-1.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { bmi2 } } } */
+/* { dg-do run { target bmi2 } } */
 /* { dg-options "-mbmi2 -O2" } */
 
 #include <x86intrin.h>
diff --git a/gcc/testsuite/gcc.target/i386/bmi2-pext32-1.c b/gcc/testsuite/gcc.target/i386/bmi2-pext32-1.c
index 7fe7837..230fea1 100644
--- a/gcc/testsuite/gcc.target/i386/bmi2-pext32-1.c
+++ b/gcc/testsuite/gcc.target/i386/bmi2-pext32-1.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { bmi2 } } } */
+/* { dg-do run { target bmi2 } } */
 /* { dg-options "-mbmi2 -O2" } */
 
 #include <x86intrin.h>
diff --git a/gcc/testsuite/gcc.target/i386/bmi2-rorx32-1.c b/gcc/testsuite/gcc.target/i386/bmi2-rorx32-1.c
index d7f6f3b..0cdde16 100644
--- a/gcc/testsuite/gcc.target/i386/bmi2-rorx32-1.c
+++ b/gcc/testsuite/gcc.target/i386/bmi2-rorx32-1.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { bmi2 } } } */
+/* { dg-do run { target bmi2 } } */
 /* { dg-options "-mbmi2 -O2 -dp" } */
 
 #include "bmi2-check.h"
diff --git a/gcc/testsuite/gcc.target/i386/bmi2-sarx32-1.c b/gcc/testsuite/gcc.target/i386/bmi2-sarx32-1.c
index 8224b6f..f5b6cdd 100644
--- a/gcc/testsuite/gcc.target/i386/bmi2-sarx32-1.c
+++ b/gcc/testsuite/gcc.target/i386/bmi2-sarx32-1.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { bmi2 } } } */
+/* { dg-do run { target bmi2 } } */
 /* { dg-options "-mbmi2 -O2 -dp" } */
 
 #include "bmi2-check.h"
diff --git a/gcc/testsuite/gcc.target/i386/bmi2-shlx32-1.c b/gcc/testsuite/gcc.target/i386/bmi2-shlx32-1.c
index 0bf9702..d953a57 100644
--- a/gcc/testsuite/gcc.target/i386/bmi2-shlx32-1.c
+++ b/gcc/testsuite/gcc.target/i386/bmi2-shlx32-1.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { bmi2 } } } */
+/* { dg-do run { target bmi2 } } */
 /* { dg-options "-mbmi2 -O2 -dp" } */
 
 #include "bmi2-check.h"
diff --git a/gcc/testsuite/gcc.target/i386/bmi2-shrx32-1.c b/gcc/testsuite/gcc.target/i386/bmi2-shrx32-1.c
index 2d2ec15..50d3cd9 100644
--- a/gcc/testsuite/gcc.target/i386/bmi2-shrx32-1.c
+++ b/gcc/testsuite/gcc.target/i386/bmi2-shrx32-1.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { bmi2 } } } */
+/* { dg-do run { target bmi2 } } */
 /* { dg-options "-mbmi2 -O2 -dp" } */
 
 #include "bmi2-check.h"
diff --git a/gcc/testsuite/gcc.target/i386/fentry-override.c b/gcc/testsuite/gcc.target/i386/fentry-override.c
index f08a43c..7bc5fc4 100644
--- a/gcc/testsuite/gcc.target/i386/fentry-override.c
+++ b/gcc/testsuite/gcc.target/i386/fentry-override.c
@@ -1,5 +1,5 @@
 /* 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 */
diff --git a/gcc/testsuite/gcc.target/i386/fentry.c b/gcc/testsuite/gcc.target/i386/fentry.c
index 4b380f4..2449e75 100644
--- a/gcc/testsuite/gcc.target/i386/fentry.c
+++ b/gcc/testsuite/gcc.target/i386/fentry.c
@@ -1,5 +1,5 @@
 /* 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 */
diff --git a/gcc/testsuite/gcc.target/i386/interrupt-sibcall-2.c b/gcc/testsuite/gcc.target/i386/interrupt-sibcall-2.c
index ae2df28..df0639a 100644
--- a/gcc/testsuite/gcc.target/i386/interrupt-sibcall-2.c
+++ b/gcc/testsuite/gcc.target/i386/interrupt-sibcall-2.c
@@ -1,7 +1,7 @@
 /* { 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));
diff --git a/gcc/testsuite/gcc.target/i386/memcpy-strategy-1.c b/gcc/testsuite/gcc.target/i386/memcpy-strategy-1.c
index e93b95c..48d0b77 100644
--- 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];
diff --git a/gcc/testsuite/gcc.target/i386/memcpy-strategy-2.c b/gcc/testsuite/gcc.target/i386/memcpy-strategy-2.c
index 3b34ba0..9e26ea996 100644
--- 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];
diff --git a/gcc/testsuite/gcc.target/i386/memcpy-vector_loop-1.c b/gcc/testsuite/gcc.target/i386/memcpy-vector_loop-1.c
index 090a31b..113c876 100644
--- 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];
diff --git a/gcc/testsuite/gcc.target/i386/nop-mcount.c b/gcc/testsuite/gcc.target/i386/nop-mcount.c
index 139fbb0..a8e14bc 100644
--- a/gcc/testsuite/gcc.target/i386/nop-mcount.c
+++ b/gcc/testsuite/gcc.target/i386/nop-mcount.c
@@ -1,5 +1,5 @@
 /* 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 */
diff --git a/gcc/testsuite/gcc.target/i386/noplt-gd-2.c b/gcc/testsuite/gcc.target/i386/noplt-gd-2.c
index 9a6c275..81c8446 100644
--- a/gcc/testsuite/gcc.target/i386/noplt-gd-2.c
+++ b/gcc/testsuite/gcc.target/i386/noplt-gd-2.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { *-*-linux* } } } */
+/* { dg-do run { target *-*-linux* } } */
 /* { dg-options "-O2 -fpic -fno-plt" } */
 /* { dg-additional-sources noplt-gd-1.c } */
 
diff --git a/gcc/testsuite/gcc.target/i386/noplt-ld-2.c b/gcc/testsuite/gcc.target/i386/noplt-ld-2.c
index 86cc93e..8ae7e29 100644
--- a/gcc/testsuite/gcc.target/i386/noplt-ld-2.c
+++ b/gcc/testsuite/gcc.target/i386/noplt-ld-2.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { *-*-linux* } } } */
+/* { dg-do run { target *-*-linux* } } */
 /* { dg-options "-O2 -fpic -fno-plt" } */
 /* { dg-additional-sources noplt-ld-1.c } */
 
diff --git a/gcc/testsuite/gcc.target/i386/pad-2.c b/gcc/testsuite/gcc.target/i386/pad-2.c
index 5fc168f..3aa7378 100644
--- 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
diff --git a/gcc/testsuite/gcc.target/i386/pad-5b.c b/gcc/testsuite/gcc.target/i386/pad-5b.c
index 1eb82fe..25e2d83 100644
--- 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
diff --git a/gcc/testsuite/gcc.target/i386/pad-6b.c b/gcc/testsuite/gcc.target/i386/pad-6b.c
index 5de471f..5d74575 100644
--- 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
diff --git a/gcc/testsuite/gcc.target/i386/pad-8.c b/gcc/testsuite/gcc.target/i386/pad-8.c
index e3a3750..74bc580 100644
--- 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
diff --git a/gcc/testsuite/gcc.target/i386/pad-9.c b/gcc/testsuite/gcc.target/i386/pad-9.c
index c94703f..1faa64fe 100644
--- 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);
diff --git a/gcc/testsuite/gcc.target/i386/pr49504.c b/gcc/testsuite/gcc.target/i386/pr49504.c
index 503e6c2..a224076 100644
--- a/gcc/testsuite/gcc.target/i386/pr49504.c
+++ b/gcc/testsuite/gcc.target/i386/pr49504.c
@@ -1,5 +1,5 @@
 /* PR target/49504 */
-/* { dg-do run { target { x32 } } } */
+/* { dg-do run { target x32 } } */
 /* { dg-options "-O" } */
 
 unsigned long long 
diff --git a/gcc/testsuite/gcc.target/i386/pr52876.c b/gcc/testsuite/gcc.target/i386/pr52876.c
index 6d5e47a..249206c 100644
--- a/gcc/testsuite/gcc.target/i386/pr52876.c
+++ b/gcc/testsuite/gcc.target/i386/pr52876.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { x32 } } } */
+/* { dg-do run { target x32 } } */
 /* { dg-options "-O2 -mx32 -maddress-mode=long" } */
 
 extern void abort (void);
diff --git a/gcc/testsuite/gcc.target/i386/pr55433.c b/gcc/testsuite/gcc.target/i386/pr55433.c
index 6a2602a..1f6020b 100644
--- a/gcc/testsuite/gcc.target/i386/pr55433.c
+++ b/gcc/testsuite/gcc.target/i386/pr55433.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { *-*-darwin* } } } */
+/* { dg-do compile { target *-*-darwin* } } */
 /* { dg-options "-O1" } */
 
 typedef unsigned long long tick_t;
diff --git a/gcc/testsuite/gcc.target/i386/pr56225.c b/gcc/testsuite/gcc.target/i386/pr56225.c
index 638c0ce..bb78dd3 100644
--- a/gcc/testsuite/gcc.target/i386/pr56225.c
+++ b/gcc/testsuite/gcc.target/i386/pr56225.c
@@ -1,5 +1,5 @@
 /* PR target/56225 */
-/* { dg-do compile { target { ia32 } } } */
+/* { dg-do compile { target ia32 } } */
 /* { dg-options "-O2 -march=pentium3 -mtune=generic" } */
 
 void bar (int);
diff --git a/gcc/testsuite/gcc.target/i386/pr56348.c b/gcc/testsuite/gcc.target/i386/pr56348.c
index af63828..c31814f 100644
--- a/gcc/testsuite/gcc.target/i386/pr56348.c
+++ b/gcc/testsuite/gcc.target/i386/pr56348.c
@@ -1,5 +1,5 @@
 /* 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;
diff --git a/gcc/testsuite/gcc.target/i386/pr56564-1.c b/gcc/testsuite/gcc.target/i386/pr56564-1.c
index a92ae2d..f19f68b 100644
--- 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* } } } */
diff --git a/gcc/testsuite/gcc.target/i386/pr56564-2.c b/gcc/testsuite/gcc.target/i386/pr56564-2.c
index 332118c..9432e67 100644
--- 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* } } } */
diff --git a/gcc/testsuite/gcc.target/i386/pr56564-3.c b/gcc/testsuite/gcc.target/i386/pr56564-3.c
index 8dffac2..75adf5e 100644
--- 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* } } } */
diff --git a/gcc/testsuite/gcc.target/i386/pr56564-4.c b/gcc/testsuite/gcc.target/i386/pr56564-4.c
index 9998510..935a98a 100644
--- 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* } } } */
diff --git a/gcc/testsuite/gcc.target/i386/pr57293.c b/gcc/testsuite/gcc.target/i386/pr57293.c
index fa016d5..a1e19ab 100644
--- a/gcc/testsuite/gcc.target/i386/pr57293.c
+++ b/gcc/testsuite/gcc.target/i386/pr57293.c
@@ -1,4 +1,4 @@
-/* { dg-do compile  { target { ia32 } } } */
+/* { dg-do compile  { target ia32 } } */
 /* { dg-options "-O2 -fomit-frame-pointer" } */
 /* { dg-final { scan-assembler-not "%ebp" } } */
 
diff --git a/gcc/testsuite/gcc.target/i386/pr58853.c b/gcc/testsuite/gcc.target/i386/pr58853.c
index 046da8b..39439e7 100644
--- a/gcc/testsuite/gcc.target/i386/pr58853.c
+++ b/gcc/testsuite/gcc.target/i386/pr58853.c
@@ -1,6 +1,6 @@
 /* { 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)
diff --git a/gcc/testsuite/gcc.target/i386/pr59794-1.c b/gcc/testsuite/gcc.target/i386/pr59794-1.c
index 46bff01..c22bc2b 100644
--- a/gcc/testsuite/gcc.target/i386/pr59794-1.c
+++ b/gcc/testsuite/gcc.target/i386/pr59794-1.c
@@ -1,5 +1,5 @@
 /* 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* } } */
 
diff --git a/gcc/testsuite/gcc.target/i386/pr59794-4.c b/gcc/testsuite/gcc.target/i386/pr59794-4.c
index 5ad0b07..1823530 100644
--- a/gcc/testsuite/gcc.target/i386/pr59794-4.c
+++ b/gcc/testsuite/gcc.target/i386/pr59794-4.c
@@ -1,5 +1,5 @@
 /* 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* } } */
 
diff --git a/gcc/testsuite/gcc.target/i386/pr59794-5.c b/gcc/testsuite/gcc.target/i386/pr59794-5.c
index 24c88be..40d5cb9 100644
--- a/gcc/testsuite/gcc.target/i386/pr59794-5.c
+++ b/gcc/testsuite/gcc.target/i386/pr59794-5.c
@@ -1,5 +1,5 @@
 /* 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* } } */
 
diff --git a/gcc/testsuite/gcc.target/i386/pr61296-1.c b/gcc/testsuite/gcc.target/i386/pr61296-1.c
index 751dee0..bbeb791 100644
--- a/gcc/testsuite/gcc.target/i386/pr61296-1.c
+++ b/gcc/testsuite/gcc.target/i386/pr61296-1.c
@@ -1,5 +1,5 @@
 /* PR target/61296 */
-/* { dg-do compile { target { *-*-linux* } } } */
+/* { dg-do compile { target *-*-linux* } } */
 /* { dg-options "-O2" } */
 
 struct foo
diff --git a/gcc/testsuite/gcc.target/i386/pr61296-2.c b/gcc/testsuite/gcc.target/i386/pr61296-2.c
index 5999555..43f37d3 100644
--- a/gcc/testsuite/gcc.target/i386/pr61296-2.c
+++ b/gcc/testsuite/gcc.target/i386/pr61296-2.c
@@ -1,5 +1,5 @@
 /* PR target/61296 */
-/* { dg-do compile { target { *-*-linux* } } } */
+/* { dg-do compile { target *-*-linux* } } */
 /* { dg-options "-O2 -malign-data=cacheline" } */
 
 struct foo
diff --git a/gcc/testsuite/gcc.target/i386/pr61296-3.c b/gcc/testsuite/gcc.target/i386/pr61296-3.c
index d0152f7..859059e 100644
--- a/gcc/testsuite/gcc.target/i386/pr61296-3.c
+++ b/gcc/testsuite/gcc.target/i386/pr61296-3.c
@@ -1,5 +1,5 @@
 /* PR target/61296 */
-/* { dg-do compile { target { *-*-linux* } } } */
+/* { dg-do compile { target *-*-linux* } } */
 /* { dg-options "-O2 -malign-data=abi" } */
 
 struct foo
diff --git a/gcc/testsuite/gcc.target/i386/pr61296-4.c b/gcc/testsuite/gcc.target/i386/pr61296-4.c
index 95e1ac6..f779b0c 100644
--- a/gcc/testsuite/gcc.target/i386/pr61296-4.c
+++ b/gcc/testsuite/gcc.target/i386/pr61296-4.c
@@ -1,5 +1,5 @@
 /* PR target/61296 */
-/* { dg-do compile { target { *-*-linux* } } } */
+/* { dg-do compile { target *-*-linux* } } */
 /* { dg-options "-O2 -malign-data=cacheline -malign-data=abi" } */
 
 struct foo
diff --git a/gcc/testsuite/gcc.target/i386/pr61296-5.c b/gcc/testsuite/gcc.target/i386/pr61296-5.c
index 5caa77c..674f5e2 100644
--- a/gcc/testsuite/gcc.target/i386/pr61296-5.c
+++ b/gcc/testsuite/gcc.target/i386/pr61296-5.c
@@ -1,5 +1,5 @@
 /* PR target/61296 */
-/* { dg-do compile { target { *-*-linux* } } } */
+/* { dg-do compile { target *-*-linux* } } */
 /* { dg-options "-O2 -malign-data=abi -malign-data=cacheline" } */
 
 struct foo
diff --git a/gcc/testsuite/gcc.target/i386/pr61296-6.c b/gcc/testsuite/gcc.target/i386/pr61296-6.c
index 8e0d535..da4f125 100644
--- a/gcc/testsuite/gcc.target/i386/pr61296-6.c
+++ b/gcc/testsuite/gcc.target/i386/pr61296-6.c
@@ -1,5 +1,5 @@
 /* PR target/61296 */
-/* { dg-do compile { target { *-*-linux* } } } */
+/* { dg-do compile { target *-*-linux* } } */
 /* { dg-options "-O2 -malign-data=cacheline -malign-data=compat" } */
 
 struct foo
diff --git a/gcc/testsuite/gcc.target/i386/pr61296-7.c b/gcc/testsuite/gcc.target/i386/pr61296-7.c
index 6a67c90..bc5452f 100644
--- a/gcc/testsuite/gcc.target/i386/pr61296-7.c
+++ b/gcc/testsuite/gcc.target/i386/pr61296-7.c
@@ -1,5 +1,5 @@
 /* PR target/61296 */
-/* { dg-do compile { target { *-*-linux* } } } */
+/* { dg-do compile { target *-*-linux* } } */
 /* { dg-options "-O2 -malign-data=compat -malign-data=abi" } */
 
 struct foo
diff --git a/gcc/testsuite/gcc.target/i386/pr61446.c b/gcc/testsuite/gcc.target/i386/pr61446.c
index fc32f63..cb5d6c0 100644
--- a/gcc/testsuite/gcc.target/i386/pr61446.c
+++ b/gcc/testsuite/gcc.target/i386/pr61446.c
@@ -1,6 +1,6 @@
 /* PR rtl-optimization/61446 */
 
-/* { dg-do compile { target { ia32 } } } */
+/* { dg-do compile { target ia32 } } */
 /* { dg-options "-O2 -march=corei7 -mfpmath=387" } */
 
 unsigned long long
diff --git a/gcc/testsuite/gcc.target/i386/pr65105-1.c b/gcc/testsuite/gcc.target/i386/pr65105-1.c
index b0d901c..3e5bba2 100644
--- a/gcc/testsuite/gcc.target/i386/pr65105-1.c
+++ b/gcc/testsuite/gcc.target/i386/pr65105-1.c
@@ -1,5 +1,5 @@
 /* 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" } } */
diff --git a/gcc/testsuite/gcc.target/i386/pr65105-2.c b/gcc/testsuite/gcc.target/i386/pr65105-2.c
index 0c3626b..d446230 100644
--- a/gcc/testsuite/gcc.target/i386/pr65105-2.c
+++ b/gcc/testsuite/gcc.target/i386/pr65105-2.c
@@ -1,5 +1,5 @@
 /* PR target/pr65105 */
-/* { dg-do compile { target { ia32 } } } */
+/* { dg-do compile { target ia32 } } */
 /* { dg-options "-O2 -msse2 -mno-stackrealign" } */
 /* { dg-final { scan-assembler "por" } } */
 
diff --git a/gcc/testsuite/gcc.target/i386/pr65105-3.c b/gcc/testsuite/gcc.target/i386/pr65105-3.c
index 92d62f5..6b05d71 100644
--- a/gcc/testsuite/gcc.target/i386/pr65105-3.c
+++ b/gcc/testsuite/gcc.target/i386/pr65105-3.c
@@ -1,5 +1,5 @@
 /* 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" } } */
diff --git a/gcc/testsuite/gcc.target/i386/pr65105-5.c b/gcc/testsuite/gcc.target/i386/pr65105-5.c
index cd19cbc..6defa28 100644
--- a/gcc/testsuite/gcc.target/i386/pr65105-5.c
+++ b/gcc/testsuite/gcc.target/i386/pr65105-5.c
@@ -1,5 +1,5 @@
 /* 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" } } */
diff --git a/gcc/testsuite/gcc.target/i386/pr66703.c b/gcc/testsuite/gcc.target/i386/pr66703.c
index 0fb0582..6a45cc2 100644
--- a/gcc/testsuite/gcc.target/i386/pr66703.c
+++ b/gcc/testsuite/gcc.target/i386/pr66703.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { ia32 } } } */
+/* { dg-do run { target ia32 } } */
 /* { dg-options "-O0 -mtune=pentium" } */
 
 #include "readeflags-1.c"
diff --git a/gcc/testsuite/gcc.target/i386/pr66813.c b/gcc/testsuite/gcc.target/i386/pr66813.c
index d4d8cc6..05cda9f 100644
--- a/gcc/testsuite/gcc.target/i386/pr66813.c
+++ b/gcc/testsuite/gcc.target/i386/pr66813.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ia32 } } } */
+/* { dg-do compile { target ia32 } } */
 /* { dg-options "-march=pentium" } */
 
 void f_s(void) { short x; asm("" : "=@ccc"(x)); }
diff --git a/gcc/testsuite/gcc.target/i386/pr66814.c b/gcc/testsuite/gcc.target/i386/pr66814.c
index 4ac9d23..9cb9584 100644
--- a/gcc/testsuite/gcc.target/i386/pr66814.c
+++ b/gcc/testsuite/gcc.target/i386/pr66814.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ia32 } } } */
+/* { dg-do compile { target ia32 } } */
 /* { dg-options "-march=i586 -mavx512f -O2" } */
 
 #include "avx512f-klogic-2.c"
diff --git a/gcc/testsuite/gcc.target/i386/pr67761.c b/gcc/testsuite/gcc.target/i386/pr67761.c
index f392b5d..0c75001 100644
--- a/gcc/testsuite/gcc.target/i386/pr67761.c
+++ b/gcc/testsuite/gcc.target/i386/pr67761.c
@@ -1,5 +1,5 @@
 /* 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" } } */
 
diff --git a/gcc/testsuite/gcc.target/i386/pr68937-5.c b/gcc/testsuite/gcc.target/i386/pr68937-5.c
index f7e3ec5..fc907f8 100644
--- a/gcc/testsuite/gcc.target/i386/pr68937-5.c
+++ b/gcc/testsuite/gcc.target/i386/pr68937-5.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { *-*-linux* } } } */
+/* { dg-do compile { target *-*-linux* } } */
 /* { dg-options "-O2 -fpic -fno-plt -funroll-loops" } */
 
 extern void *f();
diff --git a/gcc/testsuite/gcc.target/i386/pr68990.c b/gcc/testsuite/gcc.target/i386/pr68990.c
index 4c3ca03..1fa321d 100644
--- a/gcc/testsuite/gcc.target/i386/pr68990.c
+++ b/gcc/testsuite/gcc.target/i386/pr68990.c
@@ -1,4 +1,4 @@
-/* { 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" } } */
 
diff --git a/gcc/testsuite/gcc.target/i386/pr69454-1.c b/gcc/testsuite/gcc.target/i386/pr69454-1.c
index 12ecfd3..47b47f7 100644
--- a/gcc/testsuite/gcc.target/i386/pr69454-1.c
+++ b/gcc/testsuite/gcc.target/i386/pr69454-1.c
@@ -1,4 +1,4 @@
-/* { 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;
diff --git a/gcc/testsuite/gcc.target/i386/pr69454-2.c b/gcc/testsuite/gcc.target/i386/pr69454-2.c
index 4c9a6ca..b9c2061 100644
--- a/gcc/testsuite/gcc.target/i386/pr69454-2.c
+++ b/gcc/testsuite/gcc.target/i386/pr69454-2.c
@@ -1,4 +1,4 @@
-/* { 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 ();
diff --git a/gcc/testsuite/gcc.target/i386/pr69677.c b/gcc/testsuite/gcc.target/i386/pr69677.c
index 942bdb5..e3f824b 100644
--- a/gcc/testsuite/gcc.target/i386/pr69677.c
+++ b/gcc/testsuite/gcc.target/i386/pr69677.c
@@ -1,4 +1,4 @@
-/* { 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[];
diff --git a/gcc/testsuite/gcc.target/i386/pr70160.c b/gcc/testsuite/gcc.target/i386/pr70160.c
index 725e955..2d34589 100644
--- a/gcc/testsuite/gcc.target/i386/pr70160.c
+++ b/gcc/testsuite/gcc.target/i386/pr70160.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ia32 } } } */
+/* { dg-do compile { target ia32 } } */
 /* { dg-options "-O2 -msse2 -Wno-uninitialized -Wno-maybe-uninitialized" } */
 
 long long a;
diff --git a/gcc/testsuite/gcc.target/i386/pr70302.c b/gcc/testsuite/gcc.target/i386/pr70302.c
index 9b82a0c..5037ae4 100644
--- a/gcc/testsuite/gcc.target/i386/pr70302.c
+++ b/gcc/testsuite/gcc.target/i386/pr70302.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ia32 } } } */
+/* { dg-do compile { target ia32 } } */
 /* { dg-options "-O2 -msse2" } */
 
 long a, c, e;
diff --git a/gcc/testsuite/gcc.target/i386/pr70453.c b/gcc/testsuite/gcc.target/i386/pr70453.c
index 2ff1fbb..215c332 100644
--- a/gcc/testsuite/gcc.target/i386/pr70453.c
+++ b/gcc/testsuite/gcc.target/i386/pr70453.c
@@ -1,5 +1,5 @@
 /* PR target/70453 */
-/* { dg-do assemble { target { lp64 } } } */
+/* { dg-do assemble { target lp64 } } */
 /* { dg-require-effective-target avx512vbmi } */
 /* { dg-options "-Og -fschedule-insns -mavx512vbmi" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/pr70750-1.c b/gcc/testsuite/gcc.target/i386/pr70750-1.c
index 9fcab17..7affe1d 100644
--- 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 } } } */
diff --git a/gcc/testsuite/gcc.target/i386/pr70750-2.c b/gcc/testsuite/gcc.target/i386/pr70750-2.c
index afbef37..0ed856b 100644
--- 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 } } } */
diff --git a/gcc/testsuite/gcc.target/i386/pr70799-1.c b/gcc/testsuite/gcc.target/i386/pr70799-1.c
index 44c795c..ab34f05 100644
--- a/gcc/testsuite/gcc.target/i386/pr70799-1.c
+++ b/gcc/testsuite/gcc.target/i386/pr70799-1.c
@@ -1,5 +1,5 @@
 /* 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" } } */
diff --git a/gcc/testsuite/gcc.target/i386/pr70799-2.c b/gcc/testsuite/gcc.target/i386/pr70799-2.c
index 4781051..3d8b7f6 100644
--- a/gcc/testsuite/gcc.target/i386/pr70799-2.c
+++ b/gcc/testsuite/gcc.target/i386/pr70799-2.c
@@ -1,5 +1,5 @@
 /* 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" } } */
diff --git a/gcc/testsuite/gcc.target/i386/pr70799-3.c b/gcc/testsuite/gcc.target/i386/pr70799-3.c
index 92df1c5..3f73687 100644
--- a/gcc/testsuite/gcc.target/i386/pr70799-3.c
+++ b/gcc/testsuite/gcc.target/i386/pr70799-3.c
@@ -1,5 +1,5 @@
 /* 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" } } */
diff --git a/gcc/testsuite/gcc.target/i386/pr70799-4.c b/gcc/testsuite/gcc.target/i386/pr70799-4.c
index 999d5ab..3e415d5 100644
--- a/gcc/testsuite/gcc.target/i386/pr70799-4.c
+++ b/gcc/testsuite/gcc.target/i386/pr70799-4.c
@@ -1,5 +1,5 @@
 /* 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" } } */
diff --git a/gcc/testsuite/gcc.target/i386/pr70799-5.c b/gcc/testsuite/gcc.target/i386/pr70799-5.c
index 4dc127a..ea17071 100644
--- a/gcc/testsuite/gcc.target/i386/pr70799-5.c
+++ b/gcc/testsuite/gcc.target/i386/pr70799-5.c
@@ -1,5 +1,5 @@
 /* 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" } } */
diff --git a/gcc/testsuite/gcc.target/i386/pr71958.c b/gcc/testsuite/gcc.target/i386/pr71958.c
index c5a1097..5e60d17 100644
--- a/gcc/testsuite/gcc.target/i386/pr71958.c
+++ b/gcc/testsuite/gcc.target/i386/pr71958.c
@@ -1,4 +1,4 @@
-/* { 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 } */
 
diff --git a/gcc/testsuite/gcc.target/i386/pr78794.c b/gcc/testsuite/gcc.target/i386/pr78794.c
index 6c3a3fe..86f1a9e 100644
--- a/gcc/testsuite/gcc.target/i386/pr78794.c
+++ b/gcc/testsuite/gcc.target/i386/pr78794.c
@@ -1,5 +1,5 @@
 /* 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" } } */
 
diff --git a/gcc/testsuite/gcc.target/i386/record-mcount.c b/gcc/testsuite/gcc.target/i386/record-mcount.c
index 72f1062..05b4bcb 100644
--- a/gcc/testsuite/gcc.target/i386/record-mcount.c
+++ b/gcc/testsuite/gcc.target/i386/record-mcount.c
@@ -1,5 +1,5 @@
 /* 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 */
diff --git a/gcc/testsuite/gcc.target/i386/struct-size.c b/gcc/testsuite/gcc.target/i386/struct-size.c
index 210fdbd..d82d730 100644
--- a/gcc/testsuite/gcc.target/i386/struct-size.c
+++ b/gcc/testsuite/gcc.target/i386/struct-size.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { *-*-linux* } } } */
+/* { dg-do compile { target *-*-linux* } } */
 /* { dg-options "-Wno-pedantic" } */
 
 struct S {
diff --git a/gcc/testsuite/gcc.target/i386/vararg-1.c b/gcc/testsuite/gcc.target/i386/vararg-1.c
index cab44ed..29b8f06 100644
--- a/gcc/testsuite/gcc.target/i386/vararg-1.c
+++ b/gcc/testsuite/gcc.target/i386/vararg-1.c
@@ -1,7 +1,7 @@
 /* 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"
diff --git a/gcc/testsuite/gcc.target/i386/vararg-2.c b/gcc/testsuite/gcc.target/i386/vararg-2.c
index 3010f41..5ee0c51 100644
--- a/gcc/testsuite/gcc.target/i386/vararg-2.c
+++ b/gcc/testsuite/gcc.target/i386/vararg-2.c
@@ -1,7 +1,7 @@
 /* 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"
-- 
2.7.4