mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-11-21 01:12:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

x86: Always include <dl-cet.h>/cet-tunables.h> for --enable-cet

Browse Source 
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.
This commit is contained in:
H.J. Lu 2018-07-17 04:16:19 -07:00
parent f753fa7dea
commit ba2ea23d05
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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> 2018-07-16 H.J. Lu <hongjiu.lu@intel.com>
[BZ #21598] [BZ #21598]

7
sysdeps/x86/cpu-features.c
View File

@ -30,8 +30,6 @@ extern void TUNABLE_CALLBACK (set_hwcaps) (tunable_val_t *)
attribute_hidden; attribute_hidden;
# if CET_ENABLED # if CET_ENABLED
# include <dl-cet.h>
# include <cet-tunables.h>
extern void TUNABLE_CALLBACK (set_x86_ibt) (tunable_val_t *) extern void TUNABLE_CALLBACK (set_x86_ibt) (tunable_val_t *)
attribute_hidden; attribute_hidden;
extern void TUNABLE_CALLBACK (set_x86_shstk) (tunable_val_t *) 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
#endif #endif
#if CET_ENABLED
# include <dl-cet.h>
# include <cet-tunables.h>
#endif
static void static void
get_common_indeces (struct cpu_features *cpu_features, get_common_indeces (struct cpu_features *cpu_features,
unsigned int *family, unsigned int *model, unsigned int *family, unsigned int *model,