From 8c20a15574b1a551bc6b51b35129b56f69110ef9 Mon Sep 17 00:00:00 2001
From: Uros Bizjak <ubizjak@gmail.com>
Date: Tue, 29 Dec 2015 11:32:21 +0100
Subject: [PATCH] *.c: Remove extra braces from target selectors.

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

From-SVN: r231990
---
 gcc/testsuite/ChangeLog                                   | 4 ++++
 gcc/testsuite/gcc.target/i386/amd64-abi-1.c               | 2 +-
 gcc/testsuite/gcc.target/i386/amd64-abi-2.c               | 2 +-
 gcc/testsuite/gcc.target/i386/amd64-abi-4.c               | 2 +-
 gcc/testsuite/gcc.target/i386/amd64-abi-5.c               | 2 +-
 gcc/testsuite/gcc.target/i386/amd64-abi-6.c               | 2 +-
 gcc/testsuite/gcc.target/i386/amd64-abi-7.c               | 2 +-
 gcc/testsuite/gcc.target/i386/amd64-abi-8.c               | 2 +-
 gcc/testsuite/gcc.target/i386/amd64-abi-9.c               | 2 +-
 gcc/testsuite/gcc.target/i386/avx-vcvtsd2si-2.c           | 2 +-
 gcc/testsuite/gcc.target/i386/avx-vcvtsi2sd-2.c           | 2 +-
 gcc/testsuite/gcc.target/i386/avx-vcvtsi2ss-2.c           | 2 +-
 gcc/testsuite/gcc.target/i386/avx-vcvtss2si-2.c           | 2 +-
 gcc/testsuite/gcc.target/i386/avx-vcvttsd2si-2.c          | 2 +-
 gcc/testsuite/gcc.target/i386/avx-vcvttss2si-2.c          | 2 +-
 gcc/testsuite/gcc.target/i386/avx-vmovq-2.c               | 2 +-
 gcc/testsuite/gcc.target/i386/avx-vmovq-3.c               | 2 +-
 gcc/testsuite/gcc.target/i386/avx-vpextrq-1.c             | 2 +-
 gcc/testsuite/gcc.target/i386/avx-vpinsrq-1.c             | 2 +-
 gcc/testsuite/gcc.target/i386/avx512f-broadcast-gpr-1.c   | 4 ++--
 gcc/testsuite/gcc.target/i386/avx512f-vcvtsd2si64-1.c     | 2 +-
 gcc/testsuite/gcc.target/i386/avx512f-vcvtsd2usi64-1.c    | 2 +-
 gcc/testsuite/gcc.target/i386/avx512f-vcvtsd2usi64-2.c    | 2 +-
 gcc/testsuite/gcc.target/i386/avx512f-vcvtsi2sd64-1.c     | 2 +-
 gcc/testsuite/gcc.target/i386/avx512f-vcvtsi2ss64-1.c     | 2 +-
 gcc/testsuite/gcc.target/i386/avx512f-vcvtss2si64-1.c     | 2 +-
 gcc/testsuite/gcc.target/i386/avx512f-vcvtss2usi64-1.c    | 2 +-
 gcc/testsuite/gcc.target/i386/avx512f-vcvtss2usi64-2.c    | 2 +-
 gcc/testsuite/gcc.target/i386/avx512f-vcvttsd2si64-1.c    | 2 +-
 gcc/testsuite/gcc.target/i386/avx512f-vcvttsd2si64-2.c    | 2 +-
 gcc/testsuite/gcc.target/i386/avx512f-vcvttsd2usi64-1.c   | 2 +-
 gcc/testsuite/gcc.target/i386/avx512f-vcvttsd2usi64-2.c   | 2 +-
 gcc/testsuite/gcc.target/i386/avx512f-vcvttss2si64-1.c    | 2 +-
 gcc/testsuite/gcc.target/i386/avx512f-vcvttss2si64-2.c    | 2 +-
 gcc/testsuite/gcc.target/i386/avx512f-vcvttss2usi64-1.c   | 2 +-
 gcc/testsuite/gcc.target/i386/avx512f-vcvttss2usi64-2.c   | 2 +-
 gcc/testsuite/gcc.target/i386/avx512f-vcvtusi2sd64-1.c    | 2 +-
 gcc/testsuite/gcc.target/i386/avx512f-vcvtusi2sd64-2.c    | 2 +-
 gcc/testsuite/gcc.target/i386/avx512f-vcvtusi2ss64-1.c    | 2 +-
 gcc/testsuite/gcc.target/i386/avx512f-vcvtusi2ss64-2.c    | 2 +-
 gcc/testsuite/gcc.target/i386/avx512f-vpbroadcastq-1.c    | 6 +++---
 gcc/testsuite/gcc.target/i386/avx512f_evex_reg_asm-1.c    | 2 +-
 gcc/testsuite/gcc.target/i386/avx512f_evex_reg_asm-2.c    | 2 +-
 gcc/testsuite/gcc.target/i386/avx512vl-vpbroadcastd-1.c   | 8 ++++----
 gcc/testsuite/gcc.target/i386/avx512vl-vpbroadcastq-1.c   | 8 ++++----
 gcc/testsuite/gcc.target/i386/bmi-2.c                     | 2 +-
 gcc/testsuite/gcc.target/i386/bmi-5.c                     | 2 +-
 gcc/testsuite/gcc.target/i386/bt-3.c                      | 2 +-
 gcc/testsuite/gcc.target/i386/cleanup-2.c                 | 2 +-
 gcc/testsuite/gcc.target/i386/cmpxchg16b-1.c              | 2 +-
 gcc/testsuite/gcc.target/i386/crc32-2.c                   | 2 +-
 gcc/testsuite/gcc.target/i386/divmod-7.c                  | 2 +-
 gcc/testsuite/gcc.target/i386/divmod-8.c                  | 2 +-
 gcc/testsuite/gcc.target/i386/fentry-override.c           | 2 +-
 gcc/testsuite/gcc.target/i386/fentry.c                    | 2 +-
 gcc/testsuite/gcc.target/i386/fma3-builtin.c              | 2 +-
 gcc/testsuite/gcc.target/i386/fma3-fma.c                  | 2 +-
 gcc/testsuite/gcc.target/i386/fma4-256-vector.c           | 2 +-
 gcc/testsuite/gcc.target/i386/fma4-builtin.c              | 2 +-
 gcc/testsuite/gcc.target/i386/fma4-fma-2.c                | 2 +-
 gcc/testsuite/gcc.target/i386/fma4-fma.c                  | 2 +-
 gcc/testsuite/gcc.target/i386/fma4-vector-2.c             | 2 +-
 gcc/testsuite/gcc.target/i386/fma4-vector.c               | 2 +-
 gcc/testsuite/gcc.target/i386/funcspec-2.c                | 2 +-
 gcc/testsuite/gcc.target/i386/funcspec-6.c                | 2 +-
 .../gcc.target/i386/gcc-have-sync-compare-and-swap-4.c    | 2 +-
 gcc/testsuite/gcc.target/i386/local.c                     | 2 +-
 gcc/testsuite/gcc.target/i386/max-stack-align.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/movbe-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-9.c                     | 2 +-
 gcc/testsuite/gcc.target/i386/pr30961-1.c                 | 2 +-
 gcc/testsuite/gcc.target/i386/pr32661-1.c                 | 2 +-
 gcc/testsuite/gcc.target/i386/pr32708-2.c                 | 2 +-
 gcc/testsuite/gcc.target/i386/pr32708-3.c                 | 2 +-
 gcc/testsuite/gcc.target/i386/pr34256.c                   | 2 +-
 gcc/testsuite/gcc.target/i386/pr36246.c                   | 2 +-
 gcc/testsuite/gcc.target/i386/pr36786.c                   | 2 +-
 gcc/testsuite/gcc.target/i386/pr39082-1.c                 | 2 +-
 gcc/testsuite/gcc.target/i386/pr44942.c                   | 2 +-
 gcc/testsuite/gcc.target/i386/pr45336-2.c                 | 2 +-
 gcc/testsuite/gcc.target/i386/pr45336-4.c                 | 2 +-
 gcc/testsuite/gcc.target/i386/pr45685.c                   | 2 +-
 gcc/testsuite/gcc.target/i386/pr45852.c                   | 2 +-
 gcc/testsuite/gcc.target/i386/pr48037-1.c                 | 2 +-
 gcc/testsuite/gcc.target/i386/pr51393.c                   | 2 +-
 gcc/testsuite/gcc.target/i386/pr51987.c                   | 2 +-
 gcc/testsuite/gcc.target/i386/pr52146.c                   | 2 +-
 gcc/testsuite/gcc.target/i386/pr52698.c                   | 2 +-
 gcc/testsuite/gcc.target/i386/pr52857-1.c                 | 2 +-
 gcc/testsuite/gcc.target/i386/pr52857-2.c                 | 2 +-
 gcc/testsuite/gcc.target/i386/pr53249.c                   | 2 +-
 gcc/testsuite/gcc.target/i386/pr53425-1.c                 | 2 +-
 gcc/testsuite/gcc.target/i386/pr53425-2.c                 | 2 +-
 gcc/testsuite/gcc.target/i386/pr53698.c                   | 2 +-
 gcc/testsuite/gcc.target/i386/pr54157.c                   | 2 +-
 gcc/testsuite/gcc.target/i386/pr54445-2.c                 | 2 +-
 gcc/testsuite/gcc.target/i386/pr54457.c                   | 2 +-
 gcc/testsuite/gcc.target/i386/pr55049-1.c                 | 2 +-
 gcc/testsuite/gcc.target/i386/pr55093.c                   | 2 +-
 gcc/testsuite/gcc.target/i386/pr55116-1.c                 | 2 +-
 gcc/testsuite/gcc.target/i386/pr55116-2.c                 | 2 +-
 gcc/testsuite/gcc.target/i386/pr55142-1.c                 | 2 +-
 gcc/testsuite/gcc.target/i386/pr55142-2.c                 | 2 +-
 gcc/testsuite/gcc.target/i386/pr55151.c                   | 2 +-
 gcc/testsuite/gcc.target/i386/pr55247-2.c                 | 2 +-
 gcc/testsuite/gcc.target/i386/pr55247.c                   | 2 +-
 gcc/testsuite/gcc.target/i386/pr55597.c                   | 2 +-
 gcc/testsuite/gcc.target/i386/pr55981.c                   | 2 +-
 gcc/testsuite/gcc.target/i386/pr56028.c                   | 2 +-
 gcc/testsuite/gcc.target/i386/pr58690.c                   | 2 +-
 gcc/testsuite/gcc.target/i386/pr59034-1.c                 | 2 +-
 gcc/testsuite/gcc.target/i386/pr59034-2.c                 | 2 +-
 gcc/testsuite/gcc.target/i386/pr64409.c                   | 2 +-
 gcc/testsuite/gcc.target/i386/pr66232-5.c                 | 2 +-
 gcc/testsuite/gcc.target/i386/pr66470.c                   | 2 +-
 gcc/testsuite/gcc.target/i386/pr66978.c                   | 2 +-
 gcc/testsuite/gcc.target/i386/rdfsbase-1.c                | 2 +-
 gcc/testsuite/gcc.target/i386/rdfsbase-2.c                | 2 +-
 gcc/testsuite/gcc.target/i386/rdgsbase-1.c                | 2 +-
 gcc/testsuite/gcc.target/i386/rdgsbase-2.c                | 2 +-
 gcc/testsuite/gcc.target/i386/rdrand-3.c                  | 2 +-
 gcc/testsuite/gcc.target/i386/rotate-2.c                  | 2 +-
 gcc/testsuite/gcc.target/i386/sse-cvtsi2ss-2.c            | 2 +-
 gcc/testsuite/gcc.target/i386/sse-cvtss2si-2.c            | 2 +-
 gcc/testsuite/gcc.target/i386/sse-cvttss2si-2.c           | 2 +-
 gcc/testsuite/gcc.target/i386/sse2-cvtsd2si-2.c           | 2 +-
 gcc/testsuite/gcc.target/i386/sse2-cvtsi2sd-2.c           | 2 +-
 gcc/testsuite/gcc.target/i386/sse2-cvttsd2si-2.c          | 2 +-
 gcc/testsuite/gcc.target/i386/sse2-init-v2di-2.c          | 2 +-
 gcc/testsuite/gcc.target/i386/sse2-movq-2.c               | 2 +-
 gcc/testsuite/gcc.target/i386/sse2-movq-3.c               | 2 +-
 gcc/testsuite/gcc.target/i386/sse4_1-pextrq.c             | 2 +-
 gcc/testsuite/gcc.target/i386/sse4_1-pinsrq.c             | 2 +-
 gcc/testsuite/gcc.target/i386/sse4_2-crc32q.c             | 2 +-
 gcc/testsuite/gcc.target/i386/sse4_2-popcntq.c            | 2 +-
 gcc/testsuite/gcc.target/i386/ssp-strong-reg.c            | 2 +-
 gcc/testsuite/gcc.target/i386/tbm-2.c                     | 2 +-
 gcc/testsuite/gcc.target/i386/testround-2.c               | 2 +-
 gcc/testsuite/gcc.target/i386/udivmod-7.c                 | 2 +-
 gcc/testsuite/gcc.target/i386/udivmod-8.c                 | 2 +-
 gcc/testsuite/gcc.target/i386/vararg-1.c                  | 2 +-
 gcc/testsuite/gcc.target/i386/vararg-2.c                  | 2 +-
 gcc/testsuite/gcc.target/i386/vectorize5.c                | 2 +-
 gcc/testsuite/gcc.target/i386/warn-vect-op-1.c            | 2 +-
 gcc/testsuite/gcc.target/i386/warn-vect-op-2.c            | 2 +-
 gcc/testsuite/gcc.target/i386/warn-vect-op-3.c            | 2 +-
 gcc/testsuite/gcc.target/i386/wrfsbase-1.c                | 2 +-
 gcc/testsuite/gcc.target/i386/wrfsbase-2.c                | 2 +-
 gcc/testsuite/gcc.target/i386/wrgsbase-1.c                | 2 +-
 gcc/testsuite/gcc.target/i386/wrgsbase-2.c                | 2 +-
 gcc/testsuite/gcc.target/i386/xop-pcmov.c                 | 2 +-
 gcc/testsuite/gcc.target/i386/xop-pcmov2.c                | 2 +-
 gcc/testsuite/gcc.target/i386/xop-rotate1-vector.c        | 2 +-
 gcc/testsuite/gcc.target/i386/xop-rotate2-vector.c        | 2 +-
 gcc/testsuite/gcc.target/i386/xop-rotate3-vector.c        | 2 +-
 gcc/testsuite/gcc.target/i386/xop-shift1-vector.c         | 2 +-
 gcc/testsuite/gcc.target/i386/xop-shift2-vector.c         | 2 +-
 gcc/testsuite/gcc.target/i386/xop-shift3-vector.c         | 2 +-
 gcc/testsuite/gcc.target/i386/zee.c                       | 2 +-
 164 files changed, 176 insertions(+), 172 deletions(-)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index aa2d9dff2ff..0cc0603bed4 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2015-12-28  Uros Bizjak  <ubizjak@gmail.com>
