From: H.J. Lu <hjl.tools@gmail.com>
Date: Fri, 10 Mar 2023 21:18:10 +0000 (-0800)
Subject: x86/cet: Check CPU_FEATURE_ACTIVE when CET is disabled
X-Git-Tag: upstream/2.39~194
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=71c0cc3357fe6d72f1dbef1c695e54b117d91b96;p=platform%2Fupstream%2Fglibc.git

x86/cet: Check CPU_FEATURE_ACTIVE when CET is disabled

Verify that CPU_FEATURE_ACTIVE (SHSTK) works properly when CET is
disabled.
---

diff --git a/sysdeps/x86/Makefile b/sysdeps/x86/Makefile
index a41598a..23f3ac1 100644
--- a/sysdeps/x86/Makefile
+++ b/sysdeps/x86/Makefile
@@ -156,10 +156,13 @@ tests += \
   tst-cet-legacy-9-static \
   tst-cet-legacy-10 \
   tst-cet-legacy-10-static \
+  tst-cet-legacy-10a \
+  tst-cet-legacy-10a-static \
 # tests
 tests-static += \
   tst-cet-legacy-9-static \
   tst-cet-legacy-10-static \
+  tst-cet-legacy-10a-static \
 # tests-static
 tst-cet-legacy-1a-ARGS = -- $(host-test-program-cmd)
 
@@ -226,6 +229,8 @@ CFLAGS-tst-cet-legacy-mod-6c.c += -fcf-protection
 CFLAGS-tst-cet-legacy-7.c += -fcf-protection=none
 CFLAGS-tst-cet-legacy-10.c += -mshstk
 CFLAGS-tst-cet-legacy-10-static.c += -mshstk
+CFLAGS-tst-cet-legacy-10a.c += -fcf-protection=none
+CFLAGS-tst-cet-legacy-10a-static.c += -fcf-protection=none
 
 CFLAGS-tst-shstk-legacy-1a.c += -fcf-protection=none
 CFLAGS-tst-shstk-legacy-1a-static.c += -fcf-protection=none
diff --git a/sysdeps/x86/tst-cet-legacy-10a-static.c b/sysdeps/x86/tst-cet-legacy-10a-static.c
new file mode 100644
index 0000000..05073a5
--- /dev/null
+++ b/sysdeps/x86/tst-cet-legacy-10a-static.c
@@ -0,0 +1,2 @@
+#pragma GCC target ("shstk")
+#include "tst-cet-legacy-10.c"
diff --git a/sysdeps/x86/tst-cet-legacy-10a.c b/sysdeps/x86/tst-cet-legacy-10a.c
new file mode 100644
index 0000000..05073a5
--- /dev/null
+++ b/sysdeps/x86/tst-cet-legacy-10a.c
@@ -0,0 +1,2 @@
+#pragma GCC target ("shstk")
+#include "tst-cet-legacy-10.c"