diff options
author | David Malcolm <dmalcolm@redhat.com> | 2018-04-18 09:46:58 +0000 |
---|---|---|
committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2018-04-18 11:46:58 +0200 |
commit | 001ddaa852f8e18468e5a9356ba5d2eebb1f7f66 (patch) | |
tree | aef33a6ef006568578b391fab19aefd57ef86ecc | |
parent | b08aea04c2f28650b74878096fb0fba8156f0e26 (diff) | |
download | gcc-001ddaa852f8e18468e5a9356ba5d2eebb1f7f66.zip gcc-001ddaa852f8e18468e5a9356ba5d2eebb1f7f66.tar.gz gcc-001ddaa852f8e18468e5a9356ba5d2eebb1f7f66.tar.bz2 |
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
44 files changed, 139 insertions, 26 deletions
diff --git a/config/ChangeLog b/config/ChangeLog index 18f6507..b73c1d1 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,8 @@ +2018-04-18 David Malcolm <dmalcolm@redhat.com> + + PR jit/85384 + * acx.m4 (GCC_BASE_VER): Remove \$\$ from sed expression. + 2018-04-05 H.J. Lu <hongjiu.lu@intel.com> PR gas/22318 diff --git a/config/acx.m4 b/config/acx.m4 index aa1d34b..87c1b5e 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 808b64a..fc6e80d 100644 --- a/fixincludes/ChangeLog +++ b/fixincludes/ChangeLog @@ -1,3 +1,8 @@ +2018-04-18 David Malcolm <dmalcolm@redhat.com> + + PR jit/85384 + * configure: Regenerate. + 2018-02-22 David Edelsohn <dje.gcc@gmail.com> * inclhack.def (aix_stdlib_vec_malloc): New. diff --git a/fixincludes/configure b/fixincludes/configure index ab97983..e4b03fd 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 0bfafdd..a743048 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2018-04-18 David Malcolm <dmalcolm@redhat.com> + + 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 <jakub@redhat.com> PR target/81084 diff --git a/gcc/configure b/gcc/configure index 7fe7efe..6121e16 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 <<EOF -#define GCC_DRIVER_NAME "${target_noncanonical}-gcc-${gcc_BASEVER}${exeext}" +#define GCC_DRIVER_NAME "${target_noncanonical}-gcc-${gcc_driver_version}${exeext}" EOF # Check whether --enable-default-pie was given. diff --git a/gcc/configure.ac b/gcc/configure.ac index 67e1682..b066cc6 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -6499,8 +6499,10 @@ AC_DEFINE_UNQUOTED(DIAGNOSTICS_COLOR_DEFAULT, $DIAGNOSTICS_COLOR_DEFAULT, # 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 <<EOF -#define GCC_DRIVER_NAME "${target_noncanonical}-gcc-${gcc_BASEVER}${exeext}" +#define GCC_DRIVER_NAME "${target_noncanonical}-gcc-${gcc_driver_version}${exeext}" EOF # Check whether --enable-default-pie was given. diff --git a/libada/ChangeLog b/libada/ChangeLog index 3894505..6661c4d 100644 --- a/libada/ChangeLog +++ b/libada/ChangeLog @@ -1,3 +1,8 @@ +2018-04-18 David Malcolm <dmalcolm@redhat.com> + + PR jit/85384 + * configure: Regenerate. + 2018-01-03 Jakub Jelinek <jakub@redhat.com> Update copyright years. diff --git a/libada/configure b/libada/configure index 76b3992..aedb04a 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 81aaba4..8da3219 100644 --- a/libatomic/ChangeLog +++ b/libatomic/ChangeLog @@ -1,3 +1,8 @@ +2018-04-18 David Malcolm <dmalcolm@redhat.com> + + PR jit/85384 + * configure: Regenerate. + 2018-03-09 Andreas Krebbel <krebbel@linux.vnet.ibm.com> * config/s390/exch_n.c: New file. diff --git a/libatomic/configure b/libatomic/configure index 9445aee..d0d8495 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 dee8441..cd65832 100644 --- a/libcc1/ChangeLog +++ b/libcc1/ChangeLog @@ -1,3 +1,8 @@ +2018-04-18 David Malcolm <dmalcolm@redhat.com> + + PR jit/85384 + * configure: Regenerate. + 2018-01-03 Jakub Jelinek <jakub@redhat.com> Update copyright years. diff --git a/libcc1/configure b/libcc1/configure index 23d1a76..f53a121 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 f7de950..eaface5 100644 --- a/libffi/ChangeLog +++ b/libffi/ChangeLog @@ -1,3 +1,8 @@ +2018-04-18 David Malcolm <dmalcolm@redhat.com> + + PR jit/85384 + * configure: Regenerate. + 2017-08-31 Tony Reix <tony.reix@atos.net> * src/powerpc/aix.S (ffi_call_AIX): Add debugging pseudo-op and diff --git a/libffi/configure b/libffi/configure index 74b747b..790a291 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 aeaa653..3538484 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,8 @@ +2018-04-18 David Malcolm <dmalcolm@redhat.com> + + PR jit/85384 + * configure: Regenerate. + 2018-04-16 Jakub Jelinek <jakub@redhat.com> PR target/84945 diff --git a/libgcc/configure b/libgcc/configure index 7399c86..e0caeec 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 c7b3346..03b1f01 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,8 @@ +2018-04-18 David Malcolm <dmalcolm@redhat.com> + + PR jit/85384 + * configure: Regenerate. + 2018-04-06 Thomas Koenig <tkoenig@gcc.gnu.org> PR libfortran/85253 diff --git a/libgfortran/configure b/libgfortran/configure index 86904ef..cede17d 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 ef52809..0703dac 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,8 @@ +2018-04-18 David Malcolm <dmalcolm@redhat.com> + + PR jit/85384 + * configure: Regenerate. + 2018-04-16 Cesar Philippidis <cesar@codesourcery.com> Tom de Vries <tom@codesourcery.com> diff --git a/libgomp/configure b/libgomp/configure index 92b8142..fa217c4 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 372917d..3c16d0e 100644 --- a/libhsail-rt/ChangeLog +++ b/libhsail-rt/ChangeLog @@ -1,3 +1,8 @@ +2018-04-18 David Malcolm <dmalcolm@redhat.com> + + PR jit/85384 + * configure: Regenerate. + 2018-01-03 Jakub Jelinek <jakub@redhat.com> Update copyright years. diff --git a/libhsail-rt/configure b/libhsail-rt/configure index a490125..a4fcc10 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 c5ca387..659eea6 100644 --- a/libitm/ChangeLog +++ b/libitm/ChangeLog @@ -1,3 +1,8 @@ +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/libitm/configure b/libitm/configure index a57805e..03e4274 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 f8cc639..f3dae22 100644 --- a/libmpx/ChangeLog +++ b/libmpx/ChangeLog @@ -1,3 +1,8 @@ +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/libmpx/configure b/libmpx/configure index dfa4419..bd73ef7 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 b5422e3..a26055c 100644 --- a/libobjc/ChangeLog +++ b/libobjc/ChangeLog @@ -1,3 +1,8 @@ +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..855cba2 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 72f0752..28c8abd 100644 --- a/liboffloadmic/ChangeLog +++ b/liboffloadmic/ChangeLog @@ -1,3 +1,9 @@ +2018-04-18 David Malcolm <dmalcolm@redhat.com> + + PR jit/85384 + * configure: Regenerate. + * plugin/configure: Regenerate. + 2017-01-31 Thomas Schwinge <thomas@codesourcery.com> * plugin/libgomp-plugin-intelmic.cpp (GOMP_OFFLOAD_get_type): Fix diff --git a/liboffloadmic/configure b/liboffloadmic/configure index e22b214..f873716 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 8b8c041..c031eb3 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 33ca15f..3aa70f1 100644 --- a/libquadmath/ChangeLog +++ b/libquadmath/ChangeLog @@ -1,3 +1,8 @@ +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/libquadmath/configure b/libquadmath/configure index 2a69479..ca9f648 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 922e947..1854bc8 100644 --- a/libsanitizer/ChangeLog +++ b/libsanitizer/ChangeLog @@ -1,3 +1,8 @@ +2018-04-18 David Malcolm <dmalcolm@redhat.com> + + PR jit/85384 + * configure: Regenerate. + 2018-04-18 Bill Seurer <seurer@linux.vnet.ibm.com> PR sanitizer/85389 diff --git a/libsanitizer/configure b/libsanitizer/configure index 3b61a1f..3614f8a 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 b5e8113..2ed241e 100644 --- a/libssp/ChangeLog +++ b/libssp/ChangeLog @@ -1,3 +1,8 @@ +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/libssp/configure b/libssp/configure index df7bff7..f88c04c 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 13d666c..e407fc6 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2018-04-18 David Malcolm <dmalcolm@redhat.com> + + PR jit/85384 + * configure: Regenerate. + 2018-04-16 Jonathan Wakely <jwakely@redhat.com> * testsuite/experimental/filesystem/file_status/1.cc: Add diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index ad6c506..48b5653 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 82b52bc..0d38b11 100644 --- a/libvtv/ChangeLog +++ b/libvtv/ChangeLog @@ -1,3 +1,8 @@ +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/libvtv/configure b/libvtv/configure index 1cd1f70..b94f785 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 7b2170c..04dc03c 100644 --- a/lto-plugin/ChangeLog +++ b/lto-plugin/ChangeLog @@ -1,3 +1,8 @@ +2018-04-18 David Malcolm <dmalcolm@redhat.com> + + PR jit/85384 + * configure: Regenerate. + 2018-01-03 Jakub Jelinek <jakub@redhat.com> Update copyright years. diff --git a/lto-plugin/configure b/lto-plugin/configure index cdea9ea..7843cd7 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 |