+
+	* gcc.target/i386/*.c: Remove extra braces from target selectors.
+
 2015-12-28  Uros Bizjak  <ubizjak@gmail.com>
 
 	* gcc.target/i386/pr68473-1.c: Add dg-do compile directive.
diff --git a/gcc/testsuite/gcc.target/i386/amd64-abi-1.c b/gcc/testsuite/gcc.target/i386/amd64-abi-1.c
index 8988f79c73d..69fde57bf06 100644
--- a/gcc/testsuite/gcc.target/i386/amd64-abi-1.c
+++ b/gcc/testsuite/gcc.target/i386/amd64-abi-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-mno-sse" } */
 /* { dg-additional-options "-mabi=sysv" { target *-*-mingw* } } */
 
diff --git a/gcc/testsuite/gcc.target/i386/amd64-abi-2.c b/gcc/testsuite/gcc.target/i386/amd64-abi-2.c
index 6146e8efa29..346edf0b0db 100644
--- a/gcc/testsuite/gcc.target/i386/amd64-abi-2.c
+++ b/gcc/testsuite/gcc.target/i386/amd64-abi-2.c
@@ -1,5 +1,5 @@
 /* PR target/26223 */
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-mno-80387" } */
 /* { dg-additional-options "-mabi=sysv" { target *-*-mingw* } } */
 
diff --git a/gcc/testsuite/gcc.target/i386/amd64-abi-4.c b/gcc/testsuite/gcc.target/i386/amd64-abi-4.c
index e88fde6affa..9d7cc3cede0 100644
--- a/gcc/testsuite/gcc.target/i386/amd64-abi-4.c
+++ b/gcc/testsuite/gcc.target/i386/amd64-abi-4.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { ! { ia32 } } } } */
+/* { dg-do run { target { ! ia32 } } } */
 /* { dg-options "-O2 -mno-sse" } */
 
 #include <stdarg.h>
diff --git a/gcc/testsuite/gcc.target/i386/amd64-abi-5.c b/gcc/testsuite/gcc.target/i386/amd64-abi-5.c
index da2a14ee42c..88455b89b07 100644
--- a/gcc/testsuite/gcc.target/i386/amd64-abi-5.c
+++ b/gcc/testsuite/gcc.target/i386/amd64-abi-5.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { ! { ia32 } } } } */
+/* { dg-do run { target { ! ia32 } } } */
 /* { dg-options "-O2" } */
 
 #include <stdarg.h>
diff --git a/gcc/testsuite/gcc.target/i386/amd64-abi-6.c b/gcc/testsuite/gcc.target/i386/amd64-abi-6.c
index 6d076ad381e..130b0a373bd 100644
--- a/gcc/testsuite/gcc.target/i386/amd64-abi-6.c
+++ b/gcc/testsuite/gcc.target/i386/amd64-abi-6.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { ! { ia32 } } } } */
+/* { dg-do run { target { ! ia32 } } } */
 /* { dg-options "-O2" } */
 
 #include <stdarg.h>
diff --git a/gcc/testsuite/gcc.target/i386/amd64-abi-7.c b/gcc/testsuite/gcc.target/i386/amd64-abi-7.c
index fcca680a09c..e7abede5c42 100644
--- a/gcc/testsuite/gcc.target/i386/amd64-abi-7.c
+++ b/gcc/testsuite/gcc.target/i386/amd64-abi-7.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { ! { ia32 } } } } */
+/* { dg-do run { target { ! ia32 } } } */
 /* { dg-options "-O2 -mno-sse" } */
 
 #include <stdarg.h>
diff --git a/gcc/testsuite/gcc.target/i386/amd64-abi-8.c b/gcc/testsuite/gcc.target/i386/amd64-abi-8.c
index b25ceec1b80..58aa3fd1c28 100644
--- a/gcc/testsuite/gcc.target/i386/amd64-abi-8.c
+++ b/gcc/testsuite/gcc.target/i386/amd64-abi-8.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -mno-sse -mskip-rax-setup" } */
 /* { dg-final { scan-assembler-not "xorl\[\\t \]*\\\%eax,\[\\t \]*%eax" } } */
 
diff --git a/gcc/testsuite/gcc.target/i386/amd64-abi-9.c b/gcc/testsuite/gcc.target/i386/amd64-abi-9.c
index 4707eb7f1c2..9b2cd7e7b49 100644
--- a/gcc/testsuite/gcc.target/i386/amd64-abi-9.c
+++ b/gcc/testsuite/gcc.target/i386/amd64-abi-9.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -mno-sse -mno-skip-rax-setup" } */
 /* { dg-final { scan-assembler-times "xorl\[\\t \]*\\\%eax,\[\\t \]*%eax" 2 } } */
 
diff --git a/gcc/testsuite/gcc.target/i386/avx-vcvtsd2si-2.c b/gcc/testsuite/gcc.target/i386/avx-vcvtsd2si-2.c
index f462c636515..d057d6b8c57 100644
--- a/gcc/testsuite/gcc.target/i386/avx-vcvtsd2si-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx-vcvtsd2si-2.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { ! { ia32 } } } } */
+/* { dg-do run { target { ! ia32 } } } */
 /* { dg-require-effective-target avx } */
 /* { dg-options "-O2 -mavx" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/avx-vcvtsi2sd-2.c b/gcc/testsuite/gcc.target/i386/avx-vcvtsi2sd-2.c
index 36f411e59bd..ef30cf895c3 100644
--- a/gcc/testsuite/gcc.target/i386/avx-vcvtsi2sd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx-vcvtsi2sd-2.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { ! { ia32 } } } } */
+/* { dg-do run { target { ! ia32 } } } */
 /* { dg-require-effective-target avx } */
 /* { dg-options "-O2 -mavx" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/avx-vcvtsi2ss-2.c b/gcc/testsuite/gcc.target/i386/avx-vcvtsi2ss-2.c
index 8dc0b35c18c..f3b21719fb7 100644
--- a/gcc/testsuite/gcc.target/i386/avx-vcvtsi2ss-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx-vcvtsi2ss-2.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { ! { ia32 } } } } */
+/* { dg-do run { target { ! ia32 } } } */
 /* { dg-require-effective-target avx } */
 /* { dg-options "-O2 -mavx" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/avx-vcvtss2si-2.c b/gcc/testsuite/gcc.target/i386/avx-vcvtss2si-2.c
index b9afab7f6a5..22b06211b34 100644
--- a/gcc/testsuite/gcc.target/i386/avx-vcvtss2si-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx-vcvtss2si-2.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { ! { ia32 } } } } */
+/* { dg-do run { target { ! ia32 } } } */
 /* { dg-require-effective-target avx } */
 /* { dg-options "-O2 -mavx" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/avx-vcvttsd2si-2.c b/gcc/testsuite/gcc.target/i386/avx-vcvttsd2si-2.c
index 84bdb9f3af8..7594af7a030 100644
--- a/gcc/testsuite/gcc.target/i386/avx-vcvttsd2si-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx-vcvttsd2si-2.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { ! { ia32 } } } } */
+/* { dg-do run { target { ! ia32 } } } */
 /* { dg-require-effective-target avx } */
 /* { dg-options "-O2 -mavx" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/avx-vcvttss2si-2.c b/gcc/testsuite/gcc.target/i386/avx-vcvttss2si-2.c
index b3c68eaf693..eea2ed9964f 100644
--- a/gcc/testsuite/gcc.target/i386/avx-vcvttss2si-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx-vcvttss2si-2.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { ! { ia32 } } } } */
+/* { dg-do run { target { ! ia32 } } } */
 /* { dg-require-effective-target avx } */
 /* { dg-options "-O2 -mavx" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/avx-vmovq-2.c b/gcc/testsuite/gcc.target/i386/avx-vmovq-2.c
index 8306d39cc3b..d755a0397fc 100644
--- a/gcc/testsuite/gcc.target/i386/avx-vmovq-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx-vmovq-2.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { ! { ia32 } } } } */
+/* { dg-do run { target { ! ia32 } } } */
 /* { dg-require-effective-target avx } */
 /* { dg-options "-O2 -mavx" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/avx-vmovq-3.c b/gcc/testsuite/gcc.target/i386/avx-vmovq-3.c
index a6d624749ad..659697e3ba1 100644
--- a/gcc/testsuite/gcc.target/i386/avx-vmovq-3.c
+++ b/gcc/testsuite/gcc.target/i386/avx-vmovq-3.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { ! { ia32 } } } } */
+/* { dg-do run { target { ! ia32 } } } */
 /* { dg-require-effective-target avx } */
 /* { dg-options "-O2 -mavx" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/avx-vpextrq-1.c b/gcc/testsuite/gcc.target/i386/avx-vpextrq-1.c
index 59e70b2d854..658b7ca8ed3 100644
--- a/gcc/testsuite/gcc.target/i386/avx-vpextrq-1.c
+++ b/gcc/testsuite/gcc.target/i386/avx-vpextrq-1.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { ! { ia32 } } } } */
+/* { dg-do run { target { ! ia32 } } } */
 /* { dg-require-effective-target avx } */
 /* { dg-options "-O2 -mavx" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/avx-vpinsrq-1.c b/gcc/testsuite/gcc.target/i386/avx-vpinsrq-1.c
index 595fc1baa39..9b4904806e0 100644
--- a/gcc/testsuite/gcc.target/i386/avx-vpinsrq-1.c
+++ b/gcc/testsuite/gcc.target/i386/avx-vpinsrq-1.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { ! { ia32 } } } } */
+/* { dg-do run { target { ! ia32 } } } */
 /* { dg-require-effective-target avx } */
 /* { dg-options "-O2 -mavx" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-broadcast-gpr-1.c b/gcc/testsuite/gcc.target/i386/avx512f-broadcast-gpr-1.c
index 6b85c42ed83..a291dab874e 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-broadcast-gpr-1.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-broadcast-gpr-1.c
@@ -1,7 +1,7 @@
 /* { dg-do compile } */
 /* { dg-options "-mavx512f -O2" } */
