9 files changed, 44 insertions, 0 deletions
diff --git a/gas/testsuite/gas/i386/cet-ibt-inval.l b/gas/testsuite/gas/i386/cet-ibt-inval.l
new file mode 100644
index 00000000000..d646e368e75
--- /dev/null
+++ b/gas/testsuite/gas/i386/cet-ibt-inval.l
@@ -0,0 +1,3 @@
+.*: Assembler messages:
+.*:6: Error: `endbr32' is not supported on `i386.noibt'
+.*:7: Error: `endbr64' is not supported on `i386.noibt'
diff --git a/gas/testsuite/gas/i386/cet-ibt-inval.s b/gas/testsuite/gas/i386/cet-ibt-inval.s
new file mode 100644
index 00000000000..33a6f775048
--- /dev/null
+++ b/gas/testsuite/gas/i386/cet-ibt-inval.s
@@ -0,0 +1,7 @@
+	.arch .ibt
+	endbr32
+	endbr64
+
+	.arch .noibt
+	endbr32
+	endbr64
diff --git a/gas/testsuite/gas/i386/cet-shstk-inval.l b/gas/testsuite/gas/i386/cet-shstk-inval.l
new file mode 100644
index 00000000000..892b72c9bdc
--- /dev/null
+++ b/gas/testsuite/gas/i386/cet-shstk-inval.l
@@ -0,0 +1,3 @@
+.*: Assembler messages:
+.*:6: Error: `incsspd' is not supported on `i386.noshstk'
+.*:7: Error: `rdsspd' is not supported on `i386.noshstk'
diff --git a/gas/testsuite/gas/i386/cet-shstk-inval.s b/gas/testsuite/gas/i386/cet-shstk-inval.s
new file mode 100644
index 00000000000..53bae24a5c2
--- /dev/null
+++ b/gas/testsuite/gas/i386/cet-shstk-inval.s
@@ -0,0 +1,7 @@
+	.arch .shstk
+	incsspd %ecx
+	rdsspd %ecx
+
+	.arch .noshstk
+	incsspd %ecx
+	rdsspd %ecx
diff --git a/gas/testsuite/gas/i386/i386.exp b/gas/testsuite/gas/i386/i386.exp
index 184c65ed8b2..b81cc20fd9e 100644
--- a/gas/testsuite/gas/i386/i386.exp
+++ b/gas/testsuite/gas/i386/i386.exp
@@ -418,6 +418,8 @@ if [expr ([istarget "i*86-*-*"] ||  [istarget "x86_64-*-*"]) && [gas_32_check]]
     run_dump_test "fpu-bad"
     run_dump_test "cet"
     run_dump_test "cet-intel"
+    run_list_test "cet-ibt-inval"
+    run_list_test "cet-shstk-inval"
     run_dump_test "pseudos"
     run_dump_test "notrack"
     run_dump_test "notrack-intel"
@@ -886,6 +888,8 @@ if [expr ([istarget "i*86-*-*"] || [istarget "x86_64-*-*"]) && [gas_64_check]] t
     run_dump_test "x86-64-opcode-bad"
     run_dump_test "x86-64-cet"
     run_dump_test "x86-64-cet-intel"
+    run_list_test "x86-64-cet-ibt-inval"
+    run_list_test "x86-64-cet-shstk-inval"
     run_dump_test "x86-64-pseudos"
     run_dump_test "x86-64-notrack"
     run_dump_test "x86-64-notrack-intel"
diff --git a/gas/testsuite/gas/i386/x86-64-cet-ibt-inval.l b/gas/testsuite/gas/i386/x86-64-cet-ibt-inval.l
new file mode 100644
index 00000000000..1353527ad3d
--- /dev/null
+++ b/gas/testsuite/gas/i386/x86-64-cet-ibt-inval.l
@@ -0,0 +1,3 @@
+.*: Assembler messages:
+.*:6: Error: `endbr32' is not supported on `x86_64.noibt'
+.*:7: Error: `endbr64' is not supported on `x86_64.noibt'
diff --git a/gas/testsuite/gas/i386/x86-64-cet-ibt-inval.s b/gas/testsuite/gas/i386/x86-64-cet-ibt-inval.s
new file mode 100644
index 00000000000..33a6f775048
--- /dev/null
+++ b/gas/testsuite/gas/i386/x86-64-cet-ibt-inval.s
@@ -0,0 +1,7 @@
+	.arch .ibt
+	endbr32
+	endbr64
+
+	.arch .noibt
+	endbr32
+	endbr64
diff --git a/gas/testsuite/gas/i386/x86-64-cet-shstk-inval.l b/gas/testsuite/gas/i386/x86-64-cet-shstk-inval.l
new file mode 100644
index 00000000000..84178b207ad
--- /dev/null
+++ b/gas/testsuite/gas/i386/x86-64-cet-shstk-inval.l
@@ -0,0 +1,3 @@
+.*: Assembler messages:
+.*:6: Error: `incsspd' is not supported on `x86_64.noshstk'
+.*:7: Error: `rdsspd' is not supported on `x86_64.noshstk'
diff --git a/gas/testsuite/gas/i386/x86-64-cet-shstk-inval.s b/gas/testsuite/gas/i386/x86-64-cet-shstk-inval.s
new file mode 100644
index 00000000000..53bae24a5c2
--- /dev/null
+++ b/gas/testsuite/gas/i386/x86-64-cet-shstk-inval.s
@@ -0,0 +1,7 @@
+	.arch .shstk
+	incsspd %ecx
+	rdsspd %ecx
+
+	.arch .noshstk
+	incsspd %ecx
+	rdsspd %ecx