diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2018-07-17 04:16:19 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2018-07-17 04:16:35 -0700 |
| commit | ba2ea23d053e293baeb39554b2e9fc56f8ef335b (patch) | |
| tree | 060bc1ee1e8f9eec559b3c1bd33a928883933dfe | |
| parent | f753fa7dea3367bd3eb7b543103ff8cda182a3fa (diff) | |
| download | glibc-ba2ea23d053e293baeb39554b2e9fc56f8ef335b.tar.gz glibc-ba2ea23d053e293baeb39554b2e9fc56f8ef335b.tar.xz glibc-ba2ea23d053e293baeb39554b2e9fc56f8ef335b.zip | |
x86: Always include <dl-cet.h>/cet-tunables.h> for --enable-cet
Always include <dl-cet.h> and cet-tunables.h> when CET is enabled. Otherwise, configure glibc with --enable-cet --disable-tunables will fail to build. * sysdeps/x86/cpu-features.c: Always include <dl-cet.h> and cet-tunables.h> when CET is enabled.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | sysdeps/x86/cpu-features.c | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 05d05f7d41..cd86d86ab2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2018-07-17 H.J. Lu <hongjiu.lu@intel.com> + + * sysdeps/x86/cpu-features.c: Always include <dl-cet.h> and + cet-tunables.h> when CET is enabled. + 2018-07-16 H.J. Lu <hongjiu.lu@intel.com> [BZ #21598] diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c index 0627f145e0..8108256c42 100644 --- a/sysdeps/x86/cpu-features.c +++ b/sysdeps/x86/cpu-features.c @@ -30,8 +30,6 @@ extern void TUNABLE_CALLBACK (set_hwcaps) (tunable_val_t *) attribute_hidden; # if CET_ENABLED -# include <dl-cet.h> -# include <cet-tunables.h> extern void TUNABLE_CALLBACK (set_x86_ibt) (tunable_val_t *) attribute_hidden; extern void TUNABLE_CALLBACK (set_x86_shstk) (tunable_val_t *) @@ -39,6 +37,11 @@ extern void TUNABLE_CALLBACK (set_x86_shstk) (tunable_val_t *) # endif #endif +#if CET_ENABLED +# include <dl-cet.h> +# include <cet-tunables.h> +#endif + static void get_common_indeces (struct cpu_features *cpu_features, unsigned int *family, unsigned int *model, |