-/* { dg-final { scan-assembler-times "vpbroadcastq\[ \\t\]+%r\[^\n\]+%zmm\[0-9\]+(?:\n|\[ \\t\]+#)" 1 { target { ! { ia32 } } } } } */
-/* { dg-final { scan-assembler-times "vpbroadcastd\[ \\t\]+%(?:e|r\[0-9\]+d)\[^\n\]+%zmm\[0-9\]+(?:\n|\[ \\t\]+#)" 1 { target { ! { ia32 } } } } } */
+/* { dg-final { scan-assembler-times "vpbroadcastq\[ \\t\]+%r\[^\n\]+%zmm\[0-9\]+(?:\n|\[ \\t\]+#)" 1 { target { ! ia32 } } } } */
+/* { dg-final { scan-assembler-times "vpbroadcastd\[ \\t\]+%(?:e|r\[0-9\]+d)\[^\n\]+%zmm\[0-9\]+(?:\n|\[ \\t\]+#)" 1 { target { ! ia32 } } } } */
 /* { dg-final { scan-assembler-times "vpbroadcastq\[ \\t\]+\[^\n\]+%zmm\[0-9\]+(?:\n|\[ \\t\]+#)" 1 { target ia32 } } } */
 /* { dg-final { scan-assembler-times "vpbroadcastd\[ \\t\]+\[^\n\]+%zmm\[0-9\]+(?:\n|\[ \\t\]+#)" 1 { target ia32 } } } */
 
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vcvtsd2si64-1.c b/gcc/testsuite/gcc.target/i386/avx512f-vcvtsd2si64-1.c
index c702f955690..ad11e8bd238 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vcvtsd2si64-1.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vcvtsd2si64-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -mavx512f" } */
 /* { dg-final { scan-assembler-times "vcvtsd2siq\[ \\t\]+\[^\n\]*\{rz-sae\}\[^\{\n\]*%xmm\[0-9\]+.{6}(?:\n|\[ \\t\]+#)" 1 } } */
 
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vcvtsd2usi64-1.c b/gcc/testsuite/gcc.target/i386/avx512f-vcvtsd2usi64-1.c
index 293c6bea39d..a0c503d88d1 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vcvtsd2usi64-1.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vcvtsd2usi64-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -mavx512f" } */
 /* { dg-final { scan-assembler-times "vcvtsd2usi\[ \\t\]+\[^\{\n\]*%xmm\[0-9\]+.{6}(?:\n|\[ \\t\]+#)" 1 } } */
 /* { dg-final { scan-assembler-times "vcvtsd2usi\[ \\t\]+\[^\n\]*\{ru-sae\}\[^\{\n\]*%xmm\[0-9\]+.{6}(?:\n|\[ \\t\]+#)" 1 } } */
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vcvtsd2usi64-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vcvtsd2usi64-2.c
index 92843d9e361..1d9fc8a2811 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vcvtsd2usi64-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vcvtsd2usi64-2.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { ! { ia32 } } } } */
+/* { dg-do run { target { ! ia32 } } } */
 /* { dg-options "-O2 -mavx512f" } */
 /* { dg-require-effective-target avx512f } */
 
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vcvtsi2sd64-1.c b/gcc/testsuite/gcc.target/i386/avx512f-vcvtsi2sd64-1.c
index 7e8bcc0f73e..440ddbcdb87 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vcvtsi2sd64-1.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vcvtsi2sd64-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-mavx512f -O2" } */
 /* { dg-final { scan-assembler-times "vcvtsi2sdq\[ \\t\]+\[^%\n\]*%r\[^\{\n\]*\{ru-sae\}\[^\{\n\]*%xmm\[0-9\]+(?:\n|\[ \\t\]+#)" 1 } } */
 
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vcvtsi2ss64-1.c b/gcc/testsuite/gcc.target/i386/avx512f-vcvtsi2ss64-1.c
index 114a687707b..ceef7cd9605 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vcvtsi2ss64-1.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vcvtsi2ss64-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-mavx512f -O2" } */
 /* { dg-final { scan-assembler-times "vcvtsi2ssq\[ \\t\]+\[^%\n\]*%r\[^\{\n\]*\{rz-sae\}\[^\{\n\]*%xmm\[0-9\]+(?:\n|\[ \\t\]+#)" 1 } } */
 
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vcvtss2si64-1.c b/gcc/testsuite/gcc.target/i386/avx512f-vcvtss2si64-1.c
index 96ba63f4a41..7ada1f4cd48 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vcvtss2si64-1.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vcvtss2si64-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -mavx512f" } */
 /* { dg-final { scan-assembler-times "vcvtss2siq\[ \\t\]+\[^\n\]*\{rz-sae\}\[^\{\n\]*%xmm\[0-9\]+.{6}(?:\n|\[ \\t\]+#)" 1 } } */
 
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vcvtss2usi64-1.c b/gcc/testsuite/gcc.target/i386/avx512f-vcvtss2usi64-1.c
index 067c41d78cb..a55e4115a2c 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vcvtss2usi64-1.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vcvtss2usi64-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -mavx512f" } */
 /* { dg-final { scan-assembler-times "vcvtss2usi\[ \\t\]+\[^\{\n\]*%xmm\[0-9\]+.{6}(?:\n|\[ \\t\]+#)" 1 } } */
 /* { dg-final { scan-assembler-times "vcvtss2usi\[ \\t\]+\[^\n\]*\{ru-sae\}\[^\{\n\]*%xmm\[0-9\]+.{6}(?:\n|\[ \\t\]+#)" 1 } } */
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vcvtss2usi64-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vcvtss2usi64-2.c
index d19da31719c..1a083f9ad18 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vcvtss2usi64-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vcvtss2usi64-2.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { ! { ia32 } } } } */
+/* { dg-do run { target { ! ia32 } } } */
 /* { dg-options "-O2 -mavx512f" } */
 /* { dg-require-effective-target avx512f } */
 
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vcvttsd2si64-1.c b/gcc/testsuite/gcc.target/i386/avx512f-vcvttsd2si64-1.c
index 0f1e0ab8dae..dd06e381a96 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vcvttsd2si64-1.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vcvttsd2si64-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -mavx512f" } */
 /* { dg-final { scan-assembler-times "vcvttsd2siq\[ \\t\]+\[^\{\n\]*%xmm\[0-9\]+.{6}(?:\n|\[ \\t\]+#)" 1 } } */
 /* { dg-final { scan-assembler-times "vcvttsd2siq\[ \\t\]+\[^\{\n\]*\{sae\}\[^\n\]*%xmm\[0-9\]+.{6}(?:\n|\[ \\t\]+#)" 1 } } */
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vcvttsd2si64-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vcvttsd2si64-2.c
index 7b759c1fa9e..89a711fb56d 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vcvttsd2si64-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vcvttsd2si64-2.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { ! { ia32 } } } } */
+/* { dg-do run { target { ! ia32 } } } */
 /* { dg-options "-mavx512f -O2" } */
 /* { dg-require-effective-target avx512f } */
 
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vcvttsd2usi64-1.c b/gcc/testsuite/gcc.target/i386/avx512f-vcvttsd2usi64-1.c
index 4f366cabf82..5f68508d352 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vcvttsd2usi64-1.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vcvttsd2usi64-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -mavx512f" } */
 /* { dg-final { scan-assembler-times "vcvttsd2usi\[ \\t\]+\[^\{\n\]*%xmm\[0-9\]+.{6}(?:\n|\[ \\t\]+#)" 1 } } */
 /* { dg-final { scan-assembler-times "vcvttsd2usi\[ \\t\]+\[^\{\n\]*\{sae\}\[^\n\]*%xmm\[0-9\]+.{6}(?:\n|\[ \\t\]+#)" 1 } } */
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vcvttsd2usi64-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vcvttsd2usi64-2.c
index 4aa45ef8264..872979d37b7 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vcvttsd2usi64-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vcvttsd2usi64-2.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { ! { ia32 } } } } */
+/* { dg-do run { target { ! ia32 } } } */
 /* { dg-options "-O2 -mavx512f" } */
 /* { dg-require-effective-target avx512f } */
 
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vcvttss2si64-1.c b/gcc/testsuite/gcc.target/i386/avx512f-vcvttss2si64-1.c
index e1c24a971fe..85d5837b1f3 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vcvttss2si64-1.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vcvttss2si64-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -mavx512f" } */
 /* { dg-final { scan-assembler-times "vcvttss2siq\[ \\t\]+\[^\{\n\]*%xmm\[0-9\]+.{6}(?:\n|\[ \\t\]+#)" 1 } } */
 /* { dg-final { scan-assembler-times "vcvttss2siq\[ \\t\]+\[^\{\n\]*\{sae\}\[^\n\]*%xmm\[0-9\]+.{6}(?:\n|\[ \\t\]+#)" 1 } } */
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vcvttss2si64-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vcvttss2si64-2.c
index cf33b997a8e..9e4136a3418 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vcvttss2si64-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vcvttss2si64-2.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { ! { ia32 } } } } */
+/* { dg-do run { target { ! ia32 } } } */
 /* { dg-options "-mavx512f -O2" } */
 /* { dg-require-effective-target avx512f } */
 
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vcvttss2usi64-1.c b/gcc/testsuite/gcc.target/i386/avx512f-vcvttss2usi64-1.c
index 53da0c6c751..b8c3980af4f 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vcvttss2usi64-1.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vcvttss2usi64-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -mavx512f" } */
 /* { dg-final { scan-assembler-times "vcvttss2usi\[ \\t\]+\[^\{\n\]*%xmm\[0-9\]+.{6}(?:\n|\[ \\t\]+#)" 1 } } */
 /* { dg-final { scan-assembler-times "vcvttss2usi\[ \\t\]+\[^\{\n\]*\{sae\}\[^\n\]*%xmm\[0-9\]+.{6}(?:\n|\[ \\t\]+#)" 1 } } */
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vcvttss2usi64-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vcvttss2usi64-2.c
index 85f55d6cd7d..fbe00b15238 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vcvttss2usi64-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vcvttss2usi64-2.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { ! { ia32 } } } } */
+/* { dg-do run { target { ! ia32 } } } */
 /* { dg-options "-O2 -mavx512f" } */
 /* { dg-require-effective-target avx512f } */
 
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vcvtusi2sd64-1.c b/gcc/testsuite/gcc.target/i386/avx512f-vcvtusi2sd64-1.c
index fcdfcacbeca..8675450f0c4 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vcvtusi2sd64-1.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vcvtusi2sd64-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-mavx512f -O2" } */
 /* { dg-final { scan-assembler-times "vcvtusi2sd\[ \\t\]+\[^\{\n\]*%xmm\[0-9\]+(?:\n|\[ \\t\]+#)" 1 } } */
 /* { dg-final { scan-assembler-times "vcvtusi2sd\[ \\t\]+\[^%\n\]*%r\[^\{\n\]*\{ru-sae\}\[^\{\n\]*%xmm\[0-9\]+(?:\n|\[ \\t\]+#)" 1 } } */
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vcvtusi2sd64-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vcvtusi2sd64-2.c
index 997e21bb54d..d7dc0f9940c 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vcvtusi2sd64-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vcvtusi2sd64-2.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { ! { ia32 } } } } */
+/* { dg-do run { target { ! ia32 } } } */
 /* { dg-options "-mavx512f -O2" } */
 /* { dg-require-effective-target avx512f } */
 
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vcvtusi2ss64-1.c b/gcc/testsuite/gcc.target/i386/avx512f-vcvtusi2ss64-1.c
index 6b9368f8704..38ecf39ad65 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vcvtusi2ss64-1.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vcvtusi2ss64-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-mavx512f -O2" } */
 /* { dg-final { scan-assembler-times "vcvtusi2ss\[ \\t\]+\[^\{\n\]*%xmm\[0-9\]+(?:\n|\[ \\t\]+#)" 1 } } */
 /* { dg-final { scan-assembler-times "vcvtusi2ss\[ \\t\]+\[^%\n\]*%r\[^\{\n\]*\{rz-sae\}\[^\{\n\]*%xmm\[0-9\]+(?:\n|\[ \\t\]+#)" 1 } } */
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vcvtusi2ss64-2.c b/gcc/testsuite/gcc.target/i386/avx512f-vcvtusi2ss64-2.c
index eeb499aac9f..e3b015c2e33 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vcvtusi2ss64-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vcvtusi2ss64-2.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { ! { ia32 } } } } */
+/* { dg-do run { target { ! ia32 } } } */
 /* { dg-options "-mavx512f -O2" } */
 /* { dg-require-effective-target avx512f } */
 
diff --git a/gcc/testsuite/gcc.target/i386/avx512f-vpbroadcastq-1.c b/gcc/testsuite/gcc.target/i386/avx512f-vpbroadcastq-1.c
index f21c1b6fb6d..5da582cf17c 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f-vpbroadcastq-1.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f-vpbroadcastq-1.c
@@ -3,9 +3,9 @@
 /* { dg-final { scan-assembler-times "vpbroadcastq\[ \\t\]+\[^\{\n\]*%zmm\[0-9\]+(?:\n|\[ \\t\]+#)" 2  } } */
 /* { dg-final { scan-assembler-times "vpbroadcastq\[ \\t\]+\[^\{\n\]*%zmm\[0-9\]+\{%k\[1-7\]\}(?:\n|\[ \\t\]+#)" 2 } } */
 /* { dg-final { scan-assembler-times "vpbroadcastq\[ \\t\]+\[^\{\n\]*%zmm\[0-9\]+\{%k\[1-7\]\}\{z\}(?:\n|\[ \\t\]+#)" 2 } } */
-/* { dg-final { scan-assembler-times "vpbroadcastq\[ \\t\]+%r\[^\n\]*%zmm\[0-9\]+(?:\n|\[ \\t\]+#)" 1 { target { ! { ia32 } } } } } */
-/* { dg-final { scan-assembler-times "vpbroadcastq\[ \\t\]+%r\[^\n\]*%zmm\[0-9\]+\{%k\[1-7\]\}(?:\n|\[ \\t\]+#)" 1 { target { ! { ia32 } } } } } */
-/* { dg-final { scan-assembler-times "vpbroadcastq\[ \\t\]+%r\[^\n\]*%zmm\[0-9\]+\{%k\[1-7\]\}\{z\}(?:\n|\[ \\t\]+#)" 1 { target { ! { ia32 } } } } } */
+/* { dg-final { scan-assembler-times "vpbroadcastq\[ \\t\]+%r\[^\n\]*%zmm\[0-9\]+(?:\n|\[ \\t\]+#)" 1 { target { ! ia32 } } } } */
+/* { dg-final { scan-assembler-times "vpbroadcastq\[ \\t\]+%r\[^\n\]*%zmm\[0-9\]+\{%k\[1-7\]\}(?:\n|\[ \\t\]+#)" 1 { target { ! ia32 } } } } */
+/* { dg-final { scan-assembler-times "vpbroadcastq\[ \\t\]+%r\[^\n\]*%zmm\[0-9\]+\{%k\[1-7\]\}\{z\}(?:\n|\[ \\t\]+#)" 1 { target { ! ia32 } } } } */
 
 #include <immintrin.h>
 
diff --git a/gcc/testsuite/gcc.target/i386/avx512f_evex_reg_asm-1.c b/gcc/testsuite/gcc.target/i386/avx512f_evex_reg_asm-1.c
index 34a43537841..999f8b8a792 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f_evex_reg_asm-1.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f_evex_reg_asm-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -mavx512f -ffixed-xmm0 -ffixed-xmm1 -ffixed-xmm2 -ffixed-xmm3 -ffixed-xmm4 -ffixed-xmm5 -ffixed-xmm6 -ffixed-xmm7 -ffixed-xmm8 -ffixed-xmm9 -ffixed-xmm10 -ffixed-xmm11 -ffixed-xmm12 -ffixed-xmm13 -ffixed-xmm14 -ffixed-xmm15" } */
 
 volatile float a,b,c,d;
