x86/CET tests: Remove -mcet/-mno-cet or replace -mcet with -mshstk

With revision 259496:

commit b1384095a7c1d06a44b70853372ebe037b2f7867
Author: hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4>
Date:   Thu Apr 19 15:15:04 2018 +0000

    x86: Enable -fcf-protection with multi-byte NOPs

-fcf-protection no longer depens on -mcet and with revision 259522:

commit d59cfa9a4064339cf2bd2da828c4c133f13e57f0
Author: hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4>
Date:   Fri Apr 20 13:30:13 2018 +0000

    Define __CET__ for -fcf-protection and remove -mibt

-mcet becomes an alias for -mshstk.

We can remove -mcet/-mno-cet where they are unused and replace -mcet
with -mshstk where -mcet is used as an alias for -mshstk.

	PR target/85485
	* g++.dg/cet-notrack-1.C (dg-options): Remove -mcet.
	* g++.dg/torture/pr85334.C (dg-additional-options): Likwise.
	* gcc.dg/pr85388-1.c (dg-options): Likwise.
	* gcc.dg/pr85388-2.c (dg-options): Likwise.
	* gcc.dg/pr85388-3.c (dg-options): Likwise.
	* gcc.dg/pr85388-4.c (dg-options): Likwise.
	* gcc.dg/pr85388-5.c (dg-options): Likwise.
	* gcc.dg/pr85388-6.c (dg-options): Likwise.
	* gcc.dg/torture/pr85397-1.c (dg-additional-options): Likwise.
	* gcc.target/i386/attr-nocf-check-1a.c (dg-options): Likwise.
	* gcc.target/i386/attr-nocf-check-3a.c (dg-options): Likwise.
	* gcc.target/i386/cet-label.c (dg-options): Likwise.
	* gcc.target/i386/cet-label-2.c (dg-options): Likwise.
	* gcc.target/i386/cet-notrack-1b.c (dg-options): Likwise.
	* gcc.target/i386/cet-notrack-2a.c (dg-options): Likwise.
	* gcc.target/i386/cet-notrack-2b.c (dg-options): Likwise.
	* gcc.target/i386/cet-notrack-3.c (dg-options): Likwise.
	* gcc.target/i386/cet-notrack-4b.c (dg-options): Likwise.
	* gcc.target/i386/cet-notrack-5a.c (dg-options): Likwise.
	* gcc.target/i386/cet-notrack-5b.c (dg-options): Likwise.
	* gcc.target/i386/cet-notrack-6a.c (dg-options): Likwise.
	* gcc.target/i386/cet-notrack-6b.c (dg-options): Likwise.
	* gcc.target/i386/cet-notrack-7.c (dg-options): Likwise.
	* gcc.target/i386/cet-notrack-icf-2.c (dg-options): Likwise.
	* gcc.target/i386/cet-notrack-icf-4.c (dg-options): Likwise.
	* gcc.target/i386/cet-property-1.c (dg-options): Likwise.
	* gcc.target/i386/cet-property-2.c (dg-options): Likwise.
	* gcc.target/i386/cet-sjlj-1.c (dg-options): Likwise.
	* gcc.target/i386/cet-sjlj-2.c (dg-options): Likwise.
	* gcc.target/i386/cet-sjlj-3.c (dg-options): Likwise.
	* gcc.target/i386/cet-sjlj-4.c (dg-options): Likwise.
	* gcc.target/i386/cet-sjlj-5.c (dg-options): Likwise.
	* gcc.target/i386/cet-sjlj-6a.c (dg-options): Likwise.
	* gcc.target/i386/cet-sjlj-6b.c (dg-options): Likwise.
	* gcc.target/i386/cet-switch-1.c (dg-options): Likwise.
	* gcc.target/i386/cet-switch-2.c (dg-options): Likwise.
	* gcc.target/i386/cet-switch-3.c (dg-options): Likwise.
	* gcc.target/i386/indirect-thunk-11.c (dg-options): Likwise.
	* gcc.target/i386/indirect-thunk-12.c (dg-options): Likwise.
	* gcc.target/i386/indirect-thunk-attr-12.c (dg-options): Likwise.
	* gcc.target/i386/indirect-thunk-attr-13.c (dg-options): Likwise.
	* gcc.target/i386/indirect-thunk-attr-14.c (dg-options): Likwise.
	* gcc.target/i386/indirect-thunk-attr-15.c (dg-options): Likwise.
	* gcc.target/i386/indirect-thunk-attr-16.c (dg-options): Likwise.
	* gcc.target/i386/indirect-thunk-extern-8.c (dg-options): Likwise.
	* gcc.target/i386/indirect-thunk-extern-9.c (dg-options): Likwise.
	* gcc.target/i386/indirect-thunk-extern-10.c (dg-options): Likwise.
	* gcc.target/i386/pr82659-1.c (dg-options): Likwise.
	* gcc.target/i386/pr82659-2.c (dg-options): Likwise.
	* gcc.target/i386/pr82659-3.c (dg-options): Likwise.
	* gcc.target/i386/pr82659-4.c (dg-options): Likwise.
	* gcc.target/i386/pr82659-5.c (dg-options): Likwise.
	* gcc.target/i386/pr82659-6.c (dg-options): Likwise.
	* gcc.target/i386/pr84146.c (dg-options): Likwise.
	* gcc.target/i386/pr85403.c (dg-options): Likwise.
	* gcc.target/i386/pr85404.c (dg-options): Likwise.
	* gcc.target/i386/cet-intrin-3.c (dg-options): Replace -mcet
	with -mshstk.
	* gcc.target/i386/cet-intrin-5.c (dg-options): Likwise.
	* gcc.target/i386/cet-intrin-6.c (dg-options): Likwise.
	* gcc.target/i386/cet-intrin-7.c (dg-options): Likwise.
	* gcc.target/i386/cet-intrin-8.c (dg-options): Likwise.
	* gcc.target/i386/cet-intrin-9.c (dg-options): Likwise.
	* gcc.target/i386/cet-intrin-10.c (dg-options): Likwise.
	* gcc.target/i386/cet-rdssp-1.c (dg-options): Likwise.
	* (dg-options): Likwise.
	* gcc.target/i386/cet-notrack-1a.c (dg-options): Remove
	-mno-cet.
	* gcc.target/i386/cet-notrack-4a.c (dg-options): Likwise.
	* gcc.target/i386/cet-label-3.c: Removed.
	* gcc.target/i386/cet-property-3.c: Likwise.
	* gcc.target/i386/cet-sjlj-7.c: Likwise.

