diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2020-05-12 10:39:42 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2020-05-12 10:39:54 -0700 |
| commit | d17cdc17c90ce77cb90c569322c1f241d3530cec (patch) | |
| tree | 123c57d341267cdac580408d46ede76879f970bc /lto-plugin | |
| parent | 8a6790fb4e5090624fbd71e2b895e6bdd5319fd7 (diff) | |
Enable CET in cross compiler if possible
Don't perform CET run-time check for host when cross compiling. Instead,
enable CET in cross compiler if possible so that it will run on both CET
and non-CET hosts.
config/
PR bootstrap/94998
* cet.m4 (GCC_CET_HOST_FLAGS): Enable CET in cross compiler if
possible.
libiberty/
PR bootstrap/94998
* configure: Regenerated.
lto-plugin/
PR bootstrap/94998
* configure: Regenerated.
Diffstat (limited to 'lto-plugin')
| -rw-r--r-- | lto-plugin/ChangeLog | 5 | ||||
| -rwxr-xr-x | lto-plugin/configure | 16 |
2 files changed, 16 insertions, 5 deletions
diff --git a/lto-plugin/ChangeLog b/lto-plugin/ChangeLog index 9ce708dfb30..7be98a1a12e 100644 --- a/lto-plugin/ChangeLog +++ b/lto-plugin/ChangeLog @@ -1,3 +1,8 @@ +2020-05-12 H.J. Lu <hongjiu.lu@intel.com> + + PR bootstrap/94998 + * configure: Regenerated. + 2020-05-05 Eric Botcazou <ebotcazou@adacore.com> * lto-plugin.c: Document -linker-output-auto-notlo-rel option. diff --git a/lto-plugin/configure b/lto-plugin/configure index 1baf6cc70b8..36c6ecc5875 100755 --- a/lto-plugin/configure +++ b/lto-plugin/configure @@ -5768,7 +5768,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 @@ -5813,9 +5814,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" @@ -11941,7 +11947,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11944 "configure" +#line 11950 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12047,7 +12053,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12050 "configure" +#line 12056 "configure" #include "confdefs.h" #if HAVE_DLFCN_H |