diff --git a/gcc/testsuite/gcc.target/i386/avx512f_evex_reg_asm-2.c b/gcc/testsuite/gcc.target/i386/avx512f_evex_reg_asm-2.c
index 5a633df0bda..8f29e3090d6 100644
--- a/gcc/testsuite/gcc.target/i386/avx512f_evex_reg_asm-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512f_evex_reg_asm-2.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -mavx512f -ffixed-xmm0 -ffixed-xmm1 -ffixed-xmm2 -ffixed-xmm3 -ffixed-xmm4 -ffixed-xmm5 -ffixed-xmm6 -ffixed-xmm7 -ffixed-xmm8 -ffixed-xmm9 -ffixed-xmm10 -ffixed-xmm11 -ffixed-xmm12 -ffixed-xmm13 -ffixed-xmm14 -ffixed-xmm15" } */
 /* { dg-final { scan-assembler-times "vaddss\[ \\t\]+\[^\{\n\]*%xmm(?:1\[6-9\]|2\[0-9\]|3\[0-1\])+;(?:\n|\[ \\t\]+#)" 1 } } */
 
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpbroadcastd-1.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpbroadcastd-1.c
index 68d62472de0..bcbb1368bd4 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpbroadcastd-1.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpbroadcastd-1.c
@@ -4,10 +4,10 @@
 /* { dg-final { scan-assembler-times "vpbroadcastd\[ \\t\]+\[^\{\n\]*%ymm\[0-9\]+\{%k\[1-7\]\}\{z\}(?:\n|\[ \\t\]+#)" 2 } } */
 /* { dg-final { scan-assembler-times "vpbroadcastd\[ \\t\]+\[^\{\n\]*%xmm\[0-9\]+\{%k\[1-7\]\}(?:\n|\[ \\t\]+#)" 2 } } */
 /* { dg-final { scan-assembler-times "vpbroadcastd\[ \\t\]+\[^\{\n\]*%xmm\[0-9\]+\{%k\[1-7\]\}\{z\}(?:\n|\[ \\t\]+#)" 2 } } */
-/* { dg-final { scan-assembler-times "vpbroadcastd\[ \\t\]+%(?:e|r\[0-9\]+d)\[^\n\]*%ymm\[0-9\]+\{%k\[1-7\]\}(?:\n|\[ \\t\]+#)" 1 { target { ! { ia32 } } } } } */
-/* { dg-final { scan-assembler-times "vpbroadcastd\[ \\t\]+%(?:e|r\[0-9\]+d)\[^\n\]*%ymm\[0-9\]+\{%k\[1-7\]\}\{z\}(?:\n|\[ \\t\]+#)" 1 { target { ! { ia32 } } } } } */
-/* { dg-final { scan-assembler-times "vpbroadcastd\[ \\t\]+%(?:e|r\[0-9\]+d)\[^\n\]*%xmm\[0-9\]+\{%k\[1-7\]\}(?:\n|\[ \\t\]+#)" 1 { target { ! { ia32 } } } } } */
-/* { dg-final { scan-assembler-times "vpbroadcastd\[ \\t\]+%(?:e|r\[0-9\]+d)\[^\n\]*%xmm\[0-9\]+\{%k\[1-7\]\}\{z\}(?:\n|\[ \\t\]+#)" 1 { target { ! { ia32 } } } } } */
+/* { dg-final { scan-assembler-times "vpbroadcastd\[ \\t\]+%(?:e|r\[0-9\]+d)\[^\n\]*%ymm\[0-9\]+\{%k\[1-7\]\}(?:\n|\[ \\t\]+#)" 1 { target { ! ia32 } } } } */
+/* { dg-final { scan-assembler-times "vpbroadcastd\[ \\t\]+%(?:e|r\[0-9\]+d)\[^\n\]*%ymm\[0-9\]+\{%k\[1-7\]\}\{z\}(?:\n|\[ \\t\]+#)" 1 { target { ! ia32 } } } } */
+/* { dg-final { scan-assembler-times "vpbroadcastd\[ \\t\]+%(?:e|r\[0-9\]+d)\[^\n\]*%xmm\[0-9\]+\{%k\[1-7\]\}(?:\n|\[ \\t\]+#)" 1 { target { ! ia32 } } } } */
+/* { dg-final { scan-assembler-times "vpbroadcastd\[ \\t\]+%(?:e|r\[0-9\]+d)\[^\n\]*%xmm\[0-9\]+\{%k\[1-7\]\}\{z\}(?:\n|\[ \\t\]+#)" 1 { target { ! ia32 } } } } */
 
 #include <immintrin.h>
 
diff --git a/gcc/testsuite/gcc.target/i386/avx512vl-vpbroadcastq-1.c b/gcc/testsuite/gcc.target/i386/avx512vl-vpbroadcastq-1.c
index 876ed9a24ea..009f44807e0 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vl-vpbroadcastq-1.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vl-vpbroadcastq-1.c
@@ -4,10 +4,10 @@
 /* { dg-final { scan-assembler-times "vpbroadcastq\[ \\t\]+\[^\{\n\]*%ymm\[0-9\]+\{%k\[1-7\]\}\{z\}(?:\n|\[ \\t\]+#)" 2 } } */
 /* { dg-final { scan-assembler-times "vpbroadcastq\[ \\t\]+\[^\{\n\]*%xmm\[0-9\]+\{%k\[1-7\]\}(?:\n|\[ \\t\]+#)" 2 } } */
 /* { dg-final { scan-assembler-times "vpbroadcastq\[ \\t\]+\[^\{\n\]*%xmm\[0-9\]+\{%k\[1-7\]\}\{z\}(?:\n|\[ \\t\]+#)" 2 } } */
-/* { dg-final { scan-assembler-times "vpbroadcastq\[ \\t\]+%r\[^\n\]*%ymm\[0-9\]+\{%k\[1-7\]\}(?:\n|\[ \\t\]+#)" 1 { target { ! { ia32 } } } } } */
-/* { dg-final { scan-assembler-times "vpbroadcastq\[ \\t\]+%r\[^\n\]*%ymm\[0-9\]+\{%k\[1-7\]\}\{z\}(?:\n|\[ \\t\]+#)" 1 { target { ! { ia32 } } } } } */
-/* { dg-final { scan-assembler-times "vpbroadcastq\[ \\t\]+%r\[^\n\]*%xmm\[0-9\]+\{%k\[1-7\]\}(?:\n|\[ \\t\]+#)" 1 { target { ! { ia32 } } } } } */
-/* { dg-final { scan-assembler-times "vpbroadcastq\[ \\t\]+%r\[^\n\]*%xmm\[0-9\]+\{%k\[1-7\]\}\{z\}(?:\n|\[ \\t\]+#)" 1 { target { ! { ia32 } } } } } */
+/* { dg-final { scan-assembler-times "vpbroadcastq\[ \\t\]+%r\[^\n\]*%ymm\[0-9\]+\{%k\[1-7\]\}(?:\n|\[ \\t\]+#)" 1 { target { ! ia32 } } } } */
+/* { dg-final { scan-assembler-times "vpbroadcastq\[ \\t\]+%r\[^\n\]*%ymm\[0-9\]+\{%k\[1-7\]\}\{z\}(?:\n|\[ \\t\]+#)" 1 { target { ! ia32 } } } } */
+/* { dg-final { scan-assembler-times "vpbroadcastq\[ \\t\]+%r\[^\n\]*%xmm\[0-9\]+\{%k\[1-7\]\}(?:\n|\[ \\t\]+#)" 1 { target { ! ia32 } } } } */
+/* { dg-final { scan-assembler-times "vpbroadcastq\[ \\t\]+%r\[^\n\]*%xmm\[0-9\]+\{%k\[1-7\]\}\{z\}(?:\n|\[ \\t\]+#)" 1 { target { ! ia32 } } } } */
 
 #include <immintrin.h>
 
diff --git a/gcc/testsuite/gcc.target/i386/bmi-2.c b/gcc/testsuite/gcc.target/i386/bmi-2.c
index 25fb86bbf6b..6b8595eb9e1 100644
--- a/gcc/testsuite/gcc.target/i386/bmi-2.c
+++ b/gcc/testsuite/gcc.target/i386/bmi-2.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 }  } } } */
+/* { dg-do compile { target { ! ia32  } } } */
 /* { dg-options "-O2 -fno-ipa-icf -mbmi " } */
 /* { dg-final { scan-assembler "andn\[^\\n]*rax" } } */
 /* { dg-final { scan-assembler-times "bextr\[ \\t]+\[^\\n]*rax" 2 } } */
diff --git a/gcc/testsuite/gcc.target/i386/bmi-5.c b/gcc/testsuite/gcc.target/i386/bmi-5.c
index 546a593c8ff..803dd0a4282 100644
--- a/gcc/testsuite/gcc.target/i386/bmi-5.c
+++ b/gcc/testsuite/gcc.target/i386/bmi-5.c
@@ -1,4 +1,4 @@
-/* { dg-do link { target { ! { ia32 } } } } */
+/* { dg-do link { target { ! ia32 } } } */
 /* { dg-options "-O2 -mbmi" } */
 
 #include <x86intrin.h>
diff --git a/gcc/testsuite/gcc.target/i386/bt-3.c b/gcc/testsuite/gcc.target/i386/bt-3.c
index aa13c5de869..1b42ffb042e 100644
--- a/gcc/testsuite/gcc.target/i386/bt-3.c
+++ b/gcc/testsuite/gcc.target/i386/bt-3.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -mtune=core2" } */
 
 extern void foo (void);
diff --git a/gcc/testsuite/gcc.target/i386/cleanup-2.c b/gcc/testsuite/gcc.target/i386/cleanup-2.c
index 36dd80da910..0ec7c3182ad 100644
--- a/gcc/testsuite/gcc.target/i386/cleanup-2.c
+++ b/gcc/testsuite/gcc.target/i386/cleanup-2.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { *-*-linux* && { ! { ia32 } } } } } */
+/* { dg-do run { target { *-*-linux* && { ! ia32 } } } } */
 /* { dg-options "-fexceptions -fnon-call-exceptions -fasynchronous-unwind-tables -O2" } */
 /* Test complex CFA value expressions.  */
 
diff --git a/gcc/testsuite/gcc.target/i386/cmpxchg16b-1.c b/gcc/testsuite/gcc.target/i386/cmpxchg16b-1.c
index e3402014e52..a70169e2771 100644
--- a/gcc/testsuite/gcc.target/i386/cmpxchg16b-1.c
+++ b/gcc/testsuite/gcc.target/i386/cmpxchg16b-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -mcx16" } */
 
 typedef int TItype __attribute__ ((mode (TI)));
diff --git a/gcc/testsuite/gcc.target/i386/crc32-2.c b/gcc/testsuite/gcc.target/i386/crc32-2.c
index 0701723bb2d..d10bbf79c99 100644
--- a/gcc/testsuite/gcc.target/i386/crc32-2.c
+++ b/gcc/testsuite/gcc.target/i386/crc32-2.c
@@ -1,6 +1,6 @@
 /* { dg-do compile } */
 /* { dg-options "-O2 -mcrc32 -std=gnu89" } */
-/* { dg-final { scan-assembler "crc32q\[^\\n\]*rax" { target { ! { ia32 } } } } } */
+/* { dg-final { scan-assembler "crc32q\[^\\n\]*rax" { target { ! ia32 } } } } */
 
 unsigned long long
 crc32d (unsigned long long x, unsigned long long y)
diff --git a/gcc/testsuite/gcc.target/i386/divmod-7.c b/gcc/testsuite/gcc.target/i386/divmod-7.c
index de4a1fb9399..77bca6cb474 100644
--- a/gcc/testsuite/gcc.target/i386/divmod-7.c
+++ b/gcc/testsuite/gcc.target/i386/divmod-7.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -m8bit-idiv" } */
 
 extern void abort (void);
