This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.27.9000-577-gba2ea23
- From: hjl at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 17 Jul 2018 11:16:49 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.27.9000-577-gba2ea23
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via ba2ea23d053e293baeb39554b2e9fc56f8ef335b (commit)
from f753fa7dea3367bd3eb7b543103ff8cda182a3fa (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=ba2ea23d053e293baeb39554b2e9fc56f8ef335b
commit ba2ea23d053e293baeb39554b2e9fc56f8ef335b
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Tue Jul 17 04:16:19 2018 -0700
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.
diff --git a/ChangeLog b/ChangeLog
index 05d05f7..cd86d86 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 0627f14..8108256 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,
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
sysdeps/x86/cpu-features.c | 7 +++++--
2 files changed, 10 insertions(+), 2 deletions(-)
hooks/post-receive
--
GNU C Library master sources