From-SVN: r259612

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 12fd465de84719fc467e32783d06d71f300be9a1..7d551408cdb8fcea60865f84c5a64b1359fc335e 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,78 @@
+
+       PR target/85485
+       * g++.dg/cet-notrack-1.C (dg-options): Remove -mcet.
+       * g++.dg/torture/pr85334.C (dg-additional-options): Likwise.
+       * gcc.dg/pr85388-1.c (dg-options): Likwise.
+       * gcc.dg/pr85388-2.c (dg-options): Likwise.
+       * gcc.dg/pr85388-3.c (dg-options): Likwise.
+       * gcc.dg/pr85388-4.c (dg-options): Likwise.
+       * gcc.dg/pr85388-5.c (dg-options): Likwise.
+       * gcc.dg/pr85388-6.c (dg-options): Likwise.
+       * gcc.dg/torture/pr85397-1.c (dg-additional-options): Likwise.
+       * gcc.target/i386/attr-nocf-check-1a.c (dg-options): Likwise.
+       * gcc.target/i386/attr-nocf-check-3a.c (dg-options): Likwise.
+       * gcc.target/i386/cet-label.c (dg-options): Likwise.
+       * gcc.target/i386/cet-label-2.c (dg-options): Likwise.
+       * gcc.target/i386/cet-notrack-1b.c (dg-options): Likwise.
+       * gcc.target/i386/cet-notrack-2a.c (dg-options): Likwise.
+       * gcc.target/i386/cet-notrack-2b.c (dg-options): Likwise.
+       * gcc.target/i386/cet-notrack-3.c (dg-options): Likwise.
+       * gcc.target/i386/cet-notrack-4b.c (dg-options): Likwise.
+       * gcc.target/i386/cet-notrack-5a.c (dg-options): Likwise.
+       * gcc.target/i386/cet-notrack-5b.c (dg-options): Likwise.
+       * gcc.target/i386/cet-notrack-6a.c (dg-options): Likwise.
+       * gcc.target/i386/cet-notrack-6b.c (dg-options): Likwise.
+       * gcc.target/i386/cet-notrack-7.c (dg-options): Likwise.
+       * gcc.target/i386/cet-notrack-icf-2.c (dg-options): Likwise.
+       * gcc.target/i386/cet-notrack-icf-4.c (dg-options): Likwise.
+       * gcc.target/i386/cet-property-1.c (dg-options): Likwise.
+       * gcc.target/i386/cet-property-2.c (dg-options): Likwise.
+       * gcc.target/i386/cet-sjlj-1.c (dg-options): Likwise.
+       * gcc.target/i386/cet-sjlj-2.c (dg-options): Likwise.
+       * gcc.target/i386/cet-sjlj-3.c (dg-options): Likwise.
+       * gcc.target/i386/cet-sjlj-4.c (dg-options): Likwise.
+       * gcc.target/i386/cet-sjlj-5.c (dg-options): Likwise.
+       * gcc.target/i386/cet-sjlj-6a.c (dg-options): Likwise.
+       * gcc.target/i386/cet-sjlj-6b.c (dg-options): Likwise.
+       * gcc.target/i386/cet-switch-1.c (dg-options): Likwise.
+       * gcc.target/i386/cet-switch-2.c (dg-options): Likwise.
+       * gcc.target/i386/cet-switch-3.c (dg-options): Likwise.
+       * gcc.target/i386/indirect-thunk-11.c (dg-options): Likwise.
+       * gcc.target/i386/indirect-thunk-12.c (dg-options): Likwise.
+       * gcc.target/i386/indirect-thunk-attr-12.c (dg-options): Likwise.
+       * gcc.target/i386/indirect-thunk-attr-13.c (dg-options): Likwise.
+       * gcc.target/i386/indirect-thunk-attr-14.c (dg-options): Likwise.
+       * gcc.target/i386/indirect-thunk-attr-15.c (dg-options): Likwise.
+       * gcc.target/i386/indirect-thunk-attr-16.c (dg-options): Likwise.
+       * gcc.target/i386/indirect-thunk-extern-8.c (dg-options): Likwise.
+       * gcc.target/i386/indirect-thunk-extern-9.c (dg-options): Likwise.
+       * gcc.target/i386/indirect-thunk-extern-10.c (dg-options): Likwise.
+       * gcc.target/i386/pr82659-1.c (dg-options): Likwise.
+       * gcc.target/i386/pr82659-2.c (dg-options): Likwise.
+       * gcc.target/i386/pr82659-3.c (dg-options): Likwise.
+       * gcc.target/i386/pr82659-4.c (dg-options): Likwise.
+       * gcc.target/i386/pr82659-5.c (dg-options): Likwise.
+       * gcc.target/i386/pr82659-6.c (dg-options): Likwise.
+       * gcc.target/i386/pr84146.c (dg-options): Likwise.
+       * gcc.target/i386/pr85403.c (dg-options): Likwise.
+       * gcc.target/i386/pr85404.c (dg-options): Likwise.
+       * gcc.target/i386/cet-intrin-3.c (dg-options): Replace -mcet
+       with -mshstk.
+       * gcc.target/i386/cet-intrin-5.c (dg-options): Likwise.
+       * gcc.target/i386/cet-intrin-6.c (dg-options): Likwise.
+       * gcc.target/i386/cet-intrin-7.c (dg-options): Likwise.
+       * gcc.target/i386/cet-intrin-8.c (dg-options): Likwise.
+       * gcc.target/i386/cet-intrin-9.c (dg-options): Likwise.
+       * gcc.target/i386/cet-intrin-10.c (dg-options): Likwise.
+       * gcc.target/i386/cet-rdssp-1.c (dg-options): Likwise.
+       * (dg-options): Likwise.
+       * gcc.target/i386/cet-notrack-1a.c (dg-options): Remove
+       -mno-cet.
+       * gcc.target/i386/cet-notrack-4a.c (dg-options): Likwise.
+       * gcc.target/i386/cet-label-3.c: Removed.
+       * gcc.target/i386/cet-property-3.c: Likwise.
+       * gcc.target/i386/cet-sjlj-7.c: Likwise.
+
 2018-04-24  Jakub Jelinek  <jakub@redhat.com>
 
        PR target/85511

diff --git a/gcc/testsuite/g++.dg/cet-notrack-1.C b/gcc/testsuite/g++.dg/cet-notrack-1.C
index 43dbbd6a7f372cb23f9e6851451ac77ee5b75946..eab0946d4779ed0351421500fcc5e4f117966a52 100644 (file)
--- a/gcc/testsuite/g++.dg/cet-notrack-1.C
+++ b/gcc/testsuite/g++.dg/cet-notrack-1.C
@@ -1,5 +1,5 @@
 /* { dg-do compile { target i?86-*-* x86_64-*-* } } */
-/* { dg-options "-fcf-protection -mcet" } */
+/* { dg-options "-fcf-protection" } */
 /* { dg-final { scan-assembler "endbr32|endbr64" } } */
 /* { dg-final { scan-assembler-times "\tcall\[ \t]+puts" 2 } } */
 /* { dg-final { scan-assembler-times "notrack call\[ \t]+" 1 } } */

diff --git a/gcc/testsuite/g++.dg/torture/pr85334.C b/gcc/testsuite/g++.dg/torture/pr85334.C
index 080978143bd5057c957feaecae4172fb3c7eb61e..a282edc88e921913dcce2afbef86d54420af238f 100644 (file)
--- a/gcc/testsuite/g++.dg/torture/pr85334.C
+++ b/gcc/testsuite/g++.dg/torture/pr85334.C
@@ -1,6 +1,6 @@
 // { dg-do run { target { i?86-*-linux* i?86-*-gnu* x86_64-*-linux* } } }
 // { dg-require-effective-target cet }
-// { dg-additional-options "-fexceptions -fnon-call-exceptions -fcf-protection -mcet" }
+// { dg-additional-options "-fexceptions -fnon-call-exceptions -fcf-protection" }
 
 #include <signal.h>
 #include <stdlib.h>

diff --git a/gcc/testsuite/gcc.dg/pr85388-1.c b/gcc/testsuite/gcc.dg/pr85388-1.c
index 86d4737e32bb69db8a1f08a8c607e44d164104d8..8176118e71e778f5c6732d7b7da2aff5ef1a6ed5 100644 (file)
--- a/gcc/testsuite/gcc.dg/pr85388-1.c
+++ b/gcc/testsuite/gcc.dg/pr85388-1.c
@@ -3,7 +3,7 @@
 /* { dg-do run { target { i?86-*-linux* i?86-*-gnu* x86_64-*-linux* } } } */
 /* { dg-require-effective-target cet } */
 /* { dg-require-effective-target split_stack } */
-/* { dg-options "-fsplit-stack -fcf-protection -mcet" } */
+/* { dg-options "-fsplit-stack -fcf-protection" } */
 
 #include <stdlib.h>
 #include <sys/types.h>

diff --git a/gcc/testsuite/gcc.dg/pr85388-2.c b/gcc/testsuite/gcc.dg/pr85388-2.c
index fd13d984c5046e4d0283762d9a89cf29520f5b3b..075ab9ed56343bb369f95d3a11635940953b799e 100644 (file)
--- a/gcc/testsuite/gcc.dg/pr85388-2.c
+++ b/gcc/testsuite/gcc.dg/pr85388-2.c
@@ -2,7 +2,7 @@
 /* { dg-require-effective-target cet } */
 /* { dg-require-effective-target split_stack } */
 /* { dg-require-effective-target pthread_h } */
-/* { dg-options "-pthread -fsplit-stack -fcf-protection -mcet" } */
+/* { dg-options "-pthread -fsplit-stack -fcf-protection" } */
 
 #include <stdlib.h>
 #include <pthread.h>