diff --git a/gcc/testsuite/gcc.target/i386/divmod-8.c b/gcc/testsuite/gcc.target/i386/divmod-8.c
index eb09a6d7b2c..793f763e7a9 100644
--- a/gcc/testsuite/gcc.target/i386/divmod-8.c
+++ b/gcc/testsuite/gcc.target/i386/divmod-8.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -m8bit-idiv" } */
 
 extern void foo (long long, long long, long long, long long,
diff --git a/gcc/testsuite/gcc.target/i386/fentry-override.c b/gcc/testsuite/gcc.target/i386/fentry-override.c
index 4dd87a8af5c..f08a43c0df8 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 3548dd79dbb..4b380f4fcf7 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/fma3-builtin.c b/gcc/testsuite/gcc.target/i386/fma3-builtin.c
index 2d9c5c73a97..23da9f45fca 100644
--- a/gcc/testsuite/gcc.target/i386/fma3-builtin.c
+++ b/gcc/testsuite/gcc.target/i386/fma3-builtin.c
@@ -1,7 +1,7 @@
 /* Test that the compiler properly generates floating point multiply
    and add instructions FMA3 systems.  */
 
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -mfma -mno-fma4" } */
 
 #ifndef __FP_FAST_FMAF
diff --git a/gcc/testsuite/gcc.target/i386/fma3-fma.c b/gcc/testsuite/gcc.target/i386/fma3-fma.c
index f18f97bf3c7..2982eeb709b 100644
--- a/gcc/testsuite/gcc.target/i386/fma3-fma.c
+++ b/gcc/testsuite/gcc.target/i386/fma3-fma.c
@@ -1,7 +1,7 @@
 /* Test that the compiler properly optimizes floating point multiply
    and add instructions FMA3 systems.  */
 
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -mfma -mno-fma4" } */
 
 extern void exit (int);
diff --git a/gcc/testsuite/gcc.target/i386/fma4-256-vector.c b/gcc/testsuite/gcc.target/i386/fma4-256-vector.c
index edaa21a2d3a..c953191896f 100644
--- a/gcc/testsuite/gcc.target/i386/fma4-256-vector.c
+++ b/gcc/testsuite/gcc.target/i386/fma4-256-vector.c
@@ -1,7 +1,7 @@
 /* Test that the compiler properly optimizes floating point multiply and add
    instructions vector into vfmaddps on FMA4 systems.  */
 
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -mfma4 -ftree-vectorize -mtune=generic" } */
 
 extern void exit (int);
diff --git a/gcc/testsuite/gcc.target/i386/fma4-builtin.c b/gcc/testsuite/gcc.target/i386/fma4-builtin.c
index 3e59a7181ec..2d0a886b10b 100644
--- a/gcc/testsuite/gcc.target/i386/fma4-builtin.c
+++ b/gcc/testsuite/gcc.target/i386/fma4-builtin.c
@@ -1,7 +1,7 @@
 /* Test that the compiler properly generates floating point multiply
    and add instructions FMA4 systems.  */
 
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -mfma4 -mno-fma" } */
 
 #ifndef __FP_FAST_FMAF
diff --git a/gcc/testsuite/gcc.target/i386/fma4-fma-2.c b/gcc/testsuite/gcc.target/i386/fma4-fma-2.c
index ae6ca8d6d75..42b3373e063 100644
--- a/gcc/testsuite/gcc.target/i386/fma4-fma-2.c
+++ b/gcc/testsuite/gcc.target/i386/fma4-fma-2.c
@@ -2,7 +2,7 @@
    and add instructions into vfmaddss, vfmsubss, vfnmaddss,
    vfnmsubss on FMA4 systems.  */
 
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -funsafe-math-optimizations -mfma4 -mno-fma" } */
 
 extern void exit (int);
diff --git a/gcc/testsuite/gcc.target/i386/fma4-fma.c b/gcc/testsuite/gcc.target/i386/fma4-fma.c
index 1b8fb849dda..5db6e19d6b0 100644
--- a/gcc/testsuite/gcc.target/i386/fma4-fma.c
+++ b/gcc/testsuite/gcc.target/i386/fma4-fma.c
@@ -2,7 +2,7 @@
    and add instructions into vfmaddss, vfmsubss, vfnmaddss,
    vfnmsubss on FMA4 systems.  */
 
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -mfma4 -mno-fma" } */
 
 extern void exit (int);
diff --git a/gcc/testsuite/gcc.target/i386/fma4-vector-2.c b/gcc/testsuite/gcc.target/i386/fma4-vector-2.c
index b518aa82827..6b148b36860 100644
--- a/gcc/testsuite/gcc.target/i386/fma4-vector-2.c
+++ b/gcc/testsuite/gcc.target/i386/fma4-vector-2.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -mfma4 -ftree-vectorize -mtune=generic -mno-fma" } */
 
 float r[256], s[256];
diff --git a/gcc/testsuite/gcc.target/i386/fma4-vector.c b/gcc/testsuite/gcc.target/i386/fma4-vector.c
index cd5506344b3..9311b8751a2 100644
--- a/gcc/testsuite/gcc.target/i386/fma4-vector.c
+++ b/gcc/testsuite/gcc.target/i386/fma4-vector.c
@@ -1,7 +1,7 @@
 /* Test that the compiler properly optimizes floating point multiply and add
    instructions vector into vfmaddps on FMA4 systems.  */
 
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -mfma4 -ftree-vectorize -mtune=generic -mno-fma" } */
 
 extern void exit (int);
diff --git a/gcc/testsuite/gcc.target/i386/funcspec-2.c b/gcc/testsuite/gcc.target/i386/funcspec-2.c
index 0d92bc0c9c2..d607fbc79c9 100644
--- a/gcc/testsuite/gcc.target/i386/funcspec-2.c
+++ b/gcc/testsuite/gcc.target/i386/funcspec-2.c
@@ -1,5 +1,5 @@
 /* Test whether using target specific options, we can generate FMA4 code.  */
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-skip-if "" { *-*-* } { "-march=*" } { "-march=k8" } } */
 /* { dg-options "-O2 -march=k8" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/funcspec-6.c b/gcc/testsuite/gcc.target/i386/funcspec-6.c
index e28b38c4400..154b022e061 100644
--- a/gcc/testsuite/gcc.target/i386/funcspec-6.c
+++ b/gcc/testsuite/gcc.target/i386/funcspec-6.c
@@ -1,6 +1,6 @@
 /* Test whether all of the 64-bit function specific options are accepted
    without error.  */
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 
 extern void test_abm (void)			__attribute__((__target__("abm")));
 extern void test_aes (void)			__attribute__((__target__("aes")));
diff --git a/gcc/testsuite/gcc.target/i386/gcc-have-sync-compare-and-swap-4.c b/gcc/testsuite/gcc.target/i386/gcc-have-sync-compare-and-swap-4.c
index ab250ddfabe..3d948df690c 100644
--- a/gcc/testsuite/gcc.target/i386/gcc-have-sync-compare-and-swap-4.c
+++ b/gcc/testsuite/gcc.target/i386/gcc-have-sync-compare-and-swap-4.c
@@ -1,4 +1,4 @@
-/* { dg-do preprocess { target { ! { ia32 } } } } */
+/* { dg-do preprocess { target { ! ia32 } } } */
 /* { dg-options "-mcx16" } */
 
 #ifndef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1
diff --git a/gcc/testsuite/gcc.target/i386/local.c b/gcc/testsuite/gcc.target/i386/local.c
index 9a353d97a34..f4444951e12 100644
--- a/gcc/testsuite/gcc.target/i386/local.c
+++ b/gcc/testsuite/gcc.target/i386/local.c
@@ -1,7 +1,7 @@
 /* { dg-do compile } */
 /* { dg-options "-O2 -funit-at-a-time" } */
 /* { dg-final { scan-assembler "magic\[^\\n\]*eax" { target ia32 } } } */
-/* { dg-final { scan-assembler "magic\[^\\n\]*(edi|ecx)" { target { ! { ia32 } } } } } */
+/* { dg-final { scan-assembler "magic\[^\\n\]*(edi|ecx)" { target { ! ia32 } } } } */
 
 /* Verify that local calling convention is used.  */
 static void t(int) __attribute__ ((noinline));
diff --git a/gcc/testsuite/gcc.target/i386/max-stack-align.c b/gcc/testsuite/gcc.target/i386/max-stack-align.c
index 9f37a63e017..2dc947c9267 100644
--- a/gcc/testsuite/gcc.target/i386/max-stack-align.c
+++ b/gcc/testsuite/gcc.target/i386/max-stack-align.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-fomit-frame-pointer" } */
 
 void foo()
diff --git a/gcc/testsuite/gcc.target/i386/memcpy-strategy-1.c b/gcc/testsuite/gcc.target/i386/memcpy-strategy-1.c
index 91e25f76547..e93b95cd9d9 100644
--- a/gcc/testsuite/gcc.target/i386/memcpy-strategy-1.c
+++ b/gcc/testsuite/gcc.target/i386/memcpy-strategy-1.c
@@ -1,7 +1,7 @@
 /* { dg-do compile } */
 /* { 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" 8 { target { ! ia32 } } } } */
 /* { dg-final { scan-assembler-times "movdqa" 4 { target { ia32 } } } } */
 
 char a[2048];
diff --git a/gcc/testsuite/gcc.target/i386/memcpy-strategy-2.c b/gcc/testsuite/gcc.target/i386/memcpy-strategy-2.c
index 8afbfacb9ec..3b34ba0203a 100644
--- a/gcc/testsuite/gcc.target/i386/memcpy-strategy-2.c
+++ b/gcc/testsuite/gcc.target/i386/memcpy-strategy-2.c
@@ -1,7 +1,7 @@
 /* { dg-do compile } */
 /* { 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" 8 { target { ! ia32 } } } } */
 /* { dg-final { scan-assembler-times "movdqa" 4 { target { ia32 } } } } */
 
 char a[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 7eb948fc9da..090a31bacb6 100644
--- a/gcc/testsuite/gcc.target/i386/memcpy-vector_loop-1.c
+++ b/gcc/testsuite/gcc.target/i386/memcpy-vector_loop-1.c
@@ -1,7 +1,7 @@
 /* { dg-do compile } */
 /* { 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" 8 { target { ! ia32 } } } } */
 /* { dg-final { scan-assembler-times "movdqa" 4 { target { ia32 } } } } */
 
 char a[2048];
diff --git a/gcc/testsuite/gcc.target/i386/movbe-2.c b/gcc/testsuite/gcc.target/i386/movbe-2.c
index b322f774aa6..c198609b722 100644
--- a/gcc/testsuite/gcc.target/i386/movbe-2.c
+++ b/gcc/testsuite/gcc.target/i386/movbe-2.c
@@ -16,4 +16,4 @@ bar ()
 }
 
 /* { dg-final { scan-assembler-times "movbe\[ \t\]" 4 { target ia32 } } } */
-/* { dg-final { scan-assembler-times "movbe\[ \t\]" 2 { target { ! { ia32 } } } } } */
+/* { dg-final { scan-assembler-times "movbe\[ \t\]" 2 { target { ! ia32 } } } } */
diff --git a/gcc/testsuite/gcc.target/i386/pad-5b.c b/gcc/testsuite/gcc.target/i386/pad-5b.c
index 0f7d5ffb033..1eb82fe899f 100644
--- a/gcc/testsuite/gcc.target/i386/pad-5b.c
+++ b/gcc/testsuite/gcc.target/i386/pad-5b.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { 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* } } } } */
diff --git a/gcc/testsuite/gcc.target/i386/pad-6b.c b/gcc/testsuite/gcc.target/i386/pad-6b.c
index 3dea72db125..5de471f3619 100644
--- a/gcc/testsuite/gcc.target/i386/pad-6b.c
+++ b/gcc/testsuite/gcc.target/i386/pad-6b.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { 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* } } } } */
diff --git a/gcc/testsuite/gcc.target/i386/pad-9.c b/gcc/testsuite/gcc.target/i386/pad-9.c
index edada31e738..c94703ff309 100644
--- a/gcc/testsuite/gcc.target/i386/pad-9.c
+++ b/gcc/testsuite/gcc.target/i386/pad-9.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { 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* } } } } */
diff --git a/gcc/testsuite/gcc.target/i386/pr30961-1.c b/gcc/testsuite/gcc.target/i386/pr30961-1.c
index c7c5e53833c..ac97606a4b1 100644
--- a/gcc/testsuite/gcc.target/i386/pr30961-1.c
+++ b/gcc/testsuite/gcc.target/i386/pr30961-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2" } */
 
 double
diff --git a/gcc/testsuite/gcc.target/i386/pr32661-1.c b/gcc/testsuite/gcc.target/i386/pr32661-1.c
index 39cd8f90c83..452bcf9766b 100644
--- a/gcc/testsuite/gcc.target/i386/pr32661-1.c
+++ b/gcc/testsuite/gcc.target/i386/pr32661-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -fomit-frame-pointer" } */
 
 typedef long long __m128i __attribute__ ((__vector_size__ (16)));
diff --git a/gcc/testsuite/gcc.target/i386/pr32708-2.c b/gcc/testsuite/gcc.target/i386/pr32708-2.c
index f28caf91a13..b5b600b239f 100644
--- a/gcc/testsuite/gcc.target/i386/pr32708-2.c
+++ b/gcc/testsuite/gcc.target/i386/pr32708-2.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -mtune=k8" } */
 
 typedef long long __v2di __attribute__ ((__vector_size__ (16)));
diff --git a/gcc/testsuite/gcc.target/i386/pr32708-3.c b/gcc/testsuite/gcc.target/i386/pr32708-3.c
index 77e50b241b3..ad340f5d10c 100644
--- a/gcc/testsuite/gcc.target/i386/pr32708-3.c
+++ b/gcc/testsuite/gcc.target/i386/pr32708-3.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -mtune=core2" } */
 
 typedef long long __v2di __attribute__ ((__vector_size__ (16)));
diff --git a/gcc/testsuite/gcc.target/i386/pr34256.c b/gcc/testsuite/gcc.target/i386/pr34256.c
index 4ce7e30c5f6..992312a4f26 100644
--- a/gcc/testsuite/gcc.target/i386/pr34256.c
+++ b/gcc/testsuite/gcc.target/i386/pr34256.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -fomit-frame-pointer -march=core2" } */
 
 #include <mmintrin.h>
diff --git a/gcc/testsuite/gcc.target/i386/pr36246.c b/gcc/testsuite/gcc.target/i386/pr36246.c
index 51b8c349b5d..107348c2514 100644
--- a/gcc/testsuite/gcc.target/i386/pr36246.c
+++ b/gcc/testsuite/gcc.target/i386/pr36246.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -fomit-frame-pointer -mtune=generic" } */
 
 typedef long long __m128i __attribute__ ((__vector_size__ (16), __may_alias__));
diff --git a/gcc/testsuite/gcc.target/i386/pr36786.c b/gcc/testsuite/gcc.target/i386/pr36786.c
index 6b62e80e75f..89bc938beea 100644
--- a/gcc/testsuite/gcc.target/i386/pr36786.c
+++ b/gcc/testsuite/gcc.target/i386/pr36786.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 
 typedef int DItype __attribute__ ((mode (DI)));
 typedef unsigned int UDItype __attribute__ ((mode (DI)));
diff --git a/gcc/testsuite/gcc.target/i386/pr39082-1.c b/gcc/testsuite/gcc.target/i386/pr39082-1.c
index 36d566dc160..2af2264c3cc 100644
--- a/gcc/testsuite/gcc.target/i386/pr39082-1.c
+++ b/gcc/testsuite/gcc.target/i386/pr39082-1.c
@@ -1,5 +1,5 @@
 /* PR target/39082 */
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2" } */
 /* { dg-additional-options "-mabi=sysv" { target x86_64-*-mingw* } } */
 
