[4/5] x86/CET tests: Remove -mcet/-mno-cet or replace -mcet with -mshstk

Message ID 20180422134825.7165-5-hjl.tools@gmail.com
State New
Headers show
Series
  • x86/CET: Remove the -mcet command-lint option
Related show

Commit Message

H.J. Lu April 22, 2018, 1:48 p.m.
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/pr85345.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.
---
 gcc/testsuite/g++.dg/cet-notrack-1.C               |  2 +-
 gcc/testsuite/g++.dg/torture/pr85334.C             |  2 +-
 gcc/testsuite/gcc.dg/pr85388-1.c                   |  2 +-
 gcc/testsuite/gcc.dg/pr85388-2.c                   |  2 +-
 gcc/testsuite/gcc.dg/pr85388-3.c                   |  2 +-
 gcc/testsuite/gcc.dg/pr85388-4.c                   |  2 +-
 gcc/testsuite/gcc.dg/pr85388-5.c                   |  2 +-
 gcc/testsuite/gcc.dg/pr85388-6.c                   |  4 +-
 gcc/testsuite/gcc.dg/torture/pr85397-1.c           |  2 +-
 gcc/testsuite/gcc.target/i386/attr-nocf-check-1a.c |  2 +-
 gcc/testsuite/gcc.target/i386/attr-nocf-check-3a.c |  2 +-
 gcc/testsuite/gcc.target/i386/cet-intrin-10.c      |  2 +-
 gcc/testsuite/gcc.target/i386/cet-intrin-3.c       |  2 +-
 gcc/testsuite/gcc.target/i386/cet-intrin-5.c       |  2 +-
 gcc/testsuite/gcc.target/i386/cet-intrin-6.c       |  2 +-
 gcc/testsuite/gcc.target/i386/cet-intrin-7.c       |  2 +-
 gcc/testsuite/gcc.target/i386/cet-intrin-8.c       |  2 +-
 gcc/testsuite/gcc.target/i386/cet-intrin-9.c       |  2 +-
 gcc/testsuite/gcc.target/i386/cet-label-2.c        |  2 +-
 gcc/testsuite/gcc.target/i386/cet-label-3.c        | 16 --------
 gcc/testsuite/gcc.target/i386/cet-label.c          |  4 +-
 gcc/testsuite/gcc.target/i386/cet-notrack-1a.c     |  2 +-
 gcc/testsuite/gcc.target/i386/cet-notrack-1b.c     |  2 +-
 gcc/testsuite/gcc.target/i386/cet-notrack-2a.c     |  2 +-
 gcc/testsuite/gcc.target/i386/cet-notrack-2b.c     |  2 +-
 gcc/testsuite/gcc.target/i386/cet-notrack-3.c      |  2 +-
 gcc/testsuite/gcc.target/i386/cet-notrack-4a.c     |  2 +-
 gcc/testsuite/gcc.target/i386/cet-notrack-4b.c     |  2 +-
 gcc/testsuite/gcc.target/i386/cet-notrack-5a.c     |  2 +-
 gcc/testsuite/gcc.target/i386/cet-notrack-5b.c     |  2 +-
 gcc/testsuite/gcc.target/i386/cet-notrack-6a.c     |  2 +-
 gcc/testsuite/gcc.target/i386/cet-notrack-6b.c     |  2 +-
 gcc/testsuite/gcc.target/i386/cet-notrack-7.c      |  2 +-
 gcc/testsuite/gcc.target/i386/cet-notrack-icf-2.c  |  2 +-
 gcc/testsuite/gcc.target/i386/cet-notrack-icf-4.c  |  2 +-
 gcc/testsuite/gcc.target/i386/cet-property-1.c     |  2 +-
 gcc/testsuite/gcc.target/i386/cet-property-2.c     |  2 +-
 gcc/testsuite/gcc.target/i386/cet-property-3.c     | 11 -----
 gcc/testsuite/gcc.target/i386/cet-rdssp-1.c        |  2 +-
 gcc/testsuite/gcc.target/i386/cet-sjlj-1.c         |  2 +-
 gcc/testsuite/gcc.target/i386/cet-sjlj-2.c         |  2 +-
 gcc/testsuite/gcc.target/i386/cet-sjlj-3.c         |  2 +-
 gcc/testsuite/gcc.target/i386/cet-sjlj-4.c         |  2 +-
 gcc/testsuite/gcc.target/i386/cet-sjlj-5.c         |  2 +-
 gcc/testsuite/gcc.target/i386/cet-sjlj-6a.c        |  2 +-
 gcc/testsuite/gcc.target/i386/cet-sjlj-6b.c        |  2 +-
 gcc/testsuite/gcc.target/i386/cet-sjlj-7.c         | 48 ----------------------
 gcc/testsuite/gcc.target/i386/cet-switch-1.c       |  2 +-
 gcc/testsuite/gcc.target/i386/cet-switch-2.c       |  2 +-
 gcc/testsuite/gcc.target/i386/cet-switch-3.c       |  2 +-
 gcc/testsuite/gcc.target/i386/indirect-thunk-11.c  |  2 +-
 gcc/testsuite/gcc.target/i386/indirect-thunk-12.c  |  2 +-
 .../gcc.target/i386/indirect-thunk-attr-12.c       |  2 +-
 .../gcc.target/i386/indirect-thunk-attr-13.c       |  2 +-
 .../gcc.target/i386/indirect-thunk-attr-14.c       |  2 +-
 .../gcc.target/i386/indirect-thunk-attr-15.c       |  2 +-
 .../gcc.target/i386/indirect-thunk-attr-16.c       |  2 +-
 .../gcc.target/i386/indirect-thunk-extern-10.c     |  2 +-
 .../gcc.target/i386/indirect-thunk-extern-8.c      |  2 +-
 .../gcc.target/i386/indirect-thunk-extern-9.c      |  2 +-
 gcc/testsuite/gcc.target/i386/pr82659-1.c          |  2 +-
 gcc/testsuite/gcc.target/i386/pr82659-2.c          |  2 +-
 gcc/testsuite/gcc.target/i386/pr82659-3.c          |  2 +-
 gcc/testsuite/gcc.target/i386/pr82659-4.c          |  2 +-
 gcc/testsuite/gcc.target/i386/pr82659-5.c          |  2 +-
 gcc/testsuite/gcc.target/i386/pr82659-6.c          |  2 +-
 gcc/testsuite/gcc.target/i386/pr84146.c            |  2 +-
 gcc/testsuite/gcc.target/i386/pr85345.c            |  2 +-
 gcc/testsuite/gcc.target/i386/pr85403.c            |  2 +-
 gcc/testsuite/gcc.target/i386/pr85404.c            |  2 +-
 70 files changed, 69 insertions(+), 144 deletions(-)
 delete mode 100644 gcc/testsuite/gcc.target/i386/cet-label-3.c
 delete mode 100644 gcc/testsuite/gcc.target/i386/cet-property-3.c
 delete mode 100644 gcc/testsuite/gcc.target/i386/cet-sjlj-7.c