diff --git a/gcc/testsuite/gcc.dg/pr85388-3.c b/gcc/testsuite/gcc.dg/pr85388-3.c
index 730d2be9c2294b583a547ef41c00b221261b717b..232ef20acf0cb9dcaa5999a44615ad015bd44814 100644 (file)
--- a/gcc/testsuite/gcc.dg/pr85388-3.c
+++ b/gcc/testsuite/gcc.dg/pr85388-3.c
@@ -3,7 +3,7 @@
 /* { dg-do run { target { i?86-*-linux* i?86-*-gnu* x86_64-*-linux* } } } */
 /* { dg-require-effective-target cet } */
 /* { dg-require-effective-target split_stack } */
-/* { dg-options "-fsplit-stack -fcf-protection -mcet" } */
+/* { dg-options "-fsplit-stack -fcf-protection" } */
 
 #include <stdarg.h>
 #include <stdlib.h>

diff --git a/gcc/testsuite/gcc.dg/pr85388-4.c b/gcc/testsuite/gcc.dg/pr85388-4.c
index 03937d0e7350dd4ad68ed93653ec090cfe767e98..8a3cc14f205947fd7f13756f7ec37c03af804171 100644 (file)
--- a/gcc/testsuite/gcc.dg/pr85388-4.c
+++ b/gcc/testsuite/gcc.dg/pr85388-4.c
@@ -3,7 +3,7 @@
 /* { dg-do run { target { i?86-*-linux* i?86-*-gnu* x86_64-*-linux* } } } */
 /* { dg-require-effective-target cet } */
 /* { dg-require-effective-target split_stack } */
-/* { dg-options "-fsplit-stack -fcf-protection -mcet" } */
+/* { dg-options "-fsplit-stack -fcf-protection" } */
 
 #include <stdlib.h>
 #include <string.h>

diff --git a/gcc/testsuite/gcc.dg/pr85388-5.c b/gcc/testsuite/gcc.dg/pr85388-5.c
index 7462a40892c0235041c7726f69e4aade1387c338..6c161b9c5ae7c10be77ad407e7386b3c64df8288 100644 (file)
--- a/gcc/testsuite/gcc.dg/pr85388-5.c
+++ b/gcc/testsuite/gcc.dg/pr85388-5.c
@@ -1,7 +1,7 @@
 /* { dg-do run { target { i?86-*-linux* i?86-*-gnu* x86_64-*-linux* } } } */
 /* { dg-require-effective-target cet } */
 /* { dg-require-effective-target split_stack } */
-/* { dg-options "-fsplit-stack -fcf-protection -mcet" } */
+/* { dg-options "-fsplit-stack -fcf-protection" } */
 
 /* This test is like split-3.c, but tests with a smaller stack frame,
    since that uses a different prologue.  */

diff --git a/gcc/testsuite/gcc.dg/pr85388-6.c b/gcc/testsuite/gcc.dg/pr85388-6.c
index 23b5d8e3df64dcecdc8366931be9dcfb5d371887..b218dfc6144d1ca6e13f2b5fad16221bd7601ce2 100644 (file)
--- a/gcc/testsuite/gcc.dg/pr85388-6.c
+++ b/gcc/testsuite/gcc.dg/pr85388-6.c
@@ -1,8 +1,8 @@
 /* { dg-do run { target { i?86-*-linux* i?86-*-gnu* x86_64-*-linux* } } } */
 /* { dg-require-effective-target cet } */
 /* { dg-require-effective-target split_stack } */
-/* { dg-options "-fsplit-stack -O2 -fcf-protection -mcet" } */
-/* { dg-options "-fsplit-stack -O2 -mno-accumulate-outgoing-args -fcf-protection -mcet" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */
+/* { dg-options "-fsplit-stack -O2 -fcf-protection" } */
+/* { dg-options "-fsplit-stack -O2 -mno-accumulate-outgoing-args -fcf-protection" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */
 
 /* A case that used to fail on 32-bit x86 when optimizing and not
    using -maccumulate-args.  The stack adjustment of the alloca got

diff --git a/gcc/testsuite/gcc.dg/torture/pr85397-1.c b/gcc/testsuite/gcc.dg/torture/pr85397-1.c
index 650852402665782b88c586c182ed05ddb0e95ef8..46e31d1790b75f45cbf53acaca65c542f476f283 100644 (file)
--- a/gcc/testsuite/gcc.dg/torture/pr85397-1.c
+++ b/gcc/testsuite/gcc.dg/torture/pr85397-1.c
@@ -1,6 +1,6 @@
 /* { dg-do run { target i?86-*-* x86_64-*-* } } */
 /* { dg-require-effective-target cet } */
-/* { dg-additional-options "-fcf-protection -mcet" } */
+/* { dg-additional-options "-fcf-protection" } */
 
 #define DEPTH 1000
 

diff --git a/gcc/testsuite/gcc.target/i386/attr-nocf-check-1a.c b/gcc/testsuite/gcc.target/i386/attr-nocf-check-1a.c
index 9549e6976586460d2149c51af04a199d4ec0a57c..f2751e8c8149f7803422f8b309f83e3b8a2fbe70 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/attr-nocf-check-1a.c
+++ b/gcc/testsuite/gcc.target/i386/attr-nocf-check-1a.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-fcf-protection -mcet" } */
+/* { dg-options "-fcf-protection" } */
 
 int func (int) __attribute__ ((nocf_check));
 int (*fptr) (int) __attribute__ ((nocf_check));

diff --git a/gcc/testsuite/gcc.target/i386/attr-nocf-check-3a.c b/gcc/testsuite/gcc.target/i386/attr-nocf-check-3a.c
index 1a833012409ef670957c5e4e8331320e2eaa6751..9924cdc80f023875c967752b93e01a80d9da76b4 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/attr-nocf-check-3a.c
+++ b/gcc/testsuite/gcc.target/i386/attr-nocf-check-3a.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-fcf-protection -mcet" } */
+/* { dg-options "-fcf-protection" } */
 
 int  foo (void) __attribute__ ((nocf_check));
 void (*foo1) (void) __attribute__((nocf_check));

diff --git a/gcc/testsuite/gcc.target/i386/cet-intrin-10.c b/gcc/testsuite/gcc.target/i386/cet-intrin-10.c
index 695dc5edc3462745b9c164d9a8e134e61f78e206..76326c31c8ed3318e56765da552796f6985735c4 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/cet-intrin-10.c
+++ b/gcc/testsuite/gcc.target/i386/cet-intrin-10.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -mcet" } */
+/* { dg-options "-O2 -mshstk" } */
 /* { dg-final { scan-assembler-times "clrssbsy" 1 } } */
 
 #include <immintrin.h>

diff --git a/gcc/testsuite/gcc.target/i386/cet-intrin-3.c b/gcc/testsuite/gcc.target/i386/cet-intrin-3.c
index b98c1e928d5cec691d3bcb1086546cb1c075ecdb..e1080d76753d5409cf7d9a67cf393ff76b52127b 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/cet-intrin-3.c
+++ b/gcc/testsuite/gcc.target/i386/cet-intrin-3.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O -fcf-protection -mcet" } */
+/* { dg-options "-O -fcf-protection -mshstk" } */
 /* { dg-final { scan-assembler-times "endbr32" 2 { target ia32 } } } */
 /* { dg-final { scan-assembler-times "endbr64" 4 { target { ! ia32 } } } } */
 /* { dg-final { scan-assembler "rdsspd|incsspd\[ \t]+(%|)eax" { target ia32 } } } */

diff --git a/gcc/testsuite/gcc.target/i386/cet-intrin-5.c b/gcc/testsuite/gcc.target/i386/cet-intrin-5.c
index 8a1b637905c2b5fd335a963474e96fcf1e490428..59ba1bc076158d497eb8f6b0a83aeb25ae15c22d 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/cet-intrin-5.c
+++ b/gcc/testsuite/gcc.target/i386/cet-intrin-5.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -mcet" } */
+/* { dg-options "-O2 -mshstk" } */
 /* { dg-final { scan-assembler-times "saveprevssp" 1 } } */
 
 #include <immintrin.h>

diff --git a/gcc/testsuite/gcc.target/i386/cet-intrin-6.c b/gcc/testsuite/gcc.target/i386/cet-intrin-6.c
index dfa6d20ca269eb0b6da93578a168f5c62c40e9e6..7874288d1f5b3b2886a659e99e0c91cf87a38989 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/cet-intrin-6.c
+++ b/gcc/testsuite/gcc.target/i386/cet-intrin-6.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -mcet" } */
+/* { dg-options "-O2 -mshstk" } */
 /* { dg-final { scan-assembler-times "rstorssp" 1 } } */
 
 #include <immintrin.h>