diff --git a/gcc/testsuite/gcc.target/i386/pr44942.c b/gcc/testsuite/gcc.target/i386/pr44942.c
index d8164845c0d..d6af19703c0 100644
--- a/gcc/testsuite/gcc.target/i386/pr44942.c
+++ b/gcc/testsuite/gcc.target/i386/pr44942.c
@@ -1,5 +1,5 @@
 /* PR target/44942 */
-/* { dg-do run { target { ! { ia32 } } } } */
+/* { dg-do run { target { ! ia32 } } } */
 
 #include <stdarg.h>
 #include <emmintrin.h>
diff --git a/gcc/testsuite/gcc.target/i386/pr45336-2.c b/gcc/testsuite/gcc.target/i386/pr45336-2.c
index 3e51591fc45..5309343409f 100644
--- a/gcc/testsuite/gcc.target/i386/pr45336-2.c
+++ b/gcc/testsuite/gcc.target/i386/pr45336-2.c
@@ -1,5 +1,5 @@
 /* PR target/45336 */
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -msse4 -mtune=generic" } */
 /* { dg-final { scan-assembler-not "movsbl" } } */
 /* { dg-final { scan-assembler-not "movswl" } } */
diff --git a/gcc/testsuite/gcc.target/i386/pr45336-4.c b/gcc/testsuite/gcc.target/i386/pr45336-4.c
index 8b66a6a1da5..0271aebf277 100644
--- a/gcc/testsuite/gcc.target/i386/pr45336-4.c
+++ b/gcc/testsuite/gcc.target/i386/pr45336-4.c
@@ -1,5 +1,5 @@
 /* PR target/45336 */
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -msse4 -mtune=generic" } */
 /* { dg-final { scan-assembler "movsbq" } } */
 /* { dg-final { scan-assembler "movswq" } } */
diff --git a/gcc/testsuite/gcc.target/i386/pr45685.c b/gcc/testsuite/gcc.target/i386/pr45685.c
index 57c6501e2d9..4edce3e439a 100644
--- a/gcc/testsuite/gcc.target/i386/pr45685.c
+++ b/gcc/testsuite/gcc.target/i386/pr45685.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O3" } */
 
 typedef unsigned long long int uint64_t;
diff --git a/gcc/testsuite/gcc.target/i386/pr45852.c b/gcc/testsuite/gcc.target/i386/pr45852.c
index 1ecd0ec97d4..b78671a6f9e 100644
--- a/gcc/testsuite/gcc.target/i386/pr45852.c
+++ b/gcc/testsuite/gcc.target/i386/pr45852.c
@@ -1,6 +1,6 @@
 /* PR middle-end/45852 */
 /* { dg-options "-O2 -mcmodel=small" } */
-/* { dg-do compile { target { *-*-linux* && { ! { ia32 } } } } } */
+/* { dg-do compile { target { *-*-linux* && { ! ia32 } } } } */
 /* { dg-require-visibility "" } */
 
 struct S { int s; };
diff --git a/gcc/testsuite/gcc.target/i386/pr48037-1.c b/gcc/testsuite/gcc.target/i386/pr48037-1.c
index 1b64a7d19b4..d959bd2421b 100644
--- a/gcc/testsuite/gcc.target/i386/pr48037-1.c
+++ b/gcc/testsuite/gcc.target/i386/pr48037-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O -fno-math-errno" } */
 
 typedef double __m128d __attribute__((vector_size(16)));
diff --git a/gcc/testsuite/gcc.target/i386/pr51393.c b/gcc/testsuite/gcc.target/i386/pr51393.c
index 51175c87a1e..66ca9a9cfe9 100644
--- a/gcc/testsuite/gcc.target/i386/pr51393.c
+++ b/gcc/testsuite/gcc.target/i386/pr51393.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { ! { ia32 } } } } */
+/* { dg-do run { target { ! ia32 } } } */
 /* { dg-require-effective-target avx } */
 /* { dg-options "-O -mavx" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/pr51987.c b/gcc/testsuite/gcc.target/i386/pr51987.c
index 6ac2e6395d8..d58408065c0 100644
--- a/gcc/testsuite/gcc.target/i386/pr51987.c
+++ b/gcc/testsuite/gcc.target/i386/pr51987.c
@@ -1,5 +1,5 @@
 /* PR tree-optimization/51987 */
-/* { dg-do run { target { ! { ia32 } } } } */
+/* { dg-do run { target { ! ia32 } } } */
 /* { dg-options "-O3" } */
 
 extern void abort (void);
diff --git a/gcc/testsuite/gcc.target/i386/pr52146.c b/gcc/testsuite/gcc.target/i386/pr52146.c
index 4eb91c06dd6..dcc28d007fe 100644
--- a/gcc/testsuite/gcc.target/i386/pr52146.c
+++ b/gcc/testsuite/gcc.target/i386/pr52146.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -mx32" } */
 
 void
diff --git a/gcc/testsuite/gcc.target/i386/pr52698.c b/gcc/testsuite/gcc.target/i386/pr52698.c
index d84685cb3b7..d5cfa741112 100644
--- a/gcc/testsuite/gcc.target/i386/pr52698.c
+++ b/gcc/testsuite/gcc.target/i386/pr52698.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -mx32 -maddress-mode=long" } */
 
 extern void abort (void);
diff --git a/gcc/testsuite/gcc.target/i386/pr52857-1.c b/gcc/testsuite/gcc.target/i386/pr52857-1.c
index 16fd78f96ff..5c23339b66a 100644
--- a/gcc/testsuite/gcc.target/i386/pr52857-1.c
+++ b/gcc/testsuite/gcc.target/i386/pr52857-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-g -O -mx32 -maddress-mode=long" } */
 
 extern void get_BID128 (int *);
diff --git a/gcc/testsuite/gcc.target/i386/pr52857-2.c b/gcc/testsuite/gcc.target/i386/pr52857-2.c
index 879240a75ef..99acf84347d 100644
--- a/gcc/testsuite/gcc.target/i386/pr52857-2.c
+++ b/gcc/testsuite/gcc.target/i386/pr52857-2.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-g -O -mx32 -maddress-mode=long" } */
 
 void uw_init_context_1 (void *);
diff --git a/gcc/testsuite/gcc.target/i386/pr53249.c b/gcc/testsuite/gcc.target/i386/pr53249.c
index c41d3e9eded..7386fb534b5 100644
--- a/gcc/testsuite/gcc.target/i386/pr53249.c
+++ b/gcc/testsuite/gcc.target/i386/pr53249.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-require-effective-target maybe_x32 } */
 /* { dg-options "-O2 -mx32 -ftls-model=initial-exec -maddress-mode=short" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/pr53425-1.c b/gcc/testsuite/gcc.target/i386/pr53425-1.c
index 00143f32ab3..2e89ff7d81d 100644
--- a/gcc/testsuite/gcc.target/i386/pr53425-1.c
+++ b/gcc/testsuite/gcc.target/i386/pr53425-1.c
@@ -1,5 +1,5 @@
 /* PR target/53425 */
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -mno-sse" } */
 /* { dg-skip-if "no SSE vector" { x86_64-*-mingw* } } */
 
diff --git a/gcc/testsuite/gcc.target/i386/pr53425-2.c b/gcc/testsuite/gcc.target/i386/pr53425-2.c
index 97523f35bb5..61f6283dbe9 100644
--- a/gcc/testsuite/gcc.target/i386/pr53425-2.c
+++ b/gcc/testsuite/gcc.target/i386/pr53425-2.c
@@ -1,5 +1,5 @@
 /* PR target/53425 */
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -mno-sse" } */
 /* { dg-skip-if "no SSE vector" { x86_64-*-mingw* } } */
 
diff --git a/gcc/testsuite/gcc.target/i386/pr53698.c b/gcc/testsuite/gcc.target/i386/pr53698.c
index 3acefba00be..e36200af852 100644
--- a/gcc/testsuite/gcc.target/i386/pr53698.c
+++ b/gcc/testsuite/gcc.target/i386/pr53698.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O -mx32 -maddress-mode=long -fno-tree-dominator-opts" } */
 
 extern char foo[];
diff --git a/gcc/testsuite/gcc.target/i386/pr54157.c b/gcc/testsuite/gcc.target/i386/pr54157.c
index b5c4528b80f..26318677d59 100644
--- a/gcc/testsuite/gcc.target/i386/pr54157.c
+++ b/gcc/testsuite/gcc.target/i386/pr54157.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -mx32 -maddress-mode=long -ftree-vectorize" } */
 
 struct s2{
diff --git a/gcc/testsuite/gcc.target/i386/pr54445-2.c b/gcc/testsuite/gcc.target/i386/pr54445-2.c
index f0ca9dc298e..b418fc4f4e8 100644
--- a/gcc/testsuite/gcc.target/i386/pr54445-2.c
+++ b/gcc/testsuite/gcc.target/i386/pr54445-2.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { *-*-linux* && { ! { ia32 } } } } } */
+/* { dg-do compile { target { *-*-linux* && { ! ia32 } } } } */
 /* { dg-options "-O2 -fno-pic" } */
 
 __thread unsigned char tls_array[64];
diff --git a/gcc/testsuite/gcc.target/i386/pr54457.c b/gcc/testsuite/gcc.target/i386/pr54457.c
index 9abfbd32025..1430f1dbc5b 100644
--- a/gcc/testsuite/gcc.target/i386/pr54457.c
+++ b/gcc/testsuite/gcc.target/i386/pr54457.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-require-effective-target maybe_x32 } */
 /* { dg-options "-O2 -mx32 -maddress-mode=short" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/pr55049-1.c b/gcc/testsuite/gcc.target/i386/pr55049-1.c
index cb7fb9b3fd3..387bbeb81fb 100644
--- a/gcc/testsuite/gcc.target/i386/pr55049-1.c
+++ b/gcc/testsuite/gcc.target/i386/pr55049-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-require-effective-target fpic } */
 /* { dg-options "-O2 -fPIC -mx32" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/pr55093.c b/gcc/testsuite/gcc.target/i386/pr55093.c
index 3d32a5799d7..bfe2c503d83 100644
--- a/gcc/testsuite/gcc.target/i386/pr55093.c
+++ b/gcc/testsuite/gcc.target/i386/pr55093.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -mx32 -maddress-mode=long" } */
 /* { dg-skip-if "different ABI" { x86_64-*-mingw* } } */
 
diff --git a/gcc/testsuite/gcc.target/i386/pr55116-1.c b/gcc/testsuite/gcc.target/i386/pr55116-1.c
index de272445aa2..a2e2acd858a 100644
--- a/gcc/testsuite/gcc.target/i386/pr55116-1.c
+++ b/gcc/testsuite/gcc.target/i386/pr55116-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -mx32 -maddress-mode=long" } */
 
 int glob_int_arr[100];
diff --git a/gcc/testsuite/gcc.target/i386/pr55116-2.c b/gcc/testsuite/gcc.target/i386/pr55116-2.c
index 7ef8eade06b..59bdebe690d 100644
--- a/gcc/testsuite/gcc.target/i386/pr55116-2.c
+++ b/gcc/testsuite/gcc.target/i386/pr55116-2.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -mx32 -maddress-mode=long" } */
 
 typedef struct rtx_def *rtx;
diff --git a/gcc/testsuite/gcc.target/i386/pr55142-1.c b/gcc/testsuite/gcc.target/i386/pr55142-1.c
index e6b5f126ccc..3974f25179e 100644
--- a/gcc/testsuite/gcc.target/i386/pr55142-1.c
+++ b/gcc/testsuite/gcc.target/i386/pr55142-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-require-effective-target maybe_x32 } */
 /* { dg-require-effective-target fpic } */
 /* { dg-options "-O2 -mx32 -maddress-mode=long -fpic" } */
diff --git a/gcc/testsuite/gcc.target/i386/pr55142-2.c b/gcc/testsuite/gcc.target/i386/pr55142-2.c
index 34f4687193a..ef642bb7782 100644
--- a/gcc/testsuite/gcc.target/i386/pr55142-2.c
+++ b/gcc/testsuite/gcc.target/i386/pr55142-2.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-require-effective-target maybe_x32 } */
 /* { dg-require-effective-target fpic } */
 /* { dg-options "-O3 -mx32 -maddress-mode=long -fpic" } */
diff --git a/gcc/testsuite/gcc.target/i386/pr55151.c b/gcc/testsuite/gcc.target/i386/pr55151.c
index 2bf68df4a19..62da8cb7781 100644
--- a/gcc/testsuite/gcc.target/i386/pr55151.c
+++ b/gcc/testsuite/gcc.target/i386/pr55151.c
@@ -1,5 +1,5 @@
 /* PR rtl-optimization/55151 */
-/* { dg-do compile  { target { ! { ia32 } } } } */
+/* { dg-do compile  { target { ! ia32 } } } */
 /* { dg-options "-fPIC" } */
 
 int a, b, c, d, e, f, g, h, i, j, k, l;
diff --git a/gcc/testsuite/gcc.target/i386/pr55247-2.c b/gcc/testsuite/gcc.target/i386/pr55247-2.c
index d91b504e66f..6b5b36d5241 100644
--- a/gcc/testsuite/gcc.target/i386/pr55247-2.c
+++ b/gcc/testsuite/gcc.target/i386/pr55247-2.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-require-effective-target maybe_x32 } */
 /* { dg-options "-O2 -mx32 -mtune=generic -maddress-mode=long" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/pr55247.c b/gcc/testsuite/gcc.target/i386/pr55247.c
index 6259ea4f7d0..23366d0909d 100644
--- a/gcc/testsuite/gcc.target/i386/pr55247.c
+++ b/gcc/testsuite/gcc.target/i386/pr55247.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-require-effective-target maybe_x32 } */
 /* { dg-options "-O2 -mno-sse -mno-mmx -mx32 -maddress-mode=long" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/pr55597.c b/gcc/testsuite/gcc.target/i386/pr55597.c
index 0ed7a3a2eac..617c3e5c5ed 100644
--- a/gcc/testsuite/gcc.target/i386/pr55597.c
+++ b/gcc/testsuite/gcc.target/i386/pr55597.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-require-effective-target fpic } */
 /* { dg-options "-O2 -fPIC -mx32 -maddress-mode=long" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/pr55981.c b/gcc/testsuite/gcc.target/i386/pr55981.c
index 36498d63cfe..d6ca50bd848 100644
--- a/gcc/testsuite/gcc.target/i386/pr55981.c
+++ b/gcc/testsuite/gcc.target/i386/pr55981.c
@@ -1,4 +1,4 @@
-/* { dg-do compile  { target { ! { ia32 } } } } */
+/* { dg-do compile  { target { ! ia32 } } } */
 /* { dg-options "-O2" } */
 
 volatile int a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p;
