diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2020-04-28 10:05:25 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2020-05-18 06:15:02 -0700 |
| commit | 674ea88294bfb8d89878a0ebbbcec38a85e118a5 (patch) | |
| tree | 35c81a44dc6e7eea5f406bbba208dec19f2114a7 /elf | |
| parent | cbfc16122e9c4948b3a17224aeb5f8b70f02417d (diff) | |
| download | glibc-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 'elf')
| -rw-r--r-- | elf/rtld.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/elf/rtld.c b/elf/rtld.c index 5ccc3c2dbb..882b070cc0 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -315,6 +315,8 @@ rtld_hidden_def (_dl_starting_up) (except those which cannot be added for some reason). */ struct rtld_global _rtld_global = { + /* Get architecture specific initializer. */ +#include <dl-procruntime.c> /* Generally the default presumption without further information is an * executable stack but this is not true for all platforms. */ ._dl_stack_flags = DEFAULT_STACK_PERMS, |