From: H.J. Lu <hjl@gcc.gnu.org>
Date: Tue, 24 Apr 2018 16:41:01 +0000 (-0700)
Subject: x86/CET: Build target libraries with -mshstk
X-Git-Tag: basepoints/gcc-9~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8624f8685dd6538583e310db0fa4dc30e2f7d5bc;p=thirdparty%2Fgcc.git

x86/CET: Build target libraries with -mshstk

With revision 259522:

commit d59cfa9a4064339cf2bd2da828c4c133f13e57f0
Author: hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4>
Date:   Fri Apr 20 13:30:13 2018 +0000

    Define __CET__ for -fcf-protection and remove -mibt

-mcet becomes an alias for -mshstk.

	PR target/85485
	* cet.m4 (GCC_CET_FLAGS): Replace -mcet with -mshstk.

From-SVN: r259608
---

diff --git a/config/ChangeLog b/config/ChangeLog
index ba360e101657..02b96ffac465 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,6 +1,11 @@
+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>
 
-	* config/cet.m4 (GCC_CET_FLAGS): Default to --disable-cet, replace
+	* cet.m4 (GCC_CET_FLAGS): Default to --disable-cet, replace
 	--enable-cet=default with --enable-cet=auto.
 
 2018-04-18  David Malcolm  <dmalcolm@redhat.com>
diff --git a/config/cet.m4 b/config/cet.m4
index 04a0e05d2ff9..b53c1bbd5cde 100644
--- a/config/cet.m4
+++ b/config/cet.m4
@@ -42,7 +42,7 @@ asm ("setssbsy");
     ;;
 esac
 if test x$enable_cet = xyes; then
-  $1="-fcf-protection -mcet"
+  $1="-fcf-protection -mshstk"
   AC_MSG_RESULT([yes])
 else
   AC_MSG_RESULT([no])