diff --git a/gcc/testsuite/gcc.target/i386/pr56028.c b/gcc/testsuite/gcc.target/i386/pr56028.c
index 18ae25398b8..785467cdebd 100644
--- a/gcc/testsuite/gcc.target/i386/pr56028.c
+++ b/gcc/testsuite/gcc.target/i386/pr56028.c
@@ -1,4 +1,4 @@
-/* { dg-do compile  { target { ! { ia32 } } } } */
+/* { dg-do compile  { target { ! ia32 } } } */
 /* { dg-options "-O2" } */
 
 volatile int a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p;
diff --git a/gcc/testsuite/gcc.target/i386/pr58690.c b/gcc/testsuite/gcc.target/i386/pr58690.c
index 87a87cc9c90..18b00108bd2 100644
--- a/gcc/testsuite/gcc.target/i386/pr58690.c
+++ b/gcc/testsuite/gcc.target/i386/pr58690.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-require-effective-target maybe_x32 } */
 /* { dg-options "-O2 -mx32 -maddress-mode=short" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/pr59034-1.c b/gcc/testsuite/gcc.target/i386/pr59034-1.c
index 1f4c4e04a23..a4f04d10b9a 100644
--- a/gcc/testsuite/gcc.target/i386/pr59034-1.c
+++ b/gcc/testsuite/gcc.target/i386/pr59034-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-require-effective-target maybe_x32 } */
 /* { dg-options "-O -mx32 -mtune=corei7 -maddress-mode=short" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/pr59034-2.c b/gcc/testsuite/gcc.target/i386/pr59034-2.c
index 14e594ba608..9f6a9dc0e3e 100644
--- a/gcc/testsuite/gcc.target/i386/pr59034-2.c
+++ b/gcc/testsuite/gcc.target/i386/pr59034-2.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-require-effective-target maybe_x32 } */
 /* { dg-options "-O -mx32 -mtune=corei7 -maddress-mode=long" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/pr64409.c b/gcc/testsuite/gcc.target/i386/pr64409.c
index 6a64b5961de..917472653f4 100644
--- a/gcc/testsuite/gcc.target/i386/pr64409.c
+++ b/gcc/testsuite/gcc.target/i386/pr64409.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-require-effective-target maybe_x32 } */
 /* { dg-options "-O0 -mx32" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/pr66232-5.c b/gcc/testsuite/gcc.target/i386/pr66232-5.c
index c01671767a8..87f93802694 100644
--- a/gcc/testsuite/gcc.target/i386/pr66232-5.c
+++ b/gcc/testsuite/gcc.target/i386/pr66232-5.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-require-effective-target maybe_x32 } */
 /* { dg-options "-O2 -fpic -mx32" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/pr66470.c b/gcc/testsuite/gcc.target/i386/pr66470.c
index 73158d13438..5c068f3d71b 100644
--- a/gcc/testsuite/gcc.target/i386/pr66470.c
+++ b/gcc/testsuite/gcc.target/i386/pr66470.c
@@ -1,5 +1,5 @@
 /* PR target/66470 */
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -mx32 -maddress-mode=long" } */
 /* { dg-require-effective-target tls } */
 
diff --git a/gcc/testsuite/gcc.target/i386/pr66978.c b/gcc/testsuite/gcc.target/i386/pr66978.c
index 7e4a631261a..fe8d9d4860d 100644
--- a/gcc/testsuite/gcc.target/i386/pr66978.c
+++ b/gcc/testsuite/gcc.target/i386/pr66978.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-require-effective-target maybe_x32 } */
 /* { dg-options "-O2 -mx32 -maddress-mode=short" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/rdfsbase-1.c b/gcc/testsuite/gcc.target/i386/rdfsbase-1.c
index 2ed33cd4758..fd319b5d054 100644
--- a/gcc/testsuite/gcc.target/i386/rdfsbase-1.c
+++ b/gcc/testsuite/gcc.target/i386/rdfsbase-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -mfsgsbase" } */
 /* { dg-final { scan-assembler "rdfsbase\[ \t]+(%|)eax" } } */
 
diff --git a/gcc/testsuite/gcc.target/i386/rdfsbase-2.c b/gcc/testsuite/gcc.target/i386/rdfsbase-2.c
index f319cea57f4..2698a5170f4 100644
--- a/gcc/testsuite/gcc.target/i386/rdfsbase-2.c
+++ b/gcc/testsuite/gcc.target/i386/rdfsbase-2.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -mfsgsbase" } */
 /* { dg-final { scan-assembler "rdfsbase\[ \t]+(%|)rax" } } */
 
diff --git a/gcc/testsuite/gcc.target/i386/rdgsbase-1.c b/gcc/testsuite/gcc.target/i386/rdgsbase-1.c
index cb2a3d5811c..86029e06ac1 100644
--- a/gcc/testsuite/gcc.target/i386/rdgsbase-1.c
+++ b/gcc/testsuite/gcc.target/i386/rdgsbase-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -mfsgsbase" } */
 /* { dg-final { scan-assembler "rdgsbase\[ \t]+(%|)eax" } } */
 
diff --git a/gcc/testsuite/gcc.target/i386/rdgsbase-2.c b/gcc/testsuite/gcc.target/i386/rdgsbase-2.c
index d514cd96127..5c5a45b2a22 100644
--- a/gcc/testsuite/gcc.target/i386/rdgsbase-2.c
+++ b/gcc/testsuite/gcc.target/i386/rdgsbase-2.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -mfsgsbase" } */
 /* { dg-final { scan-assembler "rdgsbase\[ \t]+(%|)rax" } } */
 
diff --git a/gcc/testsuite/gcc.target/i386/rdrand-3.c b/gcc/testsuite/gcc.target/i386/rdrand-3.c
index de0e730ad1d..a35fafe02cf 100644
--- a/gcc/testsuite/gcc.target/i386/rdrand-3.c
+++ b/gcc/testsuite/gcc.target/i386/rdrand-3.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -mrdrnd -dp" } */
 /* { dg-final { scan-assembler-times "rdranddi_1" 1 } } */
 /* { dg-final { scan-assembler-times "\\*movsicc_noc" 1 } } */
diff --git a/gcc/testsuite/gcc.target/i386/rotate-2.c b/gcc/testsuite/gcc.target/i386/rotate-2.c
index 71fd7edbd61..be4dd1dc28d 100644
--- a/gcc/testsuite/gcc.target/i386/rotate-2.c
+++ b/gcc/testsuite/gcc.target/i386/rotate-2.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2" } */
 
 typedef unsigned int UTItype __attribute__ ((mode (TI)));
diff --git a/gcc/testsuite/gcc.target/i386/sse-cvtsi2ss-2.c b/gcc/testsuite/gcc.target/i386/sse-cvtsi2ss-2.c
index 76ce912a45b..d05649e3913 100644
--- a/gcc/testsuite/gcc.target/i386/sse-cvtsi2ss-2.c
+++ b/gcc/testsuite/gcc.target/i386/sse-cvtsi2ss-2.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { ! { ia32 } } } } */
+/* { dg-do run { target { ! ia32 } } } */
 /* { dg-require-effective-target sse } */
 /* { dg-options "-O2 -msse" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse-cvtss2si-2.c b/gcc/testsuite/gcc.target/i386/sse-cvtss2si-2.c
index 909c3880ed4..e1cb49c3b6d 100644
--- a/gcc/testsuite/gcc.target/i386/sse-cvtss2si-2.c
+++ b/gcc/testsuite/gcc.target/i386/sse-cvtss2si-2.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { ! { ia32 } } } } */
+/* { dg-do run { target { ! ia32 } } } */
 /* { dg-require-effective-target sse } */
 /* { dg-options "-O2 -msse" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse-cvttss2si-2.c b/gcc/testsuite/gcc.target/i386/sse-cvttss2si-2.c
index cbfdddd405b..0fcda474c79 100644
--- a/gcc/testsuite/gcc.target/i386/sse-cvttss2si-2.c
+++ b/gcc/testsuite/gcc.target/i386/sse-cvttss2si-2.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { ! { ia32 } } } } */
+/* { dg-do run { target { ! ia32 } } } */
 /* { dg-require-effective-target sse } */
 /* { dg-options "-O2 -msse" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse2-cvtsd2si-2.c b/gcc/testsuite/gcc.target/i386/sse2-cvtsd2si-2.c
index a79a2583673..df1008eeb38 100644
--- a/gcc/testsuite/gcc.target/i386/sse2-cvtsd2si-2.c
+++ b/gcc/testsuite/gcc.target/i386/sse2-cvtsd2si-2.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { ! { ia32 } } } } */
+/* { dg-do run { target { ! ia32 } } } */
 /* { dg-require-effective-target sse2 } */
 /* { dg-options "-O2 -msse2" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse2-cvtsi2sd-2.c b/gcc/testsuite/gcc.target/i386/sse2-cvtsi2sd-2.c
index ee047baa9c2..af6ff1e65ad 100644
--- a/gcc/testsuite/gcc.target/i386/sse2-cvtsi2sd-2.c
+++ b/gcc/testsuite/gcc.target/i386/sse2-cvtsi2sd-2.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { ! { ia32 } } } } */
+/* { dg-do run { target { ! ia32 } } } */
 /* { dg-require-effective-target sse2 } */
 /* { dg-options "-O2 -msse2" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse2-cvttsd2si-2.c b/gcc/testsuite/gcc.target/i386/sse2-cvttsd2si-2.c
index cd913a19f80..ff46eac2042 100644
--- a/gcc/testsuite/gcc.target/i386/sse2-cvttsd2si-2.c
+++ b/gcc/testsuite/gcc.target/i386/sse2-cvttsd2si-2.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { ! { ia32 } } } } */
+/* { dg-do run { target { ! ia32 } } } */
 /* { dg-require-effective-target sse2 } */
 /* { dg-options "-O2 -msse2" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse2-init-v2di-2.c b/gcc/testsuite/gcc.target/i386/sse2-init-v2di-2.c
index b347a4ab27b..97d0441a386 100644
--- a/gcc/testsuite/gcc.target/i386/sse2-init-v2di-2.c
+++ b/gcc/testsuite/gcc.target/i386/sse2-init-v2di-2.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-skip-if "" { *-*-* } { "-march=*" } { "-march=core2" } } */
 /* { dg-options "-O2 -msse4 -march=core2 -dp" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse2-movq-2.c b/gcc/testsuite/gcc.target/i386/sse2-movq-2.c
index 0260f471b81..3a6aed30689 100644
--- a/gcc/testsuite/gcc.target/i386/sse2-movq-2.c
+++ b/gcc/testsuite/gcc.target/i386/sse2-movq-2.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { ! { ia32 } } } } */
+/* { dg-do run { target { ! ia32 } } } */
 /* { dg-require-effective-target sse2 } */
 /* { dg-options "-O2 -msse2" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse2-movq-3.c b/gcc/testsuite/gcc.target/i386/sse2-movq-3.c
index 0a17e3e709c..a15bda91b06 100644
--- a/gcc/testsuite/gcc.target/i386/sse2-movq-3.c
+++ b/gcc/testsuite/gcc.target/i386/sse2-movq-3.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { ! { ia32 } } } } */
+/* { dg-do run { target { ! ia32 } } } */
 /* { dg-require-effective-target sse2 } */
 /* { dg-options "-O2 -msse2" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-pextrq.c b/gcc/testsuite/gcc.target/i386/sse4_1-pextrq.c
index 112dd37fd92..2c075320bee 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-pextrq.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-pextrq.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { ! { ia32 } } } } */
+/* { dg-do run { target { ! ia32 } } } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_1-pinsrq.c b/gcc/testsuite/gcc.target/i386/sse4_1-pinsrq.c
index 1ed0987bd7d..2977f0c9b51 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_1-pinsrq.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_1-pinsrq.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { ! { ia32 } } } } */
+/* { dg-do run { target { ! ia32 } } } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.1" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_2-crc32q.c b/gcc/testsuite/gcc.target/i386/sse4_2-crc32q.c
index f1f75d916f3..2c3fd926c32 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_2-crc32q.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_2-crc32q.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { ! { ia32 } } } } */
+/* { dg-do run { target { ! ia32 } } } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.2" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/sse4_2-popcntq.c b/gcc/testsuite/gcc.target/i386/sse4_2-popcntq.c
index 47cdf35629c..2b5ee5221bc 100644
--- a/gcc/testsuite/gcc.target/i386/sse4_2-popcntq.c
+++ b/gcc/testsuite/gcc.target/i386/sse4_2-popcntq.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target { ! { ia32 } } } } */
+/* { dg-do run { target { ! ia32 } } } */
 /* { dg-require-effective-target sse4 } */
 /* { dg-options "-O2 -msse4.2" } */
 
