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,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"

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

12
libiberty/configure vendored
View File

@ -5375,7 +5375,8 @@ rm -f core conftest.err conftest.$ac_objext \
fi
if test x$may_have_cet = xyes; then
if test "$cross_compiling" = yes; 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;}
as_fn_error $? "cannot run test program while cross compiling
@ -5420,9 +5421,14 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
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
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"