Sync config and libiberty with GCC

config/

	PR bootstrap/94998
	* cet.m4 (GCC_CET_HOST_FLAGS): Enable CET in cross compiler if
	possible.

libiberty/

	PR bootstrap/94998
	* configure: Regenerated.
This commit is contained in:
H.J. Lu 2020-05-12 18:37:03 -07:00
parent 09f20ec886
commit 90d00bbd9c
4 changed files with 35 additions and 9 deletions

View File

@ -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

View File

@ -111,6 +111,7 @@ if test x$may_have_cet = xyes; then
fi
if test x$may_have_cet = xyes; then
if test x$cross_compiling = xno; then
AC_TRY_RUN([
static void
foo (void)
@ -143,6 +144,11 @@ main ()
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"

View File

@ -1,3 +1,8 @@
2020-05-12 H.J. Lu <hongjiu.lu@intel.com>
PR bootstrap/94998
* configure: Regenerated.
2020-04-28 H.J. Lu <hongjiu.lu@intel.com>
PR bootstrap/94739

6
libiberty/configure vendored
View File

@ -5375,6 +5375,7 @@ rm -f core conftest.err conftest.$ac_objext \
fi
if test x$may_have_cet = xyes; then
if test x$cross_compiling = xno; then
if test "$cross_compiling" = yes; then :
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@ -5423,6 +5424,11 @@ fi
if test x$enable_cet = xno -a x$have_cet = xyes; then
as_fn_error $? "Intel CET must be enabled on Intel CET enabled host" "$LINENO" 5
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
CET_HOST_FLAGS="-fcf-protection"