diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2018-06-07 18:05:45 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2018-06-07 18:05:45 +0000 |
| commit | ce311a8cae4489058f8601bebdf511b7fb5fce26 (patch) | |
| tree | 81494302b4f5708ad6c96bad6ecfd9c109574c38 /libobjc | |
| parent | 48ec607c1f8d1f1783850f1d2729fd23716b1b1b (diff) | |
| parent | dc23fb4d72eed9ea09fbf4704b26e0e36414a57a (diff) | |
| download | gcc-ce311a8cae4489058f8601bebdf511b7fb5fce26.zip gcc-ce311a8cae4489058f8601bebdf511b7fb5fce26.tar.gz gcc-ce311a8cae4489058f8601bebdf511b7fb5fce26.tar.bz2 | |
Merge from trunk revision 261284.
From-SVN: r261288
Diffstat (limited to 'libobjc')
| -rw-r--r-- | libobjc/ChangeLog | 13 | ||||
| -rwxr-xr-x | libobjc/configure | 17 |
2 files changed, 21 insertions, 9 deletions
diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog index b5422e3..140c56d 100644 --- a/libobjc/ChangeLog +++ b/libobjc/ChangeLog @@ -1,3 +1,16 @@ +2018-04-24 H.J. Lu <hongjiu.lu@intel.com> + + * configure: Regenerated. + +2018-04-19 Jakub Jelinek <jakub@redhat.com> + + * configure: Regenerated. + +2018-04-18 David Malcolm <dmalcolm@redhat.com> + + PR jit/85384 + * configure: Regenerate. + 2018-02-14 Igor Tsimbalist <igor.v.tsimbalist@intel.com> PR target/84148 diff --git a/libobjc/configure b/libobjc/configure index ce52fab..d1a032f 100755 --- a/libobjc/configure +++ b/libobjc/configure @@ -1352,8 +1352,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=default] + --enable-cet enable Intel CET in target libraries [default=no] --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer --enable-shared[=PKGS] build shared libraries [default=yes] @@ -3360,12 +3359,12 @@ esac if test "${enable_cet+set}" = set; then : enableval=$enable_cet; case "$enableval" in - yes|no|default) ;; + yes|no|auto) ;; *) as_fn_error "Unknown argument to enable/disable cet" "$LINENO" 5 ;; esac else - enable_cet=default + enable_cet=no fi @@ -3375,7 +3374,7 @@ $as_echo_n "checking for CET support... " >&6; } case "$host" in i[34567]86-*-linux* | x86_64-*-linux*) case "$enable_cet" in - default) + auto) # Check if target supports multi-byte NOPs # and if assembler supports CET insn. cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -3429,7 +3428,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ;; esac if test x$enable_cet = xyes; then - CET_FLAGS="-fcf-protection -mcet" + CET_FLAGS="-fcf-protection -mshstk" { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else @@ -10683,7 +10682,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10686 "configure" +#line 10685 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10789,7 +10788,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10792 "configure" +#line 10791 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11797,7 +11796,7 @@ fi # Check whether --with-gcc-major-version-only was given. if test "${with_gcc_major_version_only+set}" = set; then : withval=$with_gcc_major_version_only; if test x$with_gcc_major_version_only = xyes ; then - get_gcc_base_ver="sed -e 's/^\([0-9]*\).*\$\$/\1/'" + get_gcc_base_ver="sed -e 's/^\([0-9]*\).*/\1/'" fi fi |