summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2020-05-16 06:07:12 -0700
committerH.J. Lu <hjl.tools@gmail.com>2020-05-16 06:07:12 -0700
commit56770bdab2585be4d3171b3512d2167106dca53e (patch)
tree5f65216007622ed9dcfef23220d941d7cd4171a2 /config
parent9bf058f09457de5efd094b87081b7d031ce96cbc (diff)
downloadbinutils-gdb-56770bdab2585be4d3171b3512d2167106dca53e.tar.gz
Sync config with GCC
Sync with GCC 2020-05-15 H.J. Lu <hongjiu.lu@intel.com> PR bootstrap/95147 * cet.m4 (GCC_CET_FLAGS): Also check if -fcf-protection works when defaulting to auto. 2020-05-14 H.J. Lu <hongjiu.lu@intel.com> * cet.m4 (GCC_CET_FLAGS): Change default to auto.
Diffstat (limited to 'config')
-rw-r--r--config/ChangeLog13
-rw-r--r--config/cet.m45
2 files changed, 17 insertions, 1 deletions
diff --git a/config/ChangeLog b/config/ChangeLog
index de8c327b548..0e988b19c98 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,16 @@
+2020-05-16 H.J. Lu <hongjiu.lu@intel.com>
+
+ Sync with GCC
+ 2020-05-15 H.J. Lu <hongjiu.lu@intel.com>
+
+ PR bootstrap/95147
+ * cet.m4 (GCC_CET_FLAGS): Also check if -fcf-protection works
+ when defaulting to auto.
+
+ 2020-05-14 H.J. Lu <hongjiu.lu@intel.com>
+
+ * cet.m4 (GCC_CET_FLAGS): Change default to auto.
+
2020-05-12 H.J. Lu <hongjiu.lu@intel.com>
Sync with GCC
diff --git a/config/cet.m4 b/config/cet.m4
index d9608699cd5..2bb2c8a95ac 100644
--- a/config/cet.m4
+++ b/config/cet.m4
@@ -3,7 +3,7 @@ dnl GCC_CET_FLAGS
dnl (SHELL-CODE_HANDLER)
dnl
AC_DEFUN([GCC_CET_FLAGS],[dnl
-GCC_ENABLE(cet, no, ,[enable Intel CET in target libraries],
+GCC_ENABLE(cet, auto, ,[enable Intel CET in target libraries],
permit yes|no|auto)
AC_MSG_CHECKING([for CET support])
@@ -13,6 +13,8 @@ case "$host" in
auto)
# Check if target supports multi-byte NOPs
# and if assembler supports CET insn.
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -fcf-protection"
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM(
[],
@@ -25,6 +27,7 @@ asm ("setssbsy");
])],
[enable_cet=yes],
[enable_cet=no])
+ CFLAGS="$save_CFLAGS"
;;
yes)
# Check if assembler supports CET.