From 56770bdab2585be4d3171b3512d2167106dca53e Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Sat, 16 May 2020 06:07:12 -0700 Subject: [PATCH] Sync config with GCC Sync with GCC 2020-05-15 H.J. Lu PR bootstrap/95147 * cet.m4 (GCC_CET_FLAGS): Also check if -fcf-protection works when defaulting to auto. 2020-05-14 H.J. Lu * cet.m4 (GCC_CET_FLAGS): Change default to auto. --- config/ChangeLog | 13 +++++++++++++ config/cet.m4 | 5 ++++- 2 files changed, 17 insertions(+), 1 deletion(-) 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 + + Sync with GCC + 2020-05-15 H.J. Lu + + PR bootstrap/95147 + * cet.m4 (GCC_CET_FLAGS): Also check if -fcf-protection works + when defaulting to auto. + + 2020-05-14 H.J. Lu + + * cet.m4 (GCC_CET_FLAGS): Change default to auto. + 2020-05-12 H.J. Lu 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. -- 2.30.2