diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/ChangeLog | 9 | ||||
| -rw-r--r-- | config/cet.m4 | 18 |
2 files changed, 21 insertions, 6 deletions
diff --git a/config/ChangeLog b/config/ChangeLog index ece21f2..de8c327 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,12 @@ +2020-05-12 H.J. Lu <hongjiu.lu@intel.com> + + Sync with GCC + 2020-05-12 H.J. Lu <hongjiu.lu@intel.com> + + PR bootstrap/94998 + * cet.m4 (GCC_CET_HOST_FLAGS): Enable CET in cross compiler if + possible. + 2020-04-29 H.J. Lu <hongjiu.lu@intel.com> Sync with GCC diff --git a/config/cet.m4 b/config/cet.m4 index ea616b7..d960869 100644 --- a/config/cet.m4 +++ b/config/cet.m4 @@ -111,7 +111,8 @@ if test x$may_have_cet = xyes; then fi if test x$may_have_cet = xyes; then - AC_TRY_RUN([ + if test x$cross_compiling = xno; then + AC_TRY_RUN([ static void foo (void) { @@ -137,12 +138,17 @@ main () bar (); return 0; } - ], - [have_cet=no], - [have_cet=yes]) - if test x$enable_cet = xno -a x$have_cet = xyes; then - AC_MSG_ERROR([Intel CET must be enabled on Intel CET enabled host]) + ], + [have_cet=no], + [have_cet=yes]) + if test x$enable_cet = xno -a x$have_cet = xyes; then + AC_MSG_ERROR([Intel CET must be enabled on Intel CET enabled host]) + fi fi +else + # Enable CET in cross compiler if possible so that it will run on both + # CET and non-CET hosts. + have_cet=yes fi if test x$enable_cet = xyes; then $1="-fcf-protection" |