about summary refs log tree commit diff
path: root/sysdeps/x86/ldsodefs.h
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2020-04-28 10:05:25 -0700
committerH.J. Lu <hjl.tools@gmail.com>2020-05-18 06:15:02 -0700
commit674ea88294bfb8d89878a0ebbbcec38a85e118a5 (patch)
tree35c81a44dc6e7eea5f406bbba208dec19f2114a7 /sysdeps/x86/ldsodefs.h
parentcbfc16122e9c4948b3a17224aeb5f8b70f02417d (diff)
downloadglibc-674ea88294bfb8d89878a0ebbbcec38a85e118a5.tar.gz
glibc-674ea88294bfb8d89878a0ebbbcec38a85e118a5.tar.xz
glibc-674ea88294bfb8d89878a0ebbbcec38a85e118a5.zip
x86: Move CET control to _dl_x86_feature_control [BZ #25887]
1. Include <dl-procruntime.c> to get architecture specific initializer in
rtld_global.
2. Change _dl_x86_feature_1[2] to _dl_x86_feature_1.
3. Add _dl_x86_feature_control after _dl_x86_feature_1, which is a
struct of 2 bitfields for IBT and SHSTK control

This fixes [BZ #25887].
Diffstat (limited to 'sysdeps/x86/ldsodefs.h')
-rw-r--r--sysdeps/x86/ldsodefs.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/sysdeps/x86/ldsodefs.h b/sysdeps/x86/ldsodefs.h
index 072f826666..5b1b09dbf8 100644
--- a/sysdeps/x86/ldsodefs.h
+++ b/sysdeps/x86/ldsodefs.h
@@ -61,6 +61,7 @@ struct La_x32_retval;
 				     struct La_x86_64_retval *,		\
 				     const char *)
 
+#include <cet-control.h>
 #include_next <ldsodefs.h>
 
 #endif