diff --git a/gcc/testsuite/gcc.target/i386/cet-intrin-7.c b/gcc/testsuite/gcc.target/i386/cet-intrin-7.c
index ecd1825a303be7588b37c4e2213dec10aa4bee8c..40770efdb4efc695f059eb9595e00eab514e8618 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/cet-intrin-7.c
+++ b/gcc/testsuite/gcc.target/i386/cet-intrin-7.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -mcet" } */
+/* { dg-options "-O2 -mshstk" } */
 /* { dg-final { scan-assembler-times "wrssd" 1 { target ia32 } } } */
 /* { dg-final { scan-assembler-times "wrss\[d|q]" 2 { target lp64 } } } */
 

diff --git a/gcc/testsuite/gcc.target/i386/cet-intrin-8.c b/gcc/testsuite/gcc.target/i386/cet-intrin-8.c
index 2188876cca557c12b7b4d9527cb0ba438f916be3..85633b0440bcab13b17f59b70ebba9ca13f67ff5 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/cet-intrin-8.c
+++ b/gcc/testsuite/gcc.target/i386/cet-intrin-8.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -mcet" } */
+/* { dg-options "-O2 -mshstk" } */
 /* { dg-final { scan-assembler-times "wrussd" 1 { target ia32 } } } */
 /* { dg-final { scan-assembler-times "wruss\[d|q]" 2 { target lp64 } } } */
 

diff --git a/gcc/testsuite/gcc.target/i386/cet-intrin-9.c b/gcc/testsuite/gcc.target/i386/cet-intrin-9.c
index 569931a9492c083a58fd53f78ed3d1a50e22b5c6..22c3fc0baf24aa8d6d03470fbc8dc5ff49b02e61 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/cet-intrin-9.c
+++ b/gcc/testsuite/gcc.target/i386/cet-intrin-9.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -mcet" } */
+/* { dg-options "-O2 -mshstk" } */
 /* { dg-final { scan-assembler-times "setssbsy" 1 } } */
 
 #include <immintrin.h>

diff --git a/gcc/testsuite/gcc.target/i386/cet-label-2.c b/gcc/testsuite/gcc.target/i386/cet-label-2.c
index c7f79819079b65a907ac311bd80e0802c8f7fdf5..8058117b03680f6464172a3b4c32294e6bf92273 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/cet-label-2.c
+++ b/gcc/testsuite/gcc.target/i386/cet-label-2.c
@@ -1,6 +1,6 @@
 /* Verify that CET works.  */
 /* { dg-do compile } */
-/* { dg-options "-O -fcf-protection -mcet" } */
+/* { dg-options "-O -fcf-protection" } */
 /* { dg-final { scan-assembler-times "endbr32" 3 { target ia32 } } } */
 /* { dg-final { scan-assembler-times "endbr64" 3 { target { ! ia32 } } } } */
 

diff --git a/gcc/testsuite/gcc.target/i386/cet-label-3.c b/gcc/testsuite/gcc.target/i386/cet-label-3.c
deleted file mode 100644 (file)
index 5e0892e..0000000
--- a/gcc/testsuite/gcc.target/i386/cet-label-3.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Verify that -fcf-protection works without -mcet.  */
-/* { dg-do compile } */
-/* { dg-options "-O -fcf-protection" } */
-/* { dg-final { scan-assembler-times "endbr32" 3 { target ia32 } } } */
-/* { dg-final { scan-assembler-times "endbr64" 3 { target { ! ia32 } } } } */
-
-int func (int arg)
-{
-  static void *array[] = { &&foo, &&bar };
-
-  goto *array[arg];
-foo:
-  return arg*111;
-bar:
-  return arg*777;
-}

diff --git a/gcc/testsuite/gcc.target/i386/cet-label.c b/gcc/testsuite/gcc.target/i386/cet-label.c
index 8fb8d4203493ae28e4b400a6c9dcf554f2207578..ea48f4161eb75fea55917c2eecf1aa908161e0d1 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/cet-label.c
+++ b/gcc/testsuite/gcc.target/i386/cet-label.c
@@ -1,6 +1,6 @@
-/* Verify that CET works.  */
+/* Verify that -fcf-protection works.  */
 /* { dg-do compile } */
-/* { dg-options "-O -fcf-protection -mcet" } */
+/* { dg-options "-O -fcf-protection" } */
 /* { dg-final { scan-assembler-times "endbr32" 3 { target ia32 } } } */
 /* { dg-final { scan-assembler-times "endbr64" 3 { target { ! ia32 } } } } */
 

diff --git a/gcc/testsuite/gcc.target/i386/cet-notrack-1a.c b/gcc/testsuite/gcc.target/i386/cet-notrack-1a.c
index ab0bd3ba9b2d0a3fb89eead527c6a379d1182924..d8d2e5a6d15c6415d15a517b04ce9de4bae52bc7 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/cet-notrack-1a.c
+++ b/gcc/testsuite/gcc.target/i386/cet-notrack-1a.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O0 -fcf-protection=none -mno-cet" } */
+/* { dg-options "-O0 -fcf-protection=none" } */
 /* { dg-final { scan-assembler-not "endbr" } } */
 /* { dg-final { scan-assembler-not "notrack call\[ \t]+" } } */
 

diff --git a/gcc/testsuite/gcc.target/i386/cet-notrack-1b.c b/gcc/testsuite/gcc.target/i386/cet-notrack-1b.c
index 6faf88fdf0424771d9c8eb5d3d1d6801bcc8b7df..d1a3337ac21584c60a88a6b89e778dafc9950c26 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/cet-notrack-1b.c
+++ b/gcc/testsuite/gcc.target/i386/cet-notrack-1b.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O -fcf-protection -mcet" } */
+/* { dg-options "-O -fcf-protection" } */
 /* { dg-final { scan-assembler-times "endbr32" 1 { target ia32 } } } */
 /* { dg-final { scan-assembler-times "endbr64" 1 { target { ! ia32 } } } } */
 /* { dg-final { scan-assembler-times "notrack call\[ \t]+" 2 } } */

diff --git a/gcc/testsuite/gcc.target/i386/cet-notrack-2a.c b/gcc/testsuite/gcc.target/i386/cet-notrack-2a.c
index 6f441e49edfb481f5d978acdf8030f2fa709da47..76b0e2d5611ea4e5fb773ca0bccb104d460650b4 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/cet-notrack-2a.c
+++ b/gcc/testsuite/gcc.target/i386/cet-notrack-2a.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O -fcf-protection -mcet" } */
+/* { dg-options "-O -fcf-protection" } */
 /* { dg-final { scan-assembler-times "endbr32" 1 { target ia32 } } } */
 /* { dg-final { scan-assembler-times "endbr64" 1 { target { ! ia32 } } } } */
 /* { dg-final { scan-assembler-times "notrack call\[ \t]+" 1 } } */

diff --git a/gcc/testsuite/gcc.target/i386/cet-notrack-2b.c b/gcc/testsuite/gcc.target/i386/cet-notrack-2b.c
index 0df46450e8803c87b58994af26b2d66b34068b95..8b4952d40bb339b240b1e116e2acc359ca7f1f5d 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/cet-notrack-2b.c
+++ b/gcc/testsuite/gcc.target/i386/cet-notrack-2b.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fcf-protection -mcet" } */
+/* { dg-options "-O2 -fcf-protection" } */
 /* { dg-final { scan-assembler-times "endbr32" 1 { target ia32 } } } */
 /* { dg-final { scan-assembler-times "endbr64" 1 { target { ! ia32 } } } } */
 /* { dg-final { scan-assembler-times "notrack jmp\[ \t]+" 1 } } */