-- 
2.14.3

Patch

diff --git a/gcc/testsuite/g++.dg/cet-notrack-1.C b/gcc/testsuite/g++.dg/cet-notrack-1.C
index 43dbbd6a7f3..eab0946d477 100644
--- 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 080978143bd..a282edc88e9 100644
--- 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 86d4737e32b..8176118e71e 100644
--- 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 fd13d984c50..075ab9ed563 100644
--- 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 730d2be9c22..232ef20acf0 100644
--- 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 03937d0e735..8a3cc14f205 100644
--- 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 7462a40892c..6c161b9c5ae 100644
--- 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 23b5d8e3df6..b218dfc6144 100644
--- 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 65085240266..46e31d1790b 100644
--- 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 9549e697658..f2751e8c814 100644
--- 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 1a833012409..9924cdc80f0 100644
--- 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 695dc5edc34..76326c31c8e 100644
--- 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 b98c1e928d5..e1080d76753 100644
--- 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 8a1b637905c..59ba1bc0761 100644
--- 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 dfa6d20ca26..7874288d1f5 100644
--- 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 ecd1825a303..40770efdb4e 100644
--- 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 2188876cca5..85633b0440b 100644
--- 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 569931a9492..22c3fc0baf2 100644
--- 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 c7f79819079..8058117b036 100644
--- 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
index 5e0892e5b4d..00000000000
--- 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 8fb8d420349..ea48f4161eb 100644
--- 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 ab0bd3ba9b2..d8d2e5a6d15 100644
--- 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 6faf88fdf04..d1a3337ac21 100644
--- 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 6f441e49edf..76b0e2d5611 100644
--- 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 0df46450e88..8b4952d40bb 100644
--- 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 5e124c7f95c..709eda6b77e 100644
--- 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 34cfd9098c2..c8ff6de1cc8 100644
--- 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 6065ef69c25..68226b7d0da 100644
--- 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 d23968e58d1..50fe0db7d0c 100644
--- 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 42d9d07b19d..222ff62d670 100644
--- 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 e0fb4f90aaf..8bbe6e48796 100644
--- 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 1c47c9f7d20..f27088c7283 100644
--- 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 f2e31d0258a..ddfa950ec0c 100644
--- 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 db0b0a44237..08132a3e7ac 100644
--- 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 e4e96aaf0dc..b5f07876b52 100644
--- 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 df243efc574..3e211c970aa 100644
--- 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 bca6f6cdeb7..fae3db5f63f 100644
--- 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
index 3e211c970aa..00000000000
--- 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 6cd24f63384..481a0e78a10 100644
--- 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 d80ab051c37..5e34810babc 100644
--- 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 c97094a19c9..49c9dc2ccec 100644
--- 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 585f4d7ae89..25117cc0c9f 100644
--- 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 6a57cede208..329a592f4b2 100644
--- 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 8e54b4bfec8..1b624327d0f 100644
--- 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 87fe2e6dc67..040b297aeb0 100644
--- 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 b3866d52946..6ec4b834bfb 100644
--- 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
index 1b624327d0f..00000000000
--- 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 7a75857fcb1..afe5adc2f3d 100644
--- 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 e620b837a3c..69ddc6fd5b7 100644
--- 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 9b1b4369582..0d9ed4488dd 100644
--- 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 afa89ff227b..b6bd51be63a 100644
--- 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 d456973ee6d..2c3848e1fb0 100644
--- 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 24a1a08a3ca..5da515690d4 100644
--- 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 ff2fccae935..a671e460098 100644
--- 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 669e56d7726..eb25139da6d 100644
--- 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 c033fb23879..1ad459e3b19 100644
--- 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 0244edf53b7..86fe035bc9a 100644
--- 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 2a982ab69f8..95731d6f365 100644
--- 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 30d12cc0711..0c61516732a 100644
--- 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 d714b0155df..731d4c4e6e9 100644
--- 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 485771d0f38..62898cfdeb6 100644
--- 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 7afffa440aa..574a0b60ab4 100644
--- 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 5f97b314092..3bb83e309e7 100644
--- 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 c3cacaccbef..ea5b2a16a50 100644
--- 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 95413671d5c..4ba4fab755e 100644
--- 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 51fc1a9f5c9..99ed68959d0 100644
--- 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 a14baa47532..e0da81833a0 100644
--- 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/pr85345.c b/gcc/testsuite/gcc.target/i386/pr85345.c
index 63f771294ad..ceb94e4b940 100644
--- a/gcc/testsuite/gcc.target/i386/pr85345.c
+++ b/gcc/testsuite/gcc.target/i386/pr85345.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} 4 } } */
 
 int resolver_fn = 0;
diff --git a/gcc/testsuite/gcc.target/i386/pr85403.c b/gcc/testsuite/gcc.target/i386/pr85403.c
index 0bbd7ca5610..d74b545e3ba 100644
--- 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 0194f7b7edd..882d8ab7875 100644
--- 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) {}