From 48f64e053e4069a687410b1970ad85695bc73559 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hongjiu.lu@intel.com>
Date: Tue, 24 Apr 2018 16:47:24 +0000
Subject: [PATCH] Don't bootstrap GCC with -mcet
With revision 259496:
commit b1384095a7c1d06a44b70853372ebe037b2f7867
Author: hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu Apr 19 15:15:04 2018 +0000
x86: Enable -fcf-protection with multi-byte NOPs
-fcf-protection no longer requires -mcet.
config/
PR target/85485
* bootstrap-cet.mk (STAGE2_CFLAGS): Remove -mcet.
(STAGE3_CFLAGS): Likewise.
gcc/
PR target/85485
* doc/install.texi: Remove -mcet from bootstrap-cet.
From-SVN: r259611
---
config/ChangeLog | 6 ++++++
config/bootstrap-cet.mk | 6 +++---
gcc/ChangeLog | 5 +++++
gcc/doc/install.texi | 2 +-
4 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/config/ChangeLog b/config/ChangeLog
index 02b96ffac465..d978f41f4bed 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,9 @@
+2018-04-24 H.J. Lu <hongjiu.lu@intel.com>
+
+ PR target/85485
+ * bootstrap-cet.mk (STAGE2_CFLAGS): Remove -mcet.
+ (STAGE3_CFLAGS): Likewise.
+
2018-04-24 H.J. Lu <hongjiu.lu@intel.com>
PR target/85485
diff --git a/config/bootstrap-cet.mk b/config/bootstrap-cet.mk
index f09193a6dea7..b5dee601a3f6 100644
--- a/config/bootstrap-cet.mk
+++ b/config/bootstrap-cet.mk
@@ -1,4 +1,4 @@
-# This option enables -fcf-protection -mcet for stage2 and stage3.
+# This option enables -fcf-protection for stage2 and stage3.
-STAGE2_CFLAGS += -fcf-protection -mcet
-STAGE3_CFLAGS += -fcf-protection -mcet
+STAGE2_CFLAGS += -fcf-protection
+STAGE3_CFLAGS += -fcf-protection
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 299206492a7d..478d9bcd28a4 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2018-04-24 H.J. Lu <hongjiu.lu@intel.com>
+
+ PR target/85485
+ * doc/install.texi: Remove -mcet from bootstrap-cet.
+
2018-04-24 Jakub Jelinek <jakub@redhat.com>
PR target/85511
diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi
index 8f4870d7e280..715b1eae0deb 100644
--- a/gcc/doc/install.texi
+++ b/gcc/doc/install.texi
@@ -2519,7 +2519,7 @@ must be used along with @code{bootstrap-debug-lean} and
@item @samp{bootstrap-cet}
This option enables Intel CET for host tools during bootstrapping.
@samp{BUILD_CONFIG=bootstrap-cet} is equivalent to adding
-@option{-fcf-protection -mcet} to @samp{BOOT_CFLAGS}. This option
+@option{-fcf-protection} to @samp{BOOT_CFLAGS}. This option
assumes that the host supports Intel CET (e.g. GNU assembler version
2.30 or later).
--
GitLab