diff --git a/gcc/testsuite/gcc.target/i386/cet-notrack-3.c b/gcc/testsuite/gcc.target/i386/cet-notrack-3.c
index 5e124c7f95c89b26c0e9759b21969cdacb0b61f0..709eda6b77ec695378f30cc313f3bb2190c7b2a7 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/cet-notrack-3.c
+++ b/gcc/testsuite/gcc.target/i386/cet-notrack-3.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O -fcf-protection -mcet" } */
+/* { dg-options "-O -fcf-protection" } */
 /* { dg-final { scan-assembler-times "endbr32" 1 { target ia32 } } } */
 /* { dg-final { scan-assembler-times "endbr64" 1 { target { ! ia32 } } } } */
 /* { dg-final { scan-assembler-times "notrack call\[ \t]+" 1 } } */

diff --git a/gcc/testsuite/gcc.target/i386/cet-notrack-4a.c b/gcc/testsuite/gcc.target/i386/cet-notrack-4a.c
index 34cfd9098c2dd720262706e97bcd3f07c4f2296b..c8ff6de1cc84ee3ebe9822764377e3030f614708 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/cet-notrack-4a.c
+++ b/gcc/testsuite/gcc.target/i386/cet-notrack-4a.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-fcf-protection=none -mno-cet" } */
+/* { dg-options "-fcf-protection=none" } */
 
 int var1 __attribute__((nocf_check)); /* { dg-warning "'nocf_check' attribute only applies to function types" } */
 int *var2 __attribute__((nocf_check)); /* { dg-warning "'nocf_check' attribute only applies to function types" } */

diff --git a/gcc/testsuite/gcc.target/i386/cet-notrack-4b.c b/gcc/testsuite/gcc.target/i386/cet-notrack-4b.c
index 6065ef69c25cb9284e1636a97670114cf1972382..68226b7d0da4e082e5bd8cb5503a7987c855e326 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/cet-notrack-4b.c
+++ b/gcc/testsuite/gcc.target/i386/cet-notrack-4b.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O -fcf-protection -mcet" } */
+/* { dg-options "-O -fcf-protection" } */
 
 int var1 __attribute__((nocf_check)); /* { dg-warning "'nocf_check' attribute only applies to function types" } */
 int *var2 __attribute__((nocf_check)); /* { dg-warning "'nocf_check' attribute only applies to function types" } */

diff --git a/gcc/testsuite/gcc.target/i386/cet-notrack-5a.c b/gcc/testsuite/gcc.target/i386/cet-notrack-5a.c
index d23968e58d1ccee3a413690d188061702b4ac850..50fe0db7d0c8cb132fddffa82db93976ffcaf5b9 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/cet-notrack-5a.c
+++ b/gcc/testsuite/gcc.target/i386/cet-notrack-5a.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O -fcf-protection -mcet" } */
+/* { dg-options "-O -fcf-protection" } */
 /* { dg-final { scan-assembler-times "endbr32" 1 { target ia32 } } } */
 /* { dg-final { scan-assembler-times "endbr64" 1 { target { ! ia32 } } } } */
 /* { dg-final { scan-assembler-not "\tcall\[ \t]+" } } */

diff --git a/gcc/testsuite/gcc.target/i386/cet-notrack-5b.c b/gcc/testsuite/gcc.target/i386/cet-notrack-5b.c
index 42d9d07b19d0b804f35af8bd82f101229ede9884..222ff62d6709ba92cd636da26479c965c633d5e5 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/cet-notrack-5b.c
+++ b/gcc/testsuite/gcc.target/i386/cet-notrack-5b.c
@@ -1,6 +1,6 @@
 /* Check the attribute do not proparate through assignment.  */
 /* { dg-do compile } */
-/* { dg-options "-O -fcf-protection -mcet" } */
+/* { dg-options "-O -fcf-protection" } */
 /* { dg-final { scan-assembler-times "endbr32" 1 { target ia32 } } } */
 /* { dg-final { scan-assembler-times "endbr64" 1 { target { ! ia32 } } } } */
 /* { dg-final { scan-assembler-times "\tcall\[ \t]+" 1 } } */

diff --git a/gcc/testsuite/gcc.target/i386/cet-notrack-6a.c b/gcc/testsuite/gcc.target/i386/cet-notrack-6a.c
index e0fb4f90aafdaaaac3156b9e84ef0d416967b598..8bbe6e48796c350661e9c7773c54d8ef908741dd 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/cet-notrack-6a.c
+++ b/gcc/testsuite/gcc.target/i386/cet-notrack-6a.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fcf-protection -mcet" } */
+/* { dg-options "-O2 -fcf-protection" } */
 /* { dg-final { scan-assembler-times "endbr32" 1 { target ia32 } } } */
 /* { dg-final { scan-assembler-times "endbr64" 1 { target { ! ia32 } } } } */
 /* { dg-final { scan-assembler-times "\t(?:call|jmp)\[ \t]+.*foo" 1 } } */

diff --git a/gcc/testsuite/gcc.target/i386/cet-notrack-6b.c b/gcc/testsuite/gcc.target/i386/cet-notrack-6b.c
index 1c47c9f7d201c1d3557e50379d4079c73f9f5f13..f27088c7283193a9cf07904f13b367de3cd15b25 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/cet-notrack-6b.c
+++ b/gcc/testsuite/gcc.target/i386/cet-notrack-6b.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O0 -fcf-protection -mcet" } */
+/* { dg-options "-O0 -fcf-protection" } */
 /* { dg-final { scan-assembler-times "endbr32" 1 { target ia32 } } } */
 /* { dg-final { scan-assembler-times "endbr64" 1 { target { ! ia32 } } } } */
 /* { dg-final { scan-assembler-not "\tcall\[ \t]+" } } */

diff --git a/gcc/testsuite/gcc.target/i386/cet-notrack-7.c b/gcc/testsuite/gcc.target/i386/cet-notrack-7.c
index f2e31d0258af5a6dfef7e4375c3f3e8f2842cc3d..ddfa950ec0cc762c9b920300ae4a63b2de6ba063 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/cet-notrack-7.c
+++ b/gcc/testsuite/gcc.target/i386/cet-notrack-7.c
@@ -1,6 +1,6 @@
 /* Check the notrack prefix is not generated for direct call.  */
 /* { dg-do compile } */
-/* { dg-options "-O -fcf-protection -mcet" } */
+/* { dg-options "-O -fcf-protection" } */
 /* { dg-final { scan-assembler-times "endbr32" 1 { target ia32 } } } */
 /* { dg-final { scan-assembler-times "endbr64" 1 { target { ! ia32 } } } } */
 /* { dg-final { scan-assembler-times "notrack call\[ \t]+.*foo" 0 } } */

diff --git a/gcc/testsuite/gcc.target/i386/cet-notrack-icf-2.c b/gcc/testsuite/gcc.target/i386/cet-notrack-icf-2.c
index db0b0a44237f7f2b0af50cfc95430d2a01a72e08..08132a3e7ac1d38967ff1f15e189f1514d1669fa 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/cet-notrack-icf-2.c
+++ b/gcc/testsuite/gcc.target/i386/cet-notrack-icf-2.c
@@ -1,6 +1,6 @@
 /* Verify nocf_check functions are not ICF optimized.  */
 /* { dg-do compile } */
-/* { dg-options "-O2 -fcf-protection -mcet" } */
+/* { dg-options "-O2 -fcf-protection" } */
 /* { dg-final { scan-assembler "endbr" } } */
 /* { dg-final { scan-assembler "fn3:" } } */
 /* { dg-final { scan-assembler "set\[ \t]+fn2,fn1" } } */

diff --git a/gcc/testsuite/gcc.target/i386/cet-notrack-icf-4.c b/gcc/testsuite/gcc.target/i386/cet-notrack-icf-4.c
index e4e96aaf0dcd0057fe357b1660709aaf1a5ef898..b5f07876b5290e1f7a8bb4a0c3aeabb5b4ee54b4 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/cet-notrack-icf-4.c
+++ b/gcc/testsuite/gcc.target/i386/cet-notrack-icf-4.c
@@ -1,6 +1,6 @@
 /* Verify nocf_check function calls are not ICF optimized.  */
 /* { dg-do compile } */
-/* { dg-options "-O2 -fcf-protection -mcet" } */
+/* { dg-options "-O2 -fcf-protection" } */
 /* { dg-final { scan-assembler "endbr" } } */
 /* { dg-final { scan-assembler "fn2:" } } */
 /* { dg-final { scan-assembler "set\[ \t]+fn3,fn1" } } */

