aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config/ChangeLog6
-rw-r--r--config/bootstrap-cet.mk6
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/doc/install.texi2
4 files changed, 15 insertions, 4 deletions
diff --git a/config/ChangeLog b/config/ChangeLog
index 02b96ff..d978f41 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,6 +1,12 @@
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
* cet.m4 (GCC_CET_FLAGS): Replace -mcet with -mshstk.
2018-04-19 Jakub Jelinek <jakub@redhat.com>
diff --git a/config/bootstrap-cet.mk b/config/bootstrap-cet.mk
index f09193a6..b5dee60 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 2992064..478d9bc 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 8f4870d..715b1ea 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).