From: David Malcolm Date: Wed, 18 Apr 2018 09:46:58 +0000 (+0000) Subject: re PR jit/85384 (libgccjit does not work if --with-gcc-major-version is used) X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=001ddaa852f8e18468e5a9356ba5d2eebb1f7f66;p=gcc.git re PR jit/85384 (libgccjit does not work if --with-gcc-major-version is used) PR jit/85384 * acx.m4 (GCC_BASE_VER): Remove \$\$ from sed expression. * configure.ac (gcc-driver-name.h): Honor --with-gcc-major-version by using gcc_base_ver to generate a gcc_driver_version, and use it when generating GCC_DRIVER_NAME. * configure: Regenerate. * configure: Regenerate. From-SVN: r259462 --- diff --git a/config/ChangeLog b/config/ChangeLog index 18f65078c42..b73c1d181a1 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,8 @@ +2018-04-18 David Malcolm + + PR jit/85384 + * acx.m4 (GCC_BASE_VER): Remove \$\$ from sed expression. + 2018-04-05 H.J. Lu PR gas/22318 diff --git a/config/acx.m4 b/config/acx.m4 index aa1d34b2b49..87c1b5e2932 100644 --- a/config/acx.m4 +++ b/config/acx.m4 @@ -246,7 +246,7 @@ AC_DEFUN([GCC_BASE_VER], [AS_HELP_STRING([--with-gcc-major-version-only], [use only GCC major number in filesystem paths])], [if test x$with_gcc_major_version_only = xyes ; then changequote(,)dnl - get_gcc_base_ver="sed -e 's/^\([0-9]*\).*\$\$/\1/'" + get_gcc_base_ver="sed -e 's/^\([0-9]*\).*/\1/'" changequote([,])dnl fi ]) diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog index 808b64aeb76..fc6e80d6123 100644 --- a/fixincludes/ChangeLog +++ b/fixincludes/ChangeLog @@ -1,3 +1,8 @@ +2018-04-18 David Malcolm + + PR jit/85384 + * configure: Regenerate. + 2018-02-22 David Edelsohn * inclhack.def (aix_stdlib_vec_malloc): New. diff --git a/fixincludes/configure b/fixincludes/configure index ab97983f327..e4b03fd588c 100755 --- a/fixincludes/configure +++ b/fixincludes/configure @@ -5401,7 +5401,7 @@ _ACEOF # 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 diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 0bfafdd242a..a74304871af 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2018-04-18 David Malcolm + + PR jit/85384 + * configure.ac (gcc-driver-name.h): Honor --with-gcc-major-version + by using gcc_base_ver to generate a gcc_driver_version, and use + it when generating GCC_DRIVER_NAME. + * configure: Regenerate. + 2018-04-18 Jakub Jelinek PR target/81084 diff --git a/gcc/configure b/gcc/configure index 7fe7efe8bb4..6121e163259 100755 --- a/gcc/configure +++ b/gcc/configure @@ -11883,7 +11883,7 @@ EOF # 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 @@ -30084,8 +30084,10 @@ _ACEOF # Generate gcc-driver-name.h containing GCC_DRIVER_NAME for the benefit # of jit/jit-playback.c. +gcc_driver_version=`eval "${get_gcc_base_ver} $srcdir/BASE-VER"` +echo "gcc_driver_version: ${gcc_driver_version}" cat > gcc-driver-name.h < gcc-driver-name.h < + + PR jit/85384 + * configure: Regenerate. + 2018-01-03 Jakub Jelinek Update copyright years. diff --git a/libada/configure b/libada/configure index 76b39921e72..aedb04ab4f9 100755 --- a/libada/configure +++ b/libada/configure @@ -3669,7 +3669,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 diff --git a/libatomic/ChangeLog b/libatomic/ChangeLog index 81aaba4b11f..8da3219e158 100644 --- a/libatomic/ChangeLog +++ b/libatomic/ChangeLog @@ -1,3 +1,8 @@ +2018-04-18 David Malcolm + + PR jit/85384 + * configure: Regenerate. + 2018-03-09 Andreas Krebbel * config/s390/exch_n.c: New file. diff --git a/libatomic/configure b/libatomic/configure index 9445aee1291..d0d8495ba05 100755 --- a/libatomic/configure +++ b/libatomic/configure @@ -15440,7 +15440,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 diff --git a/libcc1/ChangeLog b/libcc1/ChangeLog index dee8441dc0a..cd65832e960 100644 --- a/libcc1/ChangeLog +++ b/libcc1/ChangeLog @@ -1,3 +1,8 @@ +2018-04-18 David Malcolm + + PR jit/85384 + * configure: Regenerate. + 2018-01-03 Jakub Jelinek Update copyright years. diff --git a/libcc1/configure b/libcc1/configure index 23d1a7645ff..f53a121611c 100755 --- a/libcc1/configure +++ b/libcc1/configure @@ -14315,7 +14315,7 @@ _ACEOF # 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 @@ -14594,7 +14594,7 @@ $as_echo_n "checking for exported symbols... " >&6; } if test "x$export_sym_check" != x; then echo "int main() {return 0;} int foobar() {return 0;}" > conftest.c ${CC} ${CFLAGS} ${LDFLAGS} conftest.c -o conftest$ac_exeext > /dev/null 2>&1 - if $export_sym_check conftest$ac_exeext | grep -q foobar > /dev/null; then + if $export_sym_check conftest$ac_exeext | grep foobar > /dev/null; then : # No need to use a flag { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -14604,7 +14604,7 @@ $as_echo "yes" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -rdynamic" >&5 $as_echo_n "checking for -rdynamic... " >&6; } ${CC} ${CFLAGS} ${LDFLAGS} -rdynamic conftest.c -o conftest$ac_exeext > /dev/null 2>&1 - if $export_sym_check conftest$ac_exeext | grep -q foobar > /dev/null; then + if $export_sym_check conftest$ac_exeext | grep foobar > /dev/null; then plugin_rdynamic=yes pluginlibs="-rdynamic" else diff --git a/libffi/ChangeLog b/libffi/ChangeLog index f7de95059b1..eaface5ef2f 100644 --- a/libffi/ChangeLog +++ b/libffi/ChangeLog @@ -1,3 +1,8 @@ +2018-04-18 David Malcolm + + PR jit/85384 + * configure: Regenerate. + 2017-08-31 Tony Reix * src/powerpc/aix.S (ffi_call_AIX): Add debugging pseudo-op and diff --git a/libffi/configure b/libffi/configure index 74b747b3b7e..790a291011f 100755 --- a/libffi/configure +++ b/libffi/configure @@ -16444,7 +16444,7 @@ $as_echo "$as_me: versioning on shared library symbols is $enable_symvers" >&6;} # 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 diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index aeaa6539167..35384848318 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,8 @@ +2018-04-18 David Malcolm + + PR jit/85384 + * configure: Regenerate. + 2018-04-16 Jakub Jelinek PR target/84945 diff --git a/libgcc/configure b/libgcc/configure index 7399c862bb0..e0caeecd3bb 100644 --- a/libgcc/configure +++ b/libgcc/configure @@ -5463,7 +5463,7 @@ esac # 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 diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index c7b334668a3..03b1f01e93b 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,8 @@ +2018-04-18 David Malcolm + + PR jit/85384 + * configure: Regenerate. + 2018-04-06 Thomas Koenig PR libfortran/85253 diff --git a/libgfortran/configure b/libgfortran/configure index 86904ef7eea..cede17dc0b8 100755 --- a/libgfortran/configure +++ b/libgfortran/configure @@ -26570,7 +26570,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext # 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 diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index ef528093c12..0703dac14c7 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,8 @@ +2018-04-18 David Malcolm + + PR jit/85384 + * configure: Regenerate. + 2018-04-16 Cesar Philippidis Tom de Vries diff --git a/libgomp/configure b/libgomp/configure index 92b8142b0b1..fa217c41cd2 100755 --- a/libgomp/configure +++ b/libgomp/configure @@ -16911,7 +16911,7 @@ CFLAGS="$save_CFLAGS" # 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 diff --git a/libhsail-rt/ChangeLog b/libhsail-rt/ChangeLog index 372917daa50..3c16d0ee7f5 100644 --- a/libhsail-rt/ChangeLog +++ b/libhsail-rt/ChangeLog @@ -1,3 +1,8 @@ +2018-04-18 David Malcolm + + PR jit/85384 + * configure: Regenerate. + 2018-01-03 Jakub Jelinek Update copyright years. diff --git a/libhsail-rt/configure b/libhsail-rt/configure index a490125f5b3..a4fcc10c1f9 100755 --- a/libhsail-rt/configure +++ b/libhsail-rt/configure @@ -14414,7 +14414,7 @@ _ACEOF # 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 diff --git a/libitm/ChangeLog b/libitm/ChangeLog index c5ca3875fa5..659eea68618 100644 --- a/libitm/ChangeLog +++ b/libitm/ChangeLog @@ -1,3 +1,8 @@ +2018-04-18 David Malcolm + + PR jit/85384 + * configure: Regenerate. + 2018-02-14 Igor Tsimbalist PR target/84148 diff --git a/libitm/configure b/libitm/configure index a57805e20df..03e4274de30 100644 --- a/libitm/configure +++ b/libitm/configure @@ -17734,7 +17734,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 diff --git a/libmpx/ChangeLog b/libmpx/ChangeLog index f8cc639fd0d..f3dae222547 100644 --- a/libmpx/ChangeLog +++ b/libmpx/ChangeLog @@ -1,3 +1,8 @@ +2018-04-18 David Malcolm + + PR jit/85384 + * configure: Regenerate. + 2018-02-14 Igor Tsimbalist PR target/84148 diff --git a/libmpx/configure b/libmpx/configure index dfa4419b840..bd73ef7286a 100644 --- a/libmpx/configure +++ b/libmpx/configure @@ -11683,7 +11683,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 diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog index b5422e3845f..a26055cf816 100644 --- a/libobjc/ChangeLog +++ b/libobjc/ChangeLog @@ -1,3 +1,8 @@ +2018-04-18 David Malcolm + + PR jit/85384 + * configure: Regenerate. + 2018-02-14 Igor Tsimbalist PR target/84148 diff --git a/libobjc/configure b/libobjc/configure index ce52fab100c..855cba2edf9 100755 --- a/libobjc/configure +++ b/libobjc/configure @@ -11797,7 +11797,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 diff --git a/liboffloadmic/ChangeLog b/liboffloadmic/ChangeLog index 72f07523637..28c8abd535a 100644 --- a/liboffloadmic/ChangeLog +++ b/liboffloadmic/ChangeLog @@ -1,3 +1,9 @@ +2018-04-18 David Malcolm + + PR jit/85384 + * configure: Regenerate. + * plugin/configure: Regenerate. + 2017-01-31 Thomas Schwinge * plugin/libgomp-plugin-intelmic.cpp (GOMP_OFFLOAD_get_type): Fix diff --git a/liboffloadmic/configure b/liboffloadmic/configure index e22b214ddbc..f873716991b 100644 --- a/liboffloadmic/configure +++ b/liboffloadmic/configure @@ -14492,7 +14492,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 diff --git a/liboffloadmic/plugin/configure b/liboffloadmic/plugin/configure index 8b8c041d2bf..c031eb3e7fa 100644 --- a/liboffloadmic/plugin/configure +++ b/liboffloadmic/plugin/configure @@ -14187,7 +14187,7 @@ hardcode_into_libs=no # 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 diff --git a/libquadmath/ChangeLog b/libquadmath/ChangeLog index 33ca15f0555..3aa70f1c469 100644 --- a/libquadmath/ChangeLog +++ b/libquadmath/ChangeLog @@ -1,3 +1,8 @@ +2018-04-18 David Malcolm + + PR jit/85384 + * configure: Regenerate. + 2018-02-14 Igor Tsimbalist PR target/84148 diff --git a/libquadmath/configure b/libquadmath/configure index 2a694799596..ca9f6482063 100755 --- a/libquadmath/configure +++ b/libquadmath/configure @@ -13026,7 +13026,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 diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog index 922e947af08..1854bc8fc3b 100644 --- a/libsanitizer/ChangeLog +++ b/libsanitizer/ChangeLog @@ -1,3 +1,8 @@ +2018-04-18 David Malcolm + + PR jit/85384 + * configure: Regenerate. + 2018-04-18 Bill Seurer PR sanitizer/85389 diff --git a/libsanitizer/configure b/libsanitizer/configure index 3b61a1f7537..3614f8ae918 100755 --- a/libsanitizer/configure +++ b/libsanitizer/configure @@ -16517,7 +16517,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 diff --git a/libssp/ChangeLog b/libssp/ChangeLog index b5e81131f25..2ed241ec149 100644 --- a/libssp/ChangeLog +++ b/libssp/ChangeLog @@ -1,3 +1,8 @@ +2018-04-18 David Malcolm + + PR jit/85384 + * configure: Regenerate. + 2018-02-14 Igor Tsimbalist PR target/84148 diff --git a/libssp/configure b/libssp/configure index df7bff70ba1..f88c04cd4e3 100755 --- a/libssp/configure +++ b/libssp/configure @@ -11171,7 +11171,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 diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 13d666cd803..e407fc66ea7 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2018-04-18 David Malcolm + + PR jit/85384 + * configure: Regenerate. + 2018-04-16 Jonathan Wakely * testsuite/experimental/filesystem/file_status/1.cc: Add diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index ad6c506c606..48b56537aa7 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -81644,7 +81644,7 @@ $as_echo "$gxx_include_dir" >&6; } # 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 diff --git a/libvtv/ChangeLog b/libvtv/ChangeLog index 82b52bc4845..0d38b1105e9 100644 --- a/libvtv/ChangeLog +++ b/libvtv/ChangeLog @@ -1,3 +1,8 @@ +2018-04-18 David Malcolm + + PR jit/85384 + * configure: Regenerate. + 2018-02-14 Igor Tsimbalist PR target/84148 diff --git a/libvtv/configure b/libvtv/configure index 1cd1f70cd76..b94f78585c0 100755 --- a/libvtv/configure +++ b/libvtv/configure @@ -15604,7 +15604,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 diff --git a/lto-plugin/ChangeLog b/lto-plugin/ChangeLog index 7b2170c4f4f..04dc03c0751 100644 --- a/lto-plugin/ChangeLog +++ b/lto-plugin/ChangeLog @@ -1,3 +1,8 @@ +2018-04-18 David Malcolm + + PR jit/85384 + * configure: Regenerate. + 2018-01-03 Jakub Jelinek Update copyright years. diff --git a/lto-plugin/configure b/lto-plugin/configure index cdea9eac3ee..7843cd7f6a3 100755 --- a/lto-plugin/configure +++ b/lto-plugin/configure @@ -5387,7 +5387,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