about summary refs log tree commit diff
path: root/sysdeps/x86/Makefile
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2021-01-12 19:00:13 -0800
committerH.J. Lu <hjl.tools@gmail.com>2021-01-13 05:03:34 -0800
commit2ef23b520597f4ea1790a669b83e608f24f4cf12 (patch)
treeb9b38477b14203a05128302e42db909025011180 /sysdeps/x86/Makefile
parentf430293d842031f2afc3013f156e1018065e480e (diff)
downloadglibc-2ef23b520597f4ea1790a669b83e608f24f4cf12.tar.gz
glibc-2ef23b520597f4ea1790a669b83e608f24f4cf12.tar.xz
glibc-2ef23b520597f4ea1790a669b83e608f24f4cf12.zip
x86: Set header.feature_1 in TCB for always-on CET [BZ #27177]
Update dl_cet_check() to set header.feature_1 in TCB when both IBT and
SHSTK are always on.
Diffstat (limited to 'sysdeps/x86/Makefile')
-rw-r--r--sysdeps/x86/Makefile6
1 files changed, 6 insertions, 0 deletions
diff --git a/sysdeps/x86/Makefile b/sysdeps/x86/Makefile
index c814d5a195..adaa2a92cd 100644
--- a/sysdeps/x86/Makefile
+++ b/sysdeps/x86/Makefile
@@ -48,6 +48,12 @@ endif # $(subdir) == math
 ifeq ($(subdir),setjmp)
 gen-as-const-headers += jmp_buf-ssp.sym
 sysdep_routines += __longjmp_cancel
+ifneq ($(enable-cet),no)
+ifneq ($(have-tunables),no)
+tests += tst-setjmp-cet
+tst-setjmp-cet-ENV = GLIBC_TUNABLES=glibc.cpu.x86_ibt=on:glibc.cpu.x86_shstk=on
+endif
+endif
 endif
 
 ifeq ($(subdir),string)