diff --git a/gcc/testsuite/gcc.target/i386/cet-property-1.c b/gcc/testsuite/gcc.target/i386/cet-property-1.c
index df243efc574cee9fdf0cb24dd7f27216a46064b0..3e211c970aad3ba76e4046f9440fb0e133a33638 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/cet-property-1.c
+++ b/gcc/testsuite/gcc.target/i386/cet-property-1.c
@@ -1,5 +1,5 @@
 /* { dg-do compile { target *-*-linux* } } */
-/* { dg-options "-fcf-protection -mcet" } */
+/* { dg-options "-fcf-protection" } */
 /* { dg-final { scan-assembler ".note.gnu.property" } } */
 
 extern void foo (void);

diff --git a/gcc/testsuite/gcc.target/i386/cet-property-2.c b/gcc/testsuite/gcc.target/i386/cet-property-2.c
index bca6f6cdeb742e1eb40a28231af97c17c826e5ee..fae3db5f63fdc9d0b0e401900bfa8a020ee762f2 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/cet-property-2.c
+++ b/gcc/testsuite/gcc.target/i386/cet-property-2.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-mcet -fcf-protection=none" } */
+/* { dg-options "-fcf-protection=none" } */
 /* { dg-final { scan-assembler-not ".note.gnu.property" } } */
 
 extern void foo (void);

diff --git a/gcc/testsuite/gcc.target/i386/cet-property-3.c b/gcc/testsuite/gcc.target/i386/cet-property-3.c
deleted file mode 100644 (file)
index 3e211c9..0000000
--- a/gcc/testsuite/gcc.target/i386/cet-property-3.c
+++ /dev/null
@@ -1,11 +0,0 @@
-/* { dg-do compile { target *-*-linux* } } */
-/* { dg-options "-fcf-protection" } */
-/* { dg-final { scan-assembler ".note.gnu.property" } } */
-
-extern void foo (void);
-
-void
-bar (void)
-{
-  foo ();
-}

diff --git a/gcc/testsuite/gcc.target/i386/cet-rdssp-1.c b/gcc/testsuite/gcc.target/i386/cet-rdssp-1.c
index 6cd24f63384b943851a6e87fbda1d32ad38132f6..481a0e78a10b93feaaa6be6788bc6ebfd1efc4f3 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/cet-rdssp-1.c
+++ b/gcc/testsuite/gcc.target/i386/cet-rdssp-1.c
@@ -1,5 +1,5 @@
 /* { dg-do run { target cet } } */
-/* { dg-options "-O2 -fcf-protection -mcet" } */
+/* { dg-options "-O2 -fcf-protection -mshstk" } */
 
 void _exit(int status) __attribute__ ((__noreturn__));
 

diff --git a/gcc/testsuite/gcc.target/i386/cet-sjlj-1.c b/gcc/testsuite/gcc.target/i386/cet-sjlj-1.c
index d80ab051c37e1628634040989badb067f285082a..5e34810babc4534c403f7f25e0b39956a39fbd55 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/cet-sjlj-1.c
+++ b/gcc/testsuite/gcc.target/i386/cet-sjlj-1.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O -fcf-protection -mcet" } */
+/* { dg-options "-O -fcf-protection" } */
 /* { dg-final { scan-assembler-times "endbr32" 4 { target ia32 } } } */
 /* { dg-final { scan-assembler-times "endbr64" 4 { target { ! ia32 } } } } */
 /* { dg-final { scan-assembler-times "rdssp\[dq]" 2 } } */

diff --git a/gcc/testsuite/gcc.target/i386/cet-sjlj-2.c b/gcc/testsuite/gcc.target/i386/cet-sjlj-2.c
index c97094a19c9e18549f2a00bca965a881b9940f76..49c9dc2ccec0e2041cdb0d91d84939f163ced06d 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/cet-sjlj-2.c
+++ b/gcc/testsuite/gcc.target/i386/cet-sjlj-2.c
@@ -1,4 +1,4 @@
 /* { dg-do run { target cet } } */
-/* { dg-options "-O -fcf-protection -mcet" } */
+/* { dg-options "-O -fcf-protection" } */
 
 #include "cet-sjlj-1.c"

diff --git a/gcc/testsuite/gcc.target/i386/cet-sjlj-3.c b/gcc/testsuite/gcc.target/i386/cet-sjlj-3.c
index 585f4d7ae8968c422e30c5763e433cb8621bbaf5..25117cc0c9fdff9fa09308c4a9eceb6cf52bea08 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/cet-sjlj-3.c
+++ b/gcc/testsuite/gcc.target/i386/cet-sjlj-3.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O -fcf-protection -mcet" } */
+/* { dg-options "-O -fcf-protection" } */
 /* { dg-final { scan-assembler-times "endbr32" 4 { target ia32 } } } */
 /* { dg-final { scan-assembler-times "endbr64" 4 { target { ! ia32 } } } } */
 /* { dg-final { scan-assembler-times "call     _?setjmp" 1 } } */

diff --git a/gcc/testsuite/gcc.target/i386/cet-sjlj-4.c b/gcc/testsuite/gcc.target/i386/cet-sjlj-4.c
index 6a57cede2084630f3719e960850833f91d088e09..329a592f4b2c2317337f3486a7a9679f1d9b4c29 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/cet-sjlj-4.c
+++ b/gcc/testsuite/gcc.target/i386/cet-sjlj-4.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O -fcf-protection -mcet" } */
+/* { dg-options "-O -fcf-protection" } */
 /* { dg-final { scan-assembler-times "endbr32" 3 { target ia32 } } } */
 /* { dg-final { scan-assembler-times "endbr64" 3 { target { ! ia32 } } } } */
 /* { dg-final { scan-assembler-times "rdssp\[dq]" 2 } } */

diff --git a/gcc/testsuite/gcc.target/i386/cet-sjlj-5.c b/gcc/testsuite/gcc.target/i386/cet-sjlj-5.c
index 8e54b4bfec8d757e462073dd4a2009f390cf507c..1b624327d0f4684de59c76935cad193e58ae6821 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/cet-sjlj-5.c
+++ b/gcc/testsuite/gcc.target/i386/cet-sjlj-5.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O -fcf-protection -mcet" } */
+/* { dg-options "-O -fcf-protection" } */
 /* { dg-final { scan-assembler-times "endbr32" 2 { target ia32 } } } */
 /* { dg-final { scan-assembler-times "endbr64" 2 { target { ! ia32 } } } } */
 /* { dg-final { scan-assembler-times "call     _?setjmp" 1 } } */

diff --git a/gcc/testsuite/gcc.target/i386/cet-sjlj-6a.c b/gcc/testsuite/gcc.target/i386/cet-sjlj-6a.c
index 87fe2e6dc67876b50665d631c3ac62ab118e3e04..040b297aeb023f9347a7afa2508e702914fbf58c 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/cet-sjlj-6a.c
+++ b/gcc/testsuite/gcc.target/i386/cet-sjlj-6a.c
@@ -1,6 +1,6 @@
 /* { dg-do compile { target { ! ia32 } } } */
 /* { dg-require-effective-target maybe_x32 } */
-/* { dg-options "-O -maddress-mode=short -fcf-protection -mcet -mx32" } */
+/* { dg-options "-O -maddress-mode=short -fcf-protection -mx32" } */
 /* { dg-final { scan-assembler-times "endbr64" 2 } } */
 /* { dg-final { scan-assembler-times "movq\t.*buf\\+8" 1 } } */
 /* { dg-final { scan-assembler-times "subq\tbuf\\+8" 1 } } */

diff --git a/gcc/testsuite/gcc.target/i386/cet-sjlj-6b.c b/gcc/testsuite/gcc.target/i386/cet-sjlj-6b.c
index b3866d52946fb864784f1d6ab46c1d35f50893db..6ec4b834bfbdff49133c3a85a23540e4f62d35ac 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/cet-sjlj-6b.c
+++ b/gcc/testsuite/gcc.target/i386/cet-sjlj-6b.c
@@ -1,5 +1,5 @@
 /* { dg-do compile { target { ! ia32 } } } */
-/* { dg-options "-O -maddress-mode=long -fcf-protection -mcet -mx32" } */
+/* { dg-options "-O -maddress-mode=long -fcf-protection -mx32" } */
 /* { dg-final { scan-assembler-times "endbr64" 2 } } */
 /* { dg-final { scan-assembler-times "movq\t.*buf\\+16" 1 } } */
 /* { dg-final { scan-assembler-times "subq\tbuf\\+16" 1 } } */

