Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.2/patches/807194/?format=api
{ "id": 807194, "url": "http://patchwork.ozlabs.org/api/1.2/patches/807194/?format=api", "web_url": "http://patchwork.ozlabs.org/project/gcc/patch/CAFULd4bhSOmjBq5ADgADpG6fFXY5cpearBvuJQn1cPmn9Hziog@mail.gmail.com/", "project": { "id": 17, "url": "http://patchwork.ozlabs.org/api/1.2/projects/17/?format=api", "name": "GNU Compiler Collection", "link_name": "gcc", "list_id": "gcc-patches.gcc.gnu.org", "list_email": "gcc-patches@gcc.gnu.org", "web_url": null, "scm_url": null, "webscm_url": null, "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<CAFULd4bhSOmjBq5ADgADpG6fFXY5cpearBvuJQn1cPmn9Hziog@mail.gmail.com>", "list_archive_url": null, "date": "2017-08-29T17:22:46", "name": "[testsuite] : Cleanup dg-options in gcc.target/i386/ a bit", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "04a8f52575149652623e5b418a61c13da574ba73", "submitter": { "id": 808, "url": "http://patchwork.ozlabs.org/api/1.2/people/808/?format=api", "name": "Uros Bizjak", "email": "ubizjak@gmail.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/gcc/patch/CAFULd4bhSOmjBq5ADgADpG6fFXY5cpearBvuJQn1cPmn9Hziog@mail.gmail.com/mbox/", "series": [ { "id": 419, "url": "http://patchwork.ozlabs.org/api/1.2/series/419/?format=api", "web_url": "http://patchwork.ozlabs.org/project/gcc/list/?series=419", "date": "2017-08-29T17:22:46", "name": "[testsuite] : Cleanup dg-options in gcc.target/i386/ a bit", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/419/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/807194/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/807194/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<gcc-patches-return-461103-incoming=patchwork.ozlabs.org@gcc.gnu.org>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": [ "patchwork-incoming@bilbo.ozlabs.org", "mailing list gcc-patches@gcc.gnu.org" ], "Authentication-Results": [ "ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org\n\t(client-ip=209.132.180.131; helo=sourceware.org;\n\tenvelope-from=gcc-patches-return-461103-incoming=patchwork.ozlabs.org@gcc.gnu.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org; dkim=pass (1024-bit key;\n\tunprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org\n\theader.b=\"Su95wPwh\"; dkim-atps=neutral", "sourceware.org; auth=none" ], "Received": [ "from sourceware.org (server1.sourceware.org [209.132.180.131])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xhb7j6HzFz9t2Q\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 30 Aug 2017 03:23:12 +1000 (AEST)", "(qmail 57667 invoked by alias); 29 Aug 2017 17:23:01 -0000", "(qmail 57460 invoked by uid 89); 29 Aug 2017 17:22:59 -0000", "from mail-vk0-f51.google.com (HELO mail-vk0-f51.google.com)\n\t(209.85.213.51) by sourceware.org\n\t(qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP;\n\tTue, 29 Aug 2017 17:22:49 +0000", "by mail-vk0-f51.google.com with SMTP id q189so11376805vke.4 for\n\t<gcc-patches@gcc.gnu.org>; Tue, 29 Aug 2017 10:22:49 -0700 (PDT)", "by 10.103.55.28 with HTTP; Tue, 29 Aug 2017 10:22:46 -0700 (PDT)" ], "DomainKey-Signature": "a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id\n\t:list-unsubscribe:list-archive:list-post:list-help:sender\n\t:mime-version:from:date:message-id:subject:to:content-type; q=\n\tdns; s=default; b=iHkRZ0tVW+ymSgixNtaAZrDYR3ZCX+Hz6wh7sfNGiLTysd\n\t6ju2S9I8gj3kzzPBFyI7CGbSKuN0GCKy982sErRJEicRoVitzas5JiiJEQkWgAUU\n\tScUqKqNxaWqCg5EnrO81HmLmc3AbvcHZiFcuKbwbjzxJcbidGC2vBajc4kz/g=", "DKIM-Signature": "v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id\n\t:list-unsubscribe:list-archive:list-post:list-help:sender\n\t:mime-version:from:date:message-id:subject:to:content-type; s=\n\tdefault; bh=cKt/Ga0XTe/Od8o7wjLft9FGaNU=; b=Su95wPwhPEF5qEyD1ozi\n\tdY/ayRbamFq7Ue0//a/Uj4+OGSRuXWdRojFLzP9MqkUQyQ15SCugSgddPO1M7aEg\n\tImCtE4mee0Btv5k3PszSfu5WCc0u26V1ArrZHEzYI7+LE2OZi3AXeuxrcJhcfO4x\n\th/G1LmXEzVSg4GuUX++1lic=", "Mailing-List": "contact gcc-patches-help@gcc.gnu.org; run by ezmlm", "Precedence": "bulk", "List-Id": "<gcc-patches.gcc.gnu.org>", "List-Unsubscribe": "<mailto:gcc-patches-unsubscribe-incoming=patchwork.ozlabs.org@gcc.gnu.org>", "List-Archive": "<http://gcc.gnu.org/ml/gcc-patches/>", "List-Post": "<mailto:gcc-patches@gcc.gnu.org>", "List-Help": "<mailto:gcc-patches-help@gcc.gnu.org>", "Sender": "gcc-patches-owner@gcc.gnu.org", "X-Virus-Found": "No", "X-Spam-SWARE-Status": "No, score=-24.6 required=5.0 tests=AWL, BAYES_00,\n\tFREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2,\n\tGIT_PATCH_3, RCVD_IN_DNSWL_NONE,\n\tSPF_PASS autolearn=ham version=3.3.2 spammy=jakub@gcc.gnu.org,\n\tjakubgccgnuorg, sk:jakub@g, sk:jakubg", "X-HELO": "mail-vk0-f51.google.com", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net;\n\ts=20161025;\n\th=x-gm-message-state:mime-version:from:date:message-id:subject:to;\n\tbh=o2xaQzkwzKBC3StHEqPUX/clDNHd8emF77bBVCcdtqk=;\n\tb=Y3xd6V5T6pWjnE7/3dL5AHWau5MDPXwQpCe8NcL2ct4zEXlyFWDoLz1/TZicKFiEQe\n\tYHgrIZtEFri7atpqJs8qSW+tRuswYdj5Kvej4tjBJ1vOXlLOmYMTU2o10u35XGCYM51L\n\tiwakkuhE2bujVzxqcWy4b2cM2WWi3M1wnbhNISznq7fry5gThFJpESx8y6uy6gTc5sPS\n\tM+hpP4Y4lMpxWtkdA4efYfopuBBfw3BBP1QCST1p9bsnig+Hkl5GZCRuJuUW/ngPrfgw\n\trmTPjJM91lOYNqLxuFJ62sy6PKAU6++X2gEknFP08ytIXmTWs6sN7jjZnwRcmqg0SRqA\n\tgfWA==", "X-Gm-Message-State": "AHYfb5gqL62RDRDM09HrPpfclWd4gTML9fZK2UaVs6JTu9/CVuqxh4aZ\toSn9olA23Tlb4G4IBxZ5cLTmraHLMvQK", "X-Received": "by 10.31.86.197 with SMTP id k188mr708375vkb.196.1504027367338;\n\tTue, 29 Aug 2017 10:22:47 -0700 (PDT)", "MIME-Version": "1.0", "From": "Uros Bizjak <ubizjak@gmail.com>", "Date": "Tue, 29 Aug 2017 19:22:46 +0200", "Message-ID": "<CAFULd4bhSOmjBq5ADgADpG6fFXY5cpearBvuJQn1cPmn9Hziog@mail.gmail.com>", "Subject": "[PATCH, testsuite]: Cleanup dg-options in gcc.target/i386/ a bit", "To": "\"gcc-patches@gcc.gnu.org\" <gcc-patches@gcc.gnu.org>", "Content-Type": "multipart/mixed; boundary=\"001a114e61eef697ff0557e7a89e\"" }, "content": "2017-08-29 Uros Bizjak <ubizjak@gmail.com>\n\n * gcc.target/i386/20030926-1.c: Add dg-additional-options.\n * gcc.target/i386/abi-2.c: Ditto.\n * gcc.target/i386/interrupt-sibcall-2.c: Ditto.\n * gcc.target/i386/pr22076.c: Ditto.\n * gcc.target/i386/pr37216.c: Ditto.\n * gcc.target/i386/pr39431.c: Ditto.\n * gcc.target/i386/pr40906-1.c: Ditto.\n * gcc.target/i386/pr40906-2.c: Ditto.\n * gcc.target/i386/pr43766.c: Ditto.\n * gcc.target/i386/pr46226.c: Ditto.\n * gcc.target/i386/pr46470.c: Ditto.\n * gcc.target/i386/pr59929.c: Ditto.\n * gcc.target/i386/sse-10.c: Ditto.\n * gcc.target/i386/vararg-1.c: Ditto.\n * gcc.target/i386/vararg-1.c: Ditto.\n * gcc.target/i386/asm-6.c: Compile for fpic target only.\n * gcc.target/i386/pr44223.c: Ditto.\n * gcc.target/i386/bitfield1.c (dg-options): Remove target selector.\n * gcc.target/i386/bitfield2.c (dg-options): Ditto.\n * gcc.target/i386/pr67480.c (dg-options): Ditto.\n * gcc.target/i386/vect-cond-1.c (dg-options): Ditto.\n * gcc.target/i386/bittest.c (scan-assembler-times): Ditto.\n * gcc.target/i386/darwin-fpmath.c (dg-do): Simplify target selector.\n * gcc.target/i386/mvc9.c: Compile for lto target only.\n * gcc.target/i386/pr45234.c: Compile for ia32 target only.\n * gcc.target/i386/pr49866.c: Compile for lp64 target only.\n * gcc.target/i386/pr57091.c: Ditto.\n * gcc.target/i386/pr61599-2.c: Ditto.\n\nTested on x86_64-linux-gnu {,-m32}.\n\nCommitted to mainline.\n\nUros.", "diff": "diff --git a/gcc/testsuite/gcc.target/i386/20030926-1.c b/gcc/testsuite/gcc.target/i386/20030926-1.c\nindex ebde34085113..f4c8f618d4c3 100644\n--- a/gcc/testsuite/gcc.target/i386/20030926-1.c\n+++ b/gcc/testsuite/gcc.target/i386/20030926-1.c\n@@ -1,7 +1,7 @@\n /* PR optimization/11741 */\n /* { dg-do compile } */\n /* { dg-options \"-O2 -minline-all-stringops\" } */\n-/* { dg-options \"-O2 -minline-all-stringops -march=pentium4\" { target ia32 } } */\n+/* { dg-additional-options \"-march=pentium4\" { target ia32 } } */\n \n extern void *memcpy (void *, const void *, __SIZE_TYPE__);\n extern __SIZE_TYPE__ strlen (const char *);\ndiff --git a/gcc/testsuite/gcc.target/i386/abi-2.c b/gcc/testsuite/gcc.target/i386/abi-2.c\nindex 39eafc250396..72a17eca31fc 100644\n--- a/gcc/testsuite/gcc.target/i386/abi-2.c\n+++ b/gcc/testsuite/gcc.target/i386/abi-2.c\n@@ -1,7 +1,7 @@\n /* Make certain that we pass __m256i in the correct register for AVX. */\n /* { dg-do compile } */\n /* { dg-options \"-O1 -mavx\" } */\n-/* { dg-options \"-mabi=sysv -O1 -mavx\" { target x86_64-*-mingw* } } */\n+/* { dg-additional-options \"-mabi=sysv\" { target x86_64-*-mingw* } } */\n \n typedef long long __m256i __attribute__ ((__vector_size__ (32)));\n __m256i foo (void) { return (__m256i){ 1, 2, 3, 4 }; }\ndiff --git a/gcc/testsuite/gcc.target/i386/asm-6.c b/gcc/testsuite/gcc.target/i386/asm-6.c\nindex 6aa37ef4276a..225e3193f7ad 100644\n--- a/gcc/testsuite/gcc.target/i386/asm-6.c\n+++ b/gcc/testsuite/gcc.target/i386/asm-6.c\n@@ -1,8 +1,8 @@\n /* PR rtl-optimization/44174 */\n /* Testcase by Jakub Jelinek <jakub@gcc.gnu.org> */\n \n-/* { dg-do compile } */\n-/* { dg-options \"-O2 -fpic\" { target fpic } } */\n+/* { dg-do compile { target fpic } } */\n+/* { dg-options \"-O2 -fpic\" } */\n \n int f0 (int, int, int, int, int);\n int f1 (void);\ndiff --git a/gcc/testsuite/gcc.target/i386/bitfield1.c b/gcc/testsuite/gcc.target/i386/bitfield1.c\nindex 714792c3d026..ecc7efe64010 100644\n--- a/gcc/testsuite/gcc.target/i386/bitfield1.c\n+++ b/gcc/testsuite/gcc.target/i386/bitfield1.c\n@@ -1,8 +1,7 @@\n // Test for bitfield alignment in structs on IA-32\n // { dg-do run }\n // { dg-require-effective-target ia32 }\n-// { dg-options \"-O2\" }\n-// { dg-options \"-mno-align-double -mno-ms-bitfields\" { target i?86-*-* x86_64-*-* } }\n+// { dg-options \"-O2 -mno-align-double -mno-ms-bitfields\" }\n \n extern void abort (void);\n extern void exit (int);\ndiff --git a/gcc/testsuite/gcc.target/i386/bitfield2.c b/gcc/testsuite/gcc.target/i386/bitfield2.c\nindex 5784bf0ccb45..58f7cea1b603 100644\n--- a/gcc/testsuite/gcc.target/i386/bitfield2.c\n+++ b/gcc/testsuite/gcc.target/i386/bitfield2.c\n@@ -1,8 +1,7 @@\n // Test for bitfield alignment in structs on IA-32\n // { dg-do run }\n // { dg-require-effective-target ia32 }\n-// { dg-options \"-O2\" }\n-// { dg-options \"-mno-align-double -mno-ms-bitfields\" { target i?86-*-* x86_64-*-* } }\n+// { dg-options \"-O2 -mno-align-double -mno-ms-bitfields\" }\n \n extern void abort (void);\n extern void exit (int);\ndiff --git a/gcc/testsuite/gcc.target/i386/bittest.c b/gcc/testsuite/gcc.target/i386/bittest.c\nindex 7b7ce9eed105..79c389718591 100644\n--- a/gcc/testsuite/gcc.target/i386/bittest.c\n+++ b/gcc/testsuite/gcc.target/i386/bittest.c\n@@ -19,4 +19,4 @@ gate_rtl_cprop (void)\n memory and mask off bits are unnecessary. In theory we can just count\n the move-with-extension, and and testb instructions. There should be\n only one. */\n-/* { dg-final { scan-assembler-times \"movzbl|and|testb\" 1 { target { i?86-*-* x86_64-*-*} } } } */\n+/* { dg-final { scan-assembler-times \"movzbl|and|testb\" 1 } } */\ndiff --git a/gcc/testsuite/gcc.target/i386/darwin-fpmath.c b/gcc/testsuite/gcc.target/i386/darwin-fpmath.c\nindex 693bdee01f25..5b047010bd14 100644\n--- a/gcc/testsuite/gcc.target/i386/darwin-fpmath.c\n+++ b/gcc/testsuite/gcc.target/i386/darwin-fpmath.c\n@@ -1,4 +1,4 @@\n-/* { dg-do compile { target i?86-*-darwin* x86_64-*-darwin* } } */\n+/* { dg-do compile { target *-*-darwin* } } */\n /* { dg-final { scan-assembler \"addsd\" } } */\n /* Do not add -msse or -msse2 or -mfpmath=sse to the options. GCC is\n supposed to use SSE math on Darwin by default, and libm won't work\ndiff --git a/gcc/testsuite/gcc.target/i386/interrupt-sibcall-2.c b/gcc/testsuite/gcc.target/i386/interrupt-sibcall-2.c\nindex f59253a5d5d6..ae2df2870600 100644\n--- a/gcc/testsuite/gcc.target/i386/interrupt-sibcall-2.c\n+++ b/gcc/testsuite/gcc.target/i386/interrupt-sibcall-2.c\n@@ -1,6 +1,7 @@\n /* { dg-do compile } */\n-/* { dg-options \"-O3 -mgeneral-regs-only -mno-cld -mpreferred-stack-boundary=3\" { target { ! { ia32 } } } } */\n-/* { dg-options \"-O3 -mgeneral-regs-only -mno-cld -mpreferred-stack-boundary=2\" { target { ia32 } } } */\n+/* { dg-options \"-O3 -mgeneral-regs-only -mno-cld\" } */\n+/* { dg-additional-options \"-mpreferred-stack-boundary=3\" { target { ! ia32 } } } */\n+/* { dg-additional-options \"-mpreferred-stack-boundary=2\" { target { ia32 } } } */\n \n extern void foo (void *) __attribute__ ((interrupt));\n extern void bar (void) __attribute__ ((no_caller_saved_registers));\ndiff --git a/gcc/testsuite/gcc.target/i386/mvc9.c b/gcc/testsuite/gcc.target/i386/mvc9.c\nindex 69e3cefb7d1d..4052f2afb547 100644\n--- a/gcc/testsuite/gcc.target/i386/mvc9.c\n+++ b/gcc/testsuite/gcc.target/i386/mvc9.c\n@@ -1,6 +1,6 @@\n-/* { dg-do run } */\n+/* { dg-do run { target lto } } */\n /* { dg-require-ifunc \"\" } */\n-/* { dg-options \"-flto -O2\" { target lto } } */\n+/* { dg-options \"-O2 -flto\" } */\n \n __attribute__((target_clones(\"avx\",\"arch=slm\",\"arch=core-avx2\",\"default\")))\n int\ndiff --git a/gcc/testsuite/gcc.target/i386/pr22076.c b/gcc/testsuite/gcc.target/i386/pr22076.c\nindex e9916c9a5832..6c1620b4a3b1 100644\n--- a/gcc/testsuite/gcc.target/i386/pr22076.c\n+++ b/gcc/testsuite/gcc.target/i386/pr22076.c\n@@ -1,6 +1,6 @@\n /* { dg-do compile } */\n /* { dg-options \"-O2 -fomit-frame-pointer -flax-vector-conversions -mmmx\" } */\n-/* { dg-options \"-O2 -fomit-frame-pointer -flax-vector-conversions -mmmx -mno-vect8-ret-in-mem\" { target *-*-vxworks* } } */\n+/* { dg-additional-options \"-mno-vect8-ret-in-mem\" { target *-*-vxworks* } } */\n \n #include <mmintrin.h>\n \ndiff --git a/gcc/testsuite/gcc.target/i386/pr37216.c b/gcc/testsuite/gcc.target/i386/pr37216.c\nindex 05eb2eea77f7..e1942fe08958 100644\n--- a/gcc/testsuite/gcc.target/i386/pr37216.c\n+++ b/gcc/testsuite/gcc.target/i386/pr37216.c\n@@ -1,6 +1,6 @@\n /* { dg-do run } */\n /* { dg-options \"-O3 -msse2\" } */\n-/* { dg-options \"-O3 -msse2 -mpe-aligned-commons\" { target pe_aligned_commons } } */\n+/* { dg-additional-options \"-mpe-aligned-commons\" { target pe_aligned_commons } } */\n /* { dg-require-effective-target sse2 } */\n \n #include \"sse2-check.h\"\ndiff --git a/gcc/testsuite/gcc.target/i386/pr39431.c b/gcc/testsuite/gcc.target/i386/pr39431.c\nindex 0db7d5643036..a148dd39ba5e 100644\n--- a/gcc/testsuite/gcc.target/i386/pr39431.c\n+++ b/gcc/testsuite/gcc.target/i386/pr39431.c\n@@ -1,7 +1,7 @@\n /* PR target/39431 */\n /* { dg-do compile } */\n /* { dg-options \"-O2\" } */\n-/* { dg-options \"-O2 -march=i686 -fpic\" { target { ia32 && fpic } } } */\n+/* { dg-additional-options \"-march=i686 -fpic\" { target { ia32 && fpic } } } */\n \n extern void bar (char *, int);\n \ndiff --git a/gcc/testsuite/gcc.target/i386/pr40906-1.c b/gcc/testsuite/gcc.target/i386/pr40906-1.c\nindex 233d8fdcb0ec..1e78c231d39d 100644\n--- a/gcc/testsuite/gcc.target/i386/pr40906-1.c\n+++ b/gcc/testsuite/gcc.target/i386/pr40906-1.c\n@@ -1,7 +1,7 @@\n /* { dg-do run } */\n /* { dg-require-effective-target ia32 } */\n-/* { dg-options \"-O2 -fomit-frame-pointer -fno-asynchronous-unwind-tables -mpush-args -mno-accumulate-outgoing-args\" } */\n-/* { dg-options \"-O2 -fomit-frame-pointer -fno-asynchronous-unwind-tables -mpush-args\" { target *-*-mingw* *-*-cygwin* } } */\n+/* { dg-options \"-O2 -fomit-frame-pointer -fno-asynchronous-unwind-tables -mpush-args\" } */\n+/* { dg-additional-options \"-mno-accumulate-outgoing-args\" { target { ! { *-*-mingw* *-*-cygwin* } } } } */\n \n void abort (void);\n \ndiff --git a/gcc/testsuite/gcc.target/i386/pr40906-2.c b/gcc/testsuite/gcc.target/i386/pr40906-2.c\nindex 58b076e1f5b2..824c43254d37 100644\n--- a/gcc/testsuite/gcc.target/i386/pr40906-2.c\n+++ b/gcc/testsuite/gcc.target/i386/pr40906-2.c\n@@ -1,7 +1,7 @@\n /* { dg-do run } */\n /* { dg-require-effective-target ia32 } */\n-/* { dg-options \"-O2 -Wno-psabi -fomit-frame-pointer -fno-asynchronous-unwind-tables -mpush-args -mno-accumulate-outgoing-args -m128bit-long-double\" } */\n-/* { dg-options \"-O2 -Wno-psabi -fomit-frame-pointer -fno-asynchronous-unwind-tables -mpush-args -m128bit-long-double\" { target *-*-mingw* *-*-cygwin* } } */\n+/* { dg-options \"-O2 -Wno-psabi -fomit-frame-pointer -fno-asynchronous-unwind-tables -mpush-args -m128bit-long-double\" } */\n+/* { dg-additional-options \"-mno-accumulate-outgoing-args\" { target { ! { *-*-mingw* *-*-cygwin* } } } } */\n \n void abort (void);\n \ndiff --git a/gcc/testsuite/gcc.target/i386/pr43766.c b/gcc/testsuite/gcc.target/i386/pr43766.c\nindex 8ac16137f78b..72898ccc6501 100644\n--- a/gcc/testsuite/gcc.target/i386/pr43766.c\n+++ b/gcc/testsuite/gcc.target/i386/pr43766.c\n@@ -1,6 +1,6 @@\n /* { dg-do compile } */\n /* { dg-options \"-O2\" } */\n-/* { dg-options \"-O2 -msse -mregparm=3\" { target ia32 } } */\n+/* { dg-additional-options \"-msse -mregparm=3\" { target ia32 } } */\n \n void p (int *a, int i)\n {\ndiff --git a/gcc/testsuite/gcc.target/i386/pr44223.c b/gcc/testsuite/gcc.target/i386/pr44223.c\nindex 3b8030c1bbbe..9f134e72348d 100644\n--- a/gcc/testsuite/gcc.target/i386/pr44223.c\n+++ b/gcc/testsuite/gcc.target/i386/pr44223.c\n@@ -1,6 +1,6 @@\n /* PR debug/44223 */\n-/* { dg-do compile } */\n-/* { dg-options \"-O3 -fsched-pressure -fschedule-insns -fpic -march=core2 -g\" { target fpic } } */\n+/* { dg-do compile { target fpic } } */\n+/* { dg-options \"-O3 -fsched-pressure -fschedule-insns -fpic -march=core2 -g\" } */\n \n struct S { unsigned int s1; int s2; };\n struct T { int t; };\ndiff --git a/gcc/testsuite/gcc.target/i386/pr45234.c b/gcc/testsuite/gcc.target/i386/pr45234.c\nindex 3996fa27fb6b..d0579b5ea8dc 100644\n--- a/gcc/testsuite/gcc.target/i386/pr45234.c\n+++ b/gcc/testsuite/gcc.target/i386/pr45234.c\n@@ -1,6 +1,6 @@\n /* PR middle-end/45234 */\n-/* { dg-do compile } */\n-/* { dg-options \"-march=i586\" { target ia32 } } */\n+/* { dg-do compile { target ia32 } } */\n+/* { dg-options \"-march=i586\" } */\n \n struct S { union { double b[4]; } a[18]; } s, a[5];\n void foo (struct S);\ndiff --git a/gcc/testsuite/gcc.target/i386/pr46226.c b/gcc/testsuite/gcc.target/i386/pr46226.c\nindex 168d80e2be40..e93cbf3dda86 100644\n--- a/gcc/testsuite/gcc.target/i386/pr46226.c\n+++ b/gcc/testsuite/gcc.target/i386/pr46226.c\n@@ -1,6 +1,6 @@\n /* { dg-do run } */\n-/* { dg-options \"-Os -fomit-frame-pointer -mno-accumulate-outgoing-args -fno-asynchronous-unwind-tables\" } */\n-/* { dg-options \"-Os -fomit-frame-pointer -fno-asynchronous-unwind-tables\" { target *-*-mingw* *-*-cygwin* } } */\n+/* { dg-options \"-Os -fomit-frame-pointer -fno-asynchronous-unwind-tables\" } */\n+/* { dg-additional-options \"-mno-accumulate-outgoing-args\" { target { ! { *-*-mingw* *-*-cygwin* } } } } */\n \n extern void abort(void);\n \ndiff --git a/gcc/testsuite/gcc.target/i386/pr46470.c b/gcc/testsuite/gcc.target/i386/pr46470.c\nindex c66a378a1ad9..728ddcde8ba7 100644\n--- a/gcc/testsuite/gcc.target/i386/pr46470.c\n+++ b/gcc/testsuite/gcc.target/i386/pr46470.c\n@@ -4,8 +4,9 @@\n /* These options are selected to ensure 1 word needs to be allocated\n on the stack to maintain alignment for the call. This should be\n transformed to push+pop. We also want to force unwind info updates. */\n-/* { dg-options \"-Os -fomit-frame-pointer -fasynchronous-unwind-tables -mno-red-zone\" } */\n-/* { dg-options \"-Os -fomit-frame-pointer -mpreferred-stack-boundary=3 -fasynchronous-unwind-tables\" { target ia32 } } */\n+/* { dg-options \"-Os -fomit-frame-pointer -fasynchronous-unwind-tables\" } */\n+/* { dg-additional-options \"-mno-red-zone\" { target { ! ia32 } } } */\n+/* { dg-additional-options \"-mpreferred-stack-boundary=3\" { target ia32 } } */\n /* ms_abi has reserved stack-region. */\n /* { dg-skip-if \"\" { x86_64-*-mingw* } } */\n void f();\ndiff --git a/gcc/testsuite/gcc.target/i386/pr49866.c b/gcc/testsuite/gcc.target/i386/pr49866.c\nindex 823305df706c..622c8f656254 100644\n--- a/gcc/testsuite/gcc.target/i386/pr49866.c\n+++ b/gcc/testsuite/gcc.target/i386/pr49866.c\n@@ -1,6 +1,6 @@\n /* PR target/49866 */\n-/* { dg-do assemble } */\n-/* { dg-options \"-O2 -mcmodel=large\" { target lp64 } } */\n+/* { dg-do assemble { target lp64 } } */\n+/* { dg-options \"-O2 -mcmodel=large\" } */\n \n void fn (void *, int, int);\n int fn2 (void);\ndiff --git a/gcc/testsuite/gcc.target/i386/pr57091.c b/gcc/testsuite/gcc.target/i386/pr57091.c\nindex 4fc7ed769ba8..86cb5f02b610 100644\n--- a/gcc/testsuite/gcc.target/i386/pr57091.c\n+++ b/gcc/testsuite/gcc.target/i386/pr57091.c\n@@ -1,5 +1,5 @@\n-/* { dg-do compile } */\n-/* { dg-options \"-O -mcmodel=large\" { target lp64 } } */\n+/* { dg-do compile { target lp64 } } */\n+/* { dg-options \"-O -mcmodel=large\" } */\n void (*bar)();\n \n void foo (void)\ndiff --git a/gcc/testsuite/gcc.target/i386/pr59929.c b/gcc/testsuite/gcc.target/i386/pr59929.c\nindex 4591dc4d6016..53e0b237c270 100644\n--- a/gcc/testsuite/gcc.target/i386/pr59929.c\n+++ b/gcc/testsuite/gcc.target/i386/pr59929.c\n@@ -1,6 +1,6 @@\n /* { dg-do run } */\n /* { dg-options \"-O0 -mno-accumulate-outgoing-args\" } */\n-/* { dg-options \"-O0 -mno-accumulate-outgoing-args -mx32 -maddress-mode=short\" { target x32 } } */\n+/* { dg-additional-options \"-mx32 -maddress-mode=short\" { target x32 } } */\n \n void\n __attribute__ ((noinline))\ndiff --git a/gcc/testsuite/gcc.target/i386/pr61599-2.c b/gcc/testsuite/gcc.target/i386/pr61599-2.c\nindex f0d46020dea1..be031c05b1fa 100644\n--- a/gcc/testsuite/gcc.target/i386/pr61599-2.c\n+++ b/gcc/testsuite/gcc.target/i386/pr61599-2.c\n@@ -1,6 +1,6 @@\n /* PR target/61599 */\n /* { dg-do compile { target lp64 } } */\n-/* { dg-options \"-mcmodel=medium -fdata-sections\" { target lp64 } } */\n+/* { dg-options \"-mcmodel=medium -fdata-sections\" } */\n \n /* With -mcmodel=medium, all the arrays will be treated as large data. */\n \ndiff --git a/gcc/testsuite/gcc.target/i386/pr67480.c b/gcc/testsuite/gcc.target/i386/pr67480.c\nindex 90e6a6e4b8dd..aa549682dbd8 100644\n--- a/gcc/testsuite/gcc.target/i386/pr67480.c\n+++ b/gcc/testsuite/gcc.target/i386/pr67480.c\n@@ -1,5 +1,5 @@\n /* { dg-do compile } */\n-/* { dg-options \"-mavx512bw -O2 -ftree-vectorize\" { target i?86-*-* x86_64-*-* } } */\n+/* { dg-options \"-mavx512bw -O2 -ftree-vectorize\" } */\n \n void\n foo(const char *in, char *out, unsigned n)\ndiff --git a/gcc/testsuite/gcc.target/i386/sse-10.c b/gcc/testsuite/gcc.target/i386/sse-10.c\nindex 798551db2aae..4d4de4f4de55 100644\n--- a/gcc/testsuite/gcc.target/i386/sse-10.c\n+++ b/gcc/testsuite/gcc.target/i386/sse-10.c\n@@ -1,7 +1,7 @@\n /* PR 17930 */\n /* { dg-do run } */\n-/* { dg-options \"-O1 -msse2 -mfpmath=sse -mno-accumulate-outgoing-args -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer\" } */\n-/* { dg-options \"-O1 -msse2 -mfpmath=sse -fno-omit-frame-pointer\" { target *-*-mingw* *-*-cygwin* } } */\n+/* { dg-options \"-O1 -msse2 -mfpmath=sse -fno-omit-frame-pointer\" } */\n+/* { dg-additional-options \"-mno-accumulate-outgoing-args -mno-omit-leaf-frame-pointer\" { target { ! { *-*-mingw* *-*-cygwin* } } } } */\n /* { dg-require-effective-target sse2 } */\n \n #include \"sse2-check.h\"\ndiff --git a/gcc/testsuite/gcc.target/i386/vararg-1.c b/gcc/testsuite/gcc.target/i386/vararg-1.c\nindex 3eda1e93e251..cab44ed0969a 100644\n--- a/gcc/testsuite/gcc.target/i386/vararg-1.c\n+++ b/gcc/testsuite/gcc.target/i386/vararg-1.c\n@@ -1,8 +1,7 @@\n /* PR middle-end/36858 */\n /* { dg-do run } */\n-/* { dg-options \"-w\" { target { ! ia32 } } } */\n-/* { dg-options \"-w\" { target { llp64 } } } */\n-/* { dg-options \"-w -msse2 -mpreferred-stack-boundary=2\" { target { ia32 } } } */\n+/* { dg-options \"-w -msse2\" } */\n+/* { dg-additional-options \"-mpreferred-stack-boundary=2\" { target { ia32 } } } */\n /* { dg-require-effective-target sse2 } */\n \n #include \"sse2-check.h\"\ndiff --git a/gcc/testsuite/gcc.target/i386/vararg-2.c b/gcc/testsuite/gcc.target/i386/vararg-2.c\nindex 65599a57561a..3010f415f828 100644\n--- a/gcc/testsuite/gcc.target/i386/vararg-2.c\n+++ b/gcc/testsuite/gcc.target/i386/vararg-2.c\n@@ -1,8 +1,7 @@\n /* PR middle-end/36859 */\n /* { dg-do run } */\n-/* { dg-options \"-w\" { target { ! ia32 } } } */\n-/* { dg-options \"-w\" { target { llp64 } } } */\n-/* { dg-options \"-w -msse2 -mpreferred-stack-boundary=2\" { target { ia32 } } } */\n+/* { dg-options \"-w -msse2\" } */\n+/* { dg-additional-options \"-mpreferred-stack-boundary=2\" { target { ia32 } } } */\n /* { dg-require-effective-target sse2 } */\n \n #include \"sse2-check.h\"\ndiff --git a/gcc/testsuite/gcc.target/i386/vect-cond-1.c b/gcc/testsuite/gcc.target/i386/vect-cond-1.c\nindex 7cea69154d4b..1bf7aa28a132 100644\n--- a/gcc/testsuite/gcc.target/i386/vect-cond-1.c\n+++ b/gcc/testsuite/gcc.target/i386/vect-cond-1.c\n@@ -1,5 +1,5 @@\n /* { dg-do compile } */\n-/* { dg-options \"-O2 -ftree-vectorize -mavx2\" { target avx2 } } */\n+/* { dg-options \"-O2 -ftree-vectorize -mavx2\" } */\n \n int a[1024];\n \ndiff --git a/gcc/testsuite/gcc.target/i386/vect8-ret.c b/gcc/testsuite/gcc.target/i386/vect8-ret.c\nindex 09283d72bef5..2b2b81ecf7ab 100644\n--- a/gcc/testsuite/gcc.target/i386/vect8-ret.c\n+++ b/gcc/testsuite/gcc.target/i386/vect8-ret.c\n@@ -1,5 +1,4 @@\n-/* { dg-do compile { target ia32 } } */\n-/* { dg-options \"-mmmx\" { target *-*-vxworks* } } */\n+/* { dg-do compile { target { ia32 && { ! *-*-vxworks* } } } } */\n /* { dg-options \"-mmmx -mvect8-ret-in-mem\" } */\n \n #include <mmintrin.h>\n", "prefixes": [ "testsuite" ] }