diff options
| author | Ian Lance Taylor <iant@golang.org> | 2020-07-11 12:43:49 -0700 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2020-07-11 12:43:49 -0700 |
| commit | 4854d721be78358e59367982bdd94461b4be3c5a (patch) | |
| tree | 8ead189e618f8ef1456c8b02c81de0cc1585d8a6 /libobjc | |
| parent | 3cdc95b9f8d6c90c4a279783fd3da961c5afb22c (diff) | |
| parent | e109f6e438b72ef3e403162971068d28d09b82f5 (diff) | |
| download | gcc-4854d721be78358e59367982bdd94461b4be3c5a.zip gcc-4854d721be78358e59367982bdd94461b4be3c5a.tar.gz gcc-4854d721be78358e59367982bdd94461b4be3c5a.tar.bz2 | |
Merge from trunk revision e109f6e438b72ef3e403162971068d28d09b82f5
Diffstat (limited to 'libobjc')
| -rw-r--r-- | libobjc/ChangeLog | 14 | ||||
| -rwxr-xr-x | libobjc/configure | 12 |
2 files changed, 22 insertions, 4 deletions
diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog index b5bba60..9b2d90a 100644 --- a/libobjc/ChangeLog +++ b/libobjc/ChangeLog @@ -1,3 +1,17 @@ +2020-05-29 H.J. Lu <hjl.tools@gmail.com> + + PR bootstrap/95413 + * configure: Regenerated. + +2020-05-15 H.J. Lu <hongjiu.lu@intel.com> + + PR bootstrap/95147 + * configure: Regenerated. + +2020-05-14 H.J. Lu <hongjiu.lu@intel.com> + + * configure: Regenerated. + 2020-02-12 Sandra Loosemore <sandra@codesourcery.com> PR libstdc++/79193 diff --git a/libobjc/configure b/libobjc/configure index 2f8924e..c4f6688 100755 --- a/libobjc/configure +++ b/libobjc/configure @@ -1383,7 +1383,7 @@ Optional Features: --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-version-specific-runtime-libs Specify that runtime libraries should be installed in a compiler-specific directory --enable-multilib build many library versions (default) - --enable-cet enable Intel CET in target libraries [default=no] + --enable-cet enable Intel CET in target libraries [default=auto] --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer @@ -3453,19 +3453,22 @@ if test "${enable_cet+set}" = set; then : esac else - enable_cet=no + enable_cet=auto fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CET support" >&5 $as_echo_n "checking for CET support... " >&6; } +# NB: Avoid nested save_CFLAGS and save_LDFLAGS. case "$host" in i[34567]86-*-linux* | x86_64-*-linux*) case "$enable_cet" in auto) # Check if target supports multi-byte NOPs # and if assembler supports CET insn. + cet_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -fcf-protection" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -3489,6 +3492,7 @@ else enable_cet=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS="$cet_save_CFLAGS" ;; yes) # Check if assembler supports CET. @@ -10775,7 +10779,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10778 "configure" +#line 10782 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10881,7 +10885,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10884 "configure" +#line 10888 "configure" #include "confdefs.h" #if HAVE_DLFCN_H |