diff --git a/gcc/testsuite/gcc.target/i386/cet-sjlj-7.c b/gcc/testsuite/gcc.target/i386/cet-sjlj-7.c
deleted file mode 100644 (file)
index 1b62432..0000000
--- a/gcc/testsuite/gcc.target/i386/cet-sjlj-7.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/* { dg-do compile } */
-/* { dg-options "-O -fcf-protection" } */
-/* { dg-final { scan-assembler-times "endbr32" 2 { target ia32 } } } */
-/* { dg-final { scan-assembler-times "endbr64" 2 { target { ! ia32 } } } } */
-/* { dg-final { scan-assembler-times "call     _?setjmp" 1 } } */
-/* { dg-final { scan-assembler-times "call     longjmp" 1 } } */
-
-#include <stdio.h>
-#include <setjmp.h>
-
-jmp_buf buf;
-static int bar (int);
-
-__attribute__ ((noinline, noclone))
-static int
-foo (int i)
-{
-  int j = i * 11;
-
-  if (!setjmp (buf))
-    {
-      j += 33;
-      printf ("After setjmp: j = %d\n", j);
-      bar (j);
-    }
-
-  return j + i;
-}
-
-__attribute__ ((noinline, noclone))
-static int
-bar (int i)
-{
- int j = i;
-
-  j -= 111;
-  printf ("In longjmp: j = %d\n", j);
-  longjmp (buf, 1);
-
-  return j;
-}
-
-int
-main ()
-{
-  foo (10);
-  return 0;
-}

diff --git a/gcc/testsuite/gcc.target/i386/cet-switch-1.c b/gcc/testsuite/gcc.target/i386/cet-switch-1.c
index 7a75857fcb11f1c0d5afa774e6c337cdd6fa13ba..afe5adc2f3dfe28d62510d374392db98a038b6e4 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/cet-switch-1.c
+++ b/gcc/testsuite/gcc.target/i386/cet-switch-1.c
@@ -1,6 +1,6 @@
 /* Verify that CET works.  */
 /* { dg-do compile } */
-/* { dg-options "-O -fcf-protection -mcet" } */
+/* { dg-options "-O -fcf-protection" } */
 /* { dg-final { scan-assembler-times "endbr32" 1 { target ia32 } } } */
 /* { dg-final { scan-assembler-times "endbr64" 1 { target { ! ia32 } } } } */
 /* { dg-final { scan-assembler-times "notrack jmp\[ \t]+\[*]" 1 } } */

diff --git a/gcc/testsuite/gcc.target/i386/cet-switch-2.c b/gcc/testsuite/gcc.target/i386/cet-switch-2.c
index e620b837a3c499b406c0cb516e63841732f31b7f..69ddc6fd5b74fd46d6f4619b5e5f73c72834c6af 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/cet-switch-2.c
+++ b/gcc/testsuite/gcc.target/i386/cet-switch-2.c
@@ -1,6 +1,6 @@
 /* Verify that CET works.  */
 /* { dg-do compile } */
-/* { dg-options "-O -fcf-protection -mcet -mcet-switch" } */
+/* { dg-options "-O -fcf-protection -mcet-switch" } */
 /* { dg-final { scan-assembler-times "endbr32" 12 { target ia32 } } } */
 /* { dg-final { scan-assembler-times "endbr64" 12 { target { ! ia32 } } } } */
 /* { dg-final { scan-assembler-times "\[ \t]+jmp\[ \t]+\[*]" 1 } } */

diff --git a/gcc/testsuite/gcc.target/i386/cet-switch-3.c b/gcc/testsuite/gcc.target/i386/cet-switch-3.c
index 9b1b436958292447c9a6c00b3ccb8fa823b52311..0d9ed4488dd53ef0c4b37da6ffe8704ea649dac5 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/cet-switch-3.c
+++ b/gcc/testsuite/gcc.target/i386/cet-switch-3.c
@@ -1,6 +1,6 @@
 /* Verify that CET works.  */
 /* { dg-do compile } */
-/* { dg-options "-O -fcf-protection -mcet -mcet-switch" } */
+/* { dg-options "-O -fcf-protection -mcet-switch" } */
 /* { dg-final { scan-assembler-times "endbr32" 12 { target ia32 } } } */
 /* { dg-final { scan-assembler-times "endbr64" 12 { target { ! ia32 } } } } */
 /* { dg-final { scan-assembler-times "\[ \t]+jmp\[ \t]+\[*]" 1 } } */

diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-11.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-11.c
index afa89ff227ba26fee6eee7606f615bd84d679ed7..b6bd51be63a8af860919793b0d830cf9cb69df91 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-11.c
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-11.c
@@ -1,5 +1,5 @@
 /* { dg-do compile { target { ! x32 } } } */
-/* { dg-options "-O2 -mindirect-branch=thunk-extern -fcf-protection -mcet -fcheck-pointer-bounds -mmpx" } */
+/* { dg-options "-O2 -mindirect-branch=thunk-extern -fcf-protection -fcheck-pointer-bounds -mmpx" } */
 
 void
 bar (void)

diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-12.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-12.c
index d456973ee6df81d3f5f59290cac03a1030980f37..2c3848e1fb031b91a87c8517db0ad2fdbfec2baa 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-12.c
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-12.c
@@ -1,5 +1,5 @@
 /* { dg-do compile { target { ! x32 } } } */
-/* { dg-options "-O2 -mindirect-branch=thunk -fcf-protection -mcet -fcheck-pointer-bounds -mmpx" } */
+/* { dg-options "-O2 -mindirect-branch=thunk -fcf-protection -fcheck-pointer-bounds -mmpx" } */
 
 void
 bar (void)

diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-12.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-12.c
index 24a1a08a3ca44947847a61ea8f6234f08cd77954..5da515690d4d6dc80de44b30586301a78c6f8db5 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-12.c
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-12.c
@@ -1,5 +1,5 @@
 /* { dg-do compile { target { ! x32 } } } */
-/* { dg-options "-O2 -mindirect-branch=keep -fcf-protection -mcet -fcheck-pointer-bounds -mmpx" } */
+/* { dg-options "-O2 -mindirect-branch=keep -fcf-protection -fcheck-pointer-bounds -mmpx" } */
 
 __attribute__ ((indirect_branch("thunk-extern")))
 void

diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-13.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-13.c
index ff2fccae9358f36ec6be4baaa0d18a32e88c992f..a671e46009882842b63a1a5f8bc59c68984f61fb 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-13.c
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-13.c
@@ -1,5 +1,5 @@
 /* { dg-do compile { target { ! x32 } } } */
-/* { dg-options "-O2 -mindirect-branch=keep -fcf-protection -mcet -fcheck-pointer-bounds -mmpx" } */
+/* { dg-options "-O2 -mindirect-branch=keep -fcf-protection -fcheck-pointer-bounds -mmpx" } */
 
 __attribute__ ((indirect_branch("thunk-inline")))
 void

diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-14.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-14.c
index 669e56d7726ca4bace0b2348d443f1cb1556a228..eb25139da6d1ffcf01963dbda658a3a091241b41 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-14.c
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-14.c
@@ -1,5 +1,5 @@
 /* { dg-do compile { target *-*-linux* } } */
-/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep -fno-pic -fplt -mindirect-branch=keep -fcf-protection -mcet" } */
+/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep -fno-pic -fplt -mindirect-branch=keep -fcf-protection" } */
 
 extern void (*bar) (void);
 

diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-15.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-15.c
index c033fb238792f38b930f785bfedd7a00d9eaa794..1ad459e3b19b308cb7138a6783db1bd5ebfe170c 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-15.c
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-15.c
@@ -1,5 +1,5 @@
 /* { dg-do compile { target *-*-linux* } } */
-/* { dg-options "-O2 -mindirect-branch-register -mfunction-return=keep -fno-pic -fplt -mindirect-branch=keep -fcf-protection -mcet" } */
+/* { dg-options "-O2 -mindirect-branch-register -mfunction-return=keep -fno-pic -fplt -mindirect-branch=keep -fcf-protection" } */
 
 extern void (*bar) (void);
 

diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-16.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-16.c
index 0244edf53b7f6f39c251d6a49e812194baf5cf3c..86fe035bc9a93e5e57a5f63af6cb390ab71dcee1 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-16.c
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-attr-16.c
@@ -1,5 +1,5 @@
 /* { dg-do compile { target *-*-linux* } } */
-/* { dg-options "-O2 -mindirect-branch-register -mfunction-return=keep -fno-pic -fplt -mindirect-branch=keep -fcf-protection -mcet" } */
+/* { dg-options "-O2 -mindirect-branch-register -mfunction-return=keep -fno-pic -fplt -mindirect-branch=keep -fcf-protection" } */
 
 extern void (*bar) (void) __attribute__((nocf_check));
 

diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-10.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-10.c
index 2a982ab69f8d15bb7f8874fadb764c3910dcb8f3..95731d6f36575cb0e4c0292bd3b96662bc5ac383 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-10.c
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-10.c
@@ -1,5 +1,5 @@
 /* { dg-do compile { target *-*-linux* } } */
-/* { dg-options "-O2 -mindirect-branch-register -mfunction-return=keep -fno-pic -fplt -mindirect-branch=thunk-extern -fcf-protection -mcet" } */
+/* { dg-options "-O2 -mindirect-branch-register -mfunction-return=keep -fno-pic -fplt -mindirect-branch=thunk-extern -fcf-protection" } */
 
 extern void (*bar) (void) __attribute__((nocf_check));
 

diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-8.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-8.c
index 30d12cc07114ae7e1f34ed1d830a0b352305eab9..0c61516732a3ad90994cefc4daaba2e1bb696df8 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-8.c
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-8.c
@@ -1,5 +1,5 @@
 /* { dg-do compile { target *-*-linux* } } */
-/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep -fno-pic -fplt -mindirect-branch=thunk-extern -fcf-protection -mcet" } */
+/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep -fno-pic -fplt -mindirect-branch=thunk-extern -fcf-protection" } */
 
 extern void (*bar) (void);
 

diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-9.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-9.c
index d714b0155dfdc29dce24f6f0138eabd052f6d1e8..731d4c4e6e9b7beb6cb8894c36aabc76dad7d2dd 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-9.c
+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-extern-9.c
@@ -1,5 +1,5 @@
 /* { dg-do compile { target *-*-linux* } } */
-/* { dg-options "-O2 -mindirect-branch-register -mfunction-return=keep -fno-pic -fplt -mindirect-branch=thunk-extern -fcf-protection -mcet" } */
+/* { dg-options "-O2 -mindirect-branch-register -mfunction-return=keep -fno-pic -fplt -mindirect-branch=thunk-extern -fcf-protection" } */
 
 extern void (*bar) (void);
 

diff --git a/gcc/testsuite/gcc.target/i386/pr82659-1.c b/gcc/testsuite/gcc.target/i386/pr82659-1.c
index 485771d0f38a3740c5fcea70e0a89d5f709df2ba..62898cfdeb6052e0724fce7db8a88f80f88144fd 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/pr82659-1.c
+++ b/gcc/testsuite/gcc.target/i386/pr82659-1.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fcf-protection -mcet" } */
+/* { dg-options "-O2 -fcf-protection" } */
 /* { dg-final { scan-assembler-times {\mendbr} 1 } } */
 
 extern int x;

diff --git a/gcc/testsuite/gcc.target/i386/pr82659-2.c b/gcc/testsuite/gcc.target/i386/pr82659-2.c
index 7afffa440aa71a824b5a9d5e38f64a0ac66a4f7f..574a0b60ab488772dce7bad6cac39629905b5c6b 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/pr82659-2.c
+++ b/gcc/testsuite/gcc.target/i386/pr82659-2.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fcf-protection -mcet" } */
+/* { dg-options "-O2 -fcf-protection" } */
 /* { dg-final { scan-assembler-times {\mendbr} 2 } } */
 
 extern int x;

diff --git a/gcc/testsuite/gcc.target/i386/pr82659-3.c b/gcc/testsuite/gcc.target/i386/pr82659-3.c
index 5f97b3140926ab58264b1a51c01decc98c71d2df..3bb83e309e7f0b205662c6835ef025c8da394f7f 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/pr82659-3.c
+++ b/gcc/testsuite/gcc.target/i386/pr82659-3.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fcf-protection -mcet" } */
+/* { dg-options "-O2 -fcf-protection" } */
 /* { dg-final { scan-assembler-times {\mendbr} 2 } } */
 
 extern int x;

diff --git a/gcc/testsuite/gcc.target/i386/pr82659-4.c b/gcc/testsuite/gcc.target/i386/pr82659-4.c
index c3cacaccbef8070bbc4bc1db2fe6f1883c8e4ac6..ea5b2a16a50eff53fd6b5546a5fc4beb8e75b588 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/pr82659-4.c
+++ b/gcc/testsuite/gcc.target/i386/pr82659-4.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fcf-protection -mcet" } */
+/* { dg-options "-O2 -fcf-protection" } */
 /* { dg-final { scan-assembler-times {\mendbr} 2 } } */
 
 static void

diff --git a/gcc/testsuite/gcc.target/i386/pr82659-5.c b/gcc/testsuite/gcc.target/i386/pr82659-5.c
index 95413671d5cb378e522c973330d481c9861471d1..4ba4fab755edf4bb386b74f3d5fddf61929fb860 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/pr82659-5.c
+++ b/gcc/testsuite/gcc.target/i386/pr82659-5.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fcf-protection -mcet" } */
+/* { dg-options "-O2 -fcf-protection" } */
 /* { dg-final { scan-assembler-times {\mendbr} 1 } } */
 
 static void

diff --git a/gcc/testsuite/gcc.target/i386/pr82659-6.c b/gcc/testsuite/gcc.target/i386/pr82659-6.c
index 51fc1a9f5c9df438a816776ad7ba9467f33d37f4..99ed68959d067c9dd22f500a4e83ccb3abe2d806 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/pr82659-6.c
+++ b/gcc/testsuite/gcc.target/i386/pr82659-6.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fcf-protection -mcet" } */
+/* { dg-options "-O2 -fcf-protection" } */
 /* { dg-final { scan-assembler-times {\mendbr} 2 } } */
 
 extern int x;

diff --git a/gcc/testsuite/gcc.target/i386/pr84146.c b/gcc/testsuite/gcc.target/i386/pr84146.c
index a14baa47532fa627f3efc7a29a35c002927ecf26..e0da81833a04892a908d8f5edacff443cd46d25f 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/pr84146.c
+++ b/gcc/testsuite/gcc.target/i386/pr84146.c
@@ -1,6 +1,6 @@
 /* PR target/84146 */
 /* { dg-do compile } */
-/* { dg-options "-O2 -g -mcet -fcf-protection=full -fcompare-debug" } */
+/* { dg-options "-O2 -g -fcf-protection=full -fcompare-debug" } */
 
 int __setjmp (void **);
 void *buf[64];

diff --git a/gcc/testsuite/gcc.target/i386/pr85403.c b/gcc/testsuite/gcc.target/i386/pr85403.c
index 0bbd7ca561056563426293c09d859b788231a03f..d74b545e3bacadaa2198ef4e4b33b1366f8f20ab 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/pr85403.c
+++ b/gcc/testsuite/gcc.target/i386/pr85403.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-fcf-protection -mcet" } */
+/* { dg-options "-fcf-protection" } */
 /* { dg-require-ifunc "" } */
 
 __attribute__((target_clones("avx","arch=slm","arch=core-avx2","default")))

diff --git a/gcc/testsuite/gcc.target/i386/pr85404.c b/gcc/testsuite/gcc.target/i386/pr85404.c
index 0194f7b7edde3e885e5bf027d63235db67d3efb4..882d8ab78758e936ac615697b1ccf1f6fbd8485d 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/pr85404.c
+++ b/gcc/testsuite/gcc.target/i386/pr85404.c
@@ -1,5 +1,5 @@
 /* { dg-do assemble { target cet } } */
-/* { dg-options "-fleading-underscore -mcet -fcf-protection" } */
+/* { dg-options "-fleading-underscore -fcf-protection" } */
 
 void func(void) __asm("_func");
 void _func(int x) {}