about summary refs log tree commit diff
path: root/sysdeps/x86/Makefile
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2023-12-16 08:53:12 -0800
committerH.J. Lu <hjl.tools@gmail.com>2023-12-18 07:04:18 -0800
commit442983319ba70de801fc856e8dd4748fba8f7f1b (patch)
tree0150e4448669869613112e336dc9e1ab9972f452 /sysdeps/x86/Makefile
parent12ab77e893479a1f7d4666082a48efad79777bb9 (diff)
downloadglibc-442983319ba70de801fc856e8dd4748fba8f7f1b.tar.gz
glibc-442983319ba70de801fc856e8dd4748fba8f7f1b.tar.xz
glibc-442983319ba70de801fc856e8dd4748fba8f7f1b.zip
x86/cet: Don't assume that SHSTK implies IBT
Since shadow stack (SHSTK) is enabled in the Linux kernel without
enabling indirect branch tracking (IBT), don't assume that SHSTK
implies IBT.  Use "CPU_FEATURE_ACTIVE (IBT)" to check if IBT is active
and "CPU_FEATURE_ACTIVE (SHSTK)" to check if SHSTK is active.
Diffstat (limited to 'sysdeps/x86/Makefile')
-rw-r--r--sysdeps/x86/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/sysdeps/x86/Makefile b/sysdeps/x86/Makefile
index 5631a59a26..3d936ed537 100644
--- a/sysdeps/x86/Makefile
+++ b/sysdeps/x86/Makefile
@@ -209,7 +209,6 @@ CFLAGS-tst-cet-legacy-mod-6a.c += -fcf-protection=branch
 CFLAGS-tst-cet-legacy-mod-6b.c += -fcf-protection
 CFLAGS-tst-cet-legacy-mod-6c.c += -fcf-protection
 CFLAGS-tst-cet-legacy-7.c += -fcf-protection=none
-CFLAGS-tst-cet-legacy-8.c += -mshstk
 CFLAGS-tst-cet-legacy-10.c += -mshstk
 CFLAGS-tst-cet-legacy-10-static.c += -mshstk