diff --git a/gcc/testsuite/gcc.target/i386/ssp-strong-reg.c b/gcc/testsuite/gcc.target/i386/ssp-strong-reg.c
index 9fe56641b9e..db39c1f0a70 100644
--- a/gcc/testsuite/gcc.target/i386/ssp-strong-reg.c
+++ b/gcc/testsuite/gcc.target/i386/ssp-strong-reg.c
@@ -1,7 +1,7 @@
 /* Test that structs returned in registers do not lead to
    instrumentation with -fstack-protector-strong.  */
 
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -fstack-protector-strong" } */
 
 struct S {
diff --git a/gcc/testsuite/gcc.target/i386/tbm-2.c b/gcc/testsuite/gcc.target/i386/tbm-2.c
index fa3870a5e33..47a933ad655 100644
--- a/gcc/testsuite/gcc.target/i386/tbm-2.c
+++ b/gcc/testsuite/gcc.target/i386/tbm-2.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -mtbm" } */
 /* { dg-final { scan-assembler "bextr\[^\\n]*(%|)rax" } } */
 /* { dg-final { scan-assembler "blcfill\[^\\n]*(%|)rax" } } */
diff --git a/gcc/testsuite/gcc.target/i386/testround-2.c b/gcc/testsuite/gcc.target/i386/testround-2.c
index 7236bfb9b22..29227968890 100644
--- a/gcc/testsuite/gcc.target/i386/testround-2.c
+++ b/gcc/testsuite/gcc.target/i386/testround-2.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O0 -mavx512f" } */
 
 #include <x86intrin.h>
diff --git a/gcc/testsuite/gcc.target/i386/udivmod-7.c b/gcc/testsuite/gcc.target/i386/udivmod-7.c
index 4a68a75f23c..26838e7568f 100644
--- a/gcc/testsuite/gcc.target/i386/udivmod-7.c
+++ b/gcc/testsuite/gcc.target/i386/udivmod-7.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -m8bit-idiv" } */
 
 extern void abort (void);
diff --git a/gcc/testsuite/gcc.target/i386/udivmod-8.c b/gcc/testsuite/gcc.target/i386/udivmod-8.c
index bef496490a4..4ad831d452a 100644
--- a/gcc/testsuite/gcc.target/i386/udivmod-8.c
+++ b/gcc/testsuite/gcc.target/i386/udivmod-8.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -m8bit-idiv" } */
 
 extern void foo (unsigned long long, unsigned long long,
diff --git a/gcc/testsuite/gcc.target/i386/vararg-1.c b/gcc/testsuite/gcc.target/i386/vararg-1.c
index a2db4b9f776..3eda1e93e25 100644
--- a/gcc/testsuite/gcc.target/i386/vararg-1.c
+++ b/gcc/testsuite/gcc.target/i386/vararg-1.c
@@ -1,6 +1,6 @@
 /* PR middle-end/36858 */
 /* { dg-do run } */
-/* { dg-options "-w" { target { ! { ia32 } } } } */
+/* { dg-options "-w" { target { ! ia32 } } } */
 /* { dg-options "-w" { target { llp64 } } } */
 /* { dg-options "-w -msse2 -mpreferred-stack-boundary=2" { target { ia32 } } } */
 /* { dg-require-effective-target sse2 } */
diff --git a/gcc/testsuite/gcc.target/i386/vararg-2.c b/gcc/testsuite/gcc.target/i386/vararg-2.c
index bd5ad54463d..65599a57561 100644
--- a/gcc/testsuite/gcc.target/i386/vararg-2.c
+++ b/gcc/testsuite/gcc.target/i386/vararg-2.c
@@ -1,6 +1,6 @@
 /* PR middle-end/36859 */
 /* { dg-do run } */
-/* { dg-options "-w" { target { ! { ia32 } } } } */
+/* { dg-options "-w" { target { ! ia32 } } } */
 /* { dg-options "-w" { target { llp64 } } } */
 /* { dg-options "-w -msse2 -mpreferred-stack-boundary=2" { target { ia32 } } } */
 /* { dg-require-effective-target sse2 } */
diff --git a/gcc/testsuite/gcc.target/i386/vectorize5.c b/gcc/testsuite/gcc.target/i386/vectorize5.c
index 2065e5d157b..29f2b174f15 100644
--- a/gcc/testsuite/gcc.target/i386/vectorize5.c
+++ b/gcc/testsuite/gcc.target/i386/vectorize5.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -ftree-vectorize -mveclibabi=acml -ffast-math -mtune=generic" } */
 
 double x[256];
diff --git a/gcc/testsuite/gcc.target/i386/warn-vect-op-1.c b/gcc/testsuite/gcc.target/i386/warn-vect-op-1.c
index 6fecf926208..6cda1534311 100644
--- a/gcc/testsuite/gcc.target/i386/warn-vect-op-1.c
+++ b/gcc/testsuite/gcc.target/i386/warn-vect-op-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } }  */
+/* { dg-do compile { target { ! ia32 } } }  */
 /* { dg-options "-mno-sse -Wvector-operation-performance" }  */
 #define vector(elcount, type)  \
 __attribute__((vector_size((elcount)*sizeof(type)))) type
diff --git a/gcc/testsuite/gcc.target/i386/warn-vect-op-2.c b/gcc/testsuite/gcc.target/i386/warn-vect-op-2.c
index 6e631192445..15eb961360c 100644
--- a/gcc/testsuite/gcc.target/i386/warn-vect-op-2.c
+++ b/gcc/testsuite/gcc.target/i386/warn-vect-op-2.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } }  */
+/* { dg-do compile { target { ! ia32 } } }  */
 /* { dg-options "-mno-sse -Wvector-operation-performance" }  */
 #define vector(elcount, type)  \
 __attribute__((vector_size((elcount)*sizeof(type)))) type
diff --git a/gcc/testsuite/gcc.target/i386/warn-vect-op-3.c b/gcc/testsuite/gcc.target/i386/warn-vect-op-3.c
index bdbd8b520b7..5468b5b63f0 100644
--- a/gcc/testsuite/gcc.target/i386/warn-vect-op-3.c
+++ b/gcc/testsuite/gcc.target/i386/warn-vect-op-3.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } }  */
+/* { dg-do compile { target { ! ia32 } } }  */
 /* { dg-options "-mno-sse -Wvector-operation-performance" }  */
 #define vector(elcount, type)  \
 __attribute__((vector_size((elcount)*sizeof(type)))) type
diff --git a/gcc/testsuite/gcc.target/i386/wrfsbase-1.c b/gcc/testsuite/gcc.target/i386/wrfsbase-1.c
index dc1503817b8..a691107a5fa 100644
--- a/gcc/testsuite/gcc.target/i386/wrfsbase-1.c
+++ b/gcc/testsuite/gcc.target/i386/wrfsbase-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -mfsgsbase" } */
 /* { dg-final { scan-assembler "wrfsbase\[ \t]+(%|)(edi|ecx)" } } */
 
diff --git a/gcc/testsuite/gcc.target/i386/wrfsbase-2.c b/gcc/testsuite/gcc.target/i386/wrfsbase-2.c
index fc4a7b5fff7..44f98e25521 100644
--- a/gcc/testsuite/gcc.target/i386/wrfsbase-2.c
+++ b/gcc/testsuite/gcc.target/i386/wrfsbase-2.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -mfsgsbase" } */
 /* { dg-final { scan-assembler "wrfsbase\[ \t]+(%|)(rdi|rcx)" } } */
 
diff --git a/gcc/testsuite/gcc.target/i386/wrgsbase-1.c b/gcc/testsuite/gcc.target/i386/wrgsbase-1.c
index 5474288be0c..fba8c7d20ec 100644
--- a/gcc/testsuite/gcc.target/i386/wrgsbase-1.c
+++ b/gcc/testsuite/gcc.target/i386/wrgsbase-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -mfsgsbase" } */
 /* { dg-final { scan-assembler "wrgsbase\[ \t]+(%|)(edi|ecx)" } } */
 
diff --git a/gcc/testsuite/gcc.target/i386/wrgsbase-2.c b/gcc/testsuite/gcc.target/i386/wrgsbase-2.c
index cf947508423..8df1eb84b52 100644
--- a/gcc/testsuite/gcc.target/i386/wrgsbase-2.c
+++ b/gcc/testsuite/gcc.target/i386/wrgsbase-2.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -mfsgsbase" } */
 /* { dg-final { scan-assembler "wrgsbase\[ \t]+(%|)(rdi|rcx)" } } */
 
diff --git a/gcc/testsuite/gcc.target/i386/xop-pcmov.c b/gcc/testsuite/gcc.target/i386/xop-pcmov.c
index 75ed433cf00..552e4442840 100644
--- a/gcc/testsuite/gcc.target/i386/xop-pcmov.c
+++ b/gcc/testsuite/gcc.target/i386/xop-pcmov.c
@@ -1,7 +1,7 @@
 /* Test that the compiler properly optimizes conditional floating point moves
    into the pcmov instruction on XOP systems.  */
 
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -mxop" } */
 
 extern void exit (int);
diff --git a/gcc/testsuite/gcc.target/i386/xop-pcmov2.c b/gcc/testsuite/gcc.target/i386/xop-pcmov2.c
index 6b6bd216915..a5b01f9971f 100644
--- a/gcc/testsuite/gcc.target/i386/xop-pcmov2.c
+++ b/gcc/testsuite/gcc.target/i386/xop-pcmov2.c
@@ -1,7 +1,7 @@
 /* Test that the compiler properly optimizes conditional floating point moves
    into the pcmov instruction on XOP systems.  */
 
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -mxop" } */
 
 extern void exit (int);
diff --git a/gcc/testsuite/gcc.target/i386/xop-rotate1-vector.c b/gcc/testsuite/gcc.target/i386/xop-rotate1-vector.c
index a6d88fb4fb4..a0b41681b41 100644
--- a/gcc/testsuite/gcc.target/i386/xop-rotate1-vector.c
+++ b/gcc/testsuite/gcc.target/i386/xop-rotate1-vector.c
@@ -1,7 +1,7 @@
 /* Test that the compiler properly optimizes vector rotate instructions vector
    into prot on XOP systems.  */
 
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -mxop -mno-avx2 -ftree-vectorize" } */
 
 extern void exit (int);
diff --git a/gcc/testsuite/gcc.target/i386/xop-rotate2-vector.c b/gcc/testsuite/gcc.target/i386/xop-rotate2-vector.c
index 02d1c4d0881..f20e5416cba 100644
--- a/gcc/testsuite/gcc.target/i386/xop-rotate2-vector.c
+++ b/gcc/testsuite/gcc.target/i386/xop-rotate2-vector.c
@@ -1,7 +1,7 @@
 /* Test that the compiler properly optimizes vector rotate instructions vector
    into prot on XOP systems.  */
 
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -mxop -mno-avx2 -ftree-vectorize" } */
 
 extern void exit (int);
diff --git a/gcc/testsuite/gcc.target/i386/xop-rotate3-vector.c b/gcc/testsuite/gcc.target/i386/xop-rotate3-vector.c
index af324c5c9c3..71d7fb17fc5 100644
--- a/gcc/testsuite/gcc.target/i386/xop-rotate3-vector.c
+++ b/gcc/testsuite/gcc.target/i386/xop-rotate3-vector.c
@@ -1,7 +1,7 @@
 /* Test that the compiler properly optimizes vector rotate instructions vector
    into prot on XOP systems.  */
 
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -mxop -mno-avx2 -ftree-vectorize" } */
 
 extern void exit (int);
diff --git a/gcc/testsuite/gcc.target/i386/xop-shift1-vector.c b/gcc/testsuite/gcc.target/i386/xop-shift1-vector.c
index aa5568b3516..7115ec9fb6a 100644
--- a/gcc/testsuite/gcc.target/i386/xop-shift1-vector.c
+++ b/gcc/testsuite/gcc.target/i386/xop-shift1-vector.c
@@ -1,7 +1,7 @@
 /* Test that the compiler properly optimizes vector shift instructions into
    psha/pshl on XOP systems.  */
 
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -mxop -mno-avx2 -ftree-vectorize" } */
 
 extern void exit (int);
diff --git a/gcc/testsuite/gcc.target/i386/xop-shift2-vector.c b/gcc/testsuite/gcc.target/i386/xop-shift2-vector.c
index 2c016848ff5..525804483f9 100644
--- a/gcc/testsuite/gcc.target/i386/xop-shift2-vector.c
+++ b/gcc/testsuite/gcc.target/i386/xop-shift2-vector.c
@@ -1,7 +1,7 @@
 /* Test that the compiler properly optimizes vector shift instructions into
    psha/pshl on XOP systems.  */
 
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -mxop -mno-avx2 -ftree-vectorize" } */
 
 extern void exit (int);
diff --git a/gcc/testsuite/gcc.target/i386/xop-shift3-vector.c b/gcc/testsuite/gcc.target/i386/xop-shift3-vector.c
index 2662fe69f2e..0bb897f0060 100644
--- a/gcc/testsuite/gcc.target/i386/xop-shift3-vector.c
+++ b/gcc/testsuite/gcc.target/i386/xop-shift3-vector.c
@@ -1,7 +1,7 @@
 /* Test that the compiler properly optimizes vector shift instructions into
    psha/pshl on XOP systems.  */
 
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -mxop -mno-avx2 -ftree-vectorize" } */
 
 extern void exit (int);
diff --git a/gcc/testsuite/gcc.target/i386/zee.c b/gcc/testsuite/gcc.target/i386/zee.c
index 1975b02b2f1..920e0566714 100644
--- a/gcc/testsuite/gcc.target/i386/zee.c
+++ b/gcc/testsuite/gcc.target/i386/zee.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { ! { ia32 } } } } */
+/* { dg-do compile { target { ! ia32 } } } */
 /* { dg-options "-O2 -fzee" } */
 /* { dg-final { scan-assembler-not "mov\[\\t \]+\(%\[\^,\]+\),\[\\t \]*\\1" } } */
 int mask[100];
-- 
2.30.2