From 940e9f392dbe03bbc2473537976e0424eca6a53d Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Fri, 22 Jun 2018 23:16:41 +0200 Subject: [PATCH] backport: re PR jit/85384 (libgccjit does not work if --with-gcc-major-version is used) 2018-06-22 Jakub Jelinek Backported from mainline 2018-04-18 David Malcolm 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: r261957 --- ChangeLog | 8 ++++++++ config/ChangeLog | 8 ++++++++ config/acx.m4 | 2 +- configure | 2 +- fixincludes/ChangeLog | 8 ++++++++ fixincludes/configure | 2 +- gcc/ChangeLog | 11 +++++++++++ gcc/configure | 8 ++++++-- gcc/configure.ac | 4 +++- libada/ChangeLog | 8 ++++++++ libada/configure | 2 +- libatomic/ChangeLog | 8 ++++++++ libatomic/configure | 7 ++++++- libcc1/ChangeLog | 8 ++++++++ libcc1/configure | 2 +- libcilkrts/ChangeLog | 8 ++++++++ libcilkrts/configure | 2 +- libffi/ChangeLog | 8 ++++++++ libffi/configure | 2 +- libgcc/ChangeLog | 8 ++++++++ libgcc/configure | 2 +- libgfortran/ChangeLog | 8 ++++++++ libgfortran/configure | 2 +- libgomp/ChangeLog | 8 ++++++++ libgomp/configure | 2 +- libhsail-rt/ChangeLog | 8 ++++++++ libhsail-rt/configure | 2 +- libitm/ChangeLog | 8 ++++++++ libitm/configure | 2 +- libmpx/ChangeLog | 8 ++++++++ libmpx/configure | 2 +- libobjc/ChangeLog | 8 ++++++++ libobjc/configure | 2 +- liboffloadmic/ChangeLog | 9 +++++++++ liboffloadmic/configure | 2 +- liboffloadmic/plugin/configure | 2 +- libquadmath/ChangeLog | 8 ++++++++ libquadmath/configure | 2 +- libsanitizer/ChangeLog | 8 ++++++++ libsanitizer/configure | 2 +- libssp/ChangeLog | 8 ++++++++ libssp/configure | 2 +- libstdc++-v3/ChangeLog | 8 ++++++++ libstdc++-v3/configure | 2 +- libvtv/ChangeLog | 8 ++++++++ libvtv/configure | 2 +- 46 files changed, 216 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index 670d2bb20fdd..f5199ea8db6e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2018-06-22 Jakub Jelinek + + Backported from mainline + 2018-04-18 David Malcolm + + PR jit/85384 + * configure: Regenerate. + 2018-01-25 Release Manager * GCC 7.3.0 released. diff --git a/config/ChangeLog b/config/ChangeLog index abce453d1f7a..57c8ff87fcfe 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,11 @@ +2018-06-22 Jakub Jelinek + + Backported from mainline + 2018-04-18 David Malcolm + + PR jit/85384 + * acx.m4 (GCC_BASE_VER): Remove \$\$ from sed expression. + 2018-01-25 Release Manager * GCC 7.3.0 released. diff --git a/config/acx.m4 b/config/acx.m4 index aa1d34b2b496..87c1b5e29322 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/configure b/configure index 32a38633ad85..32ee91f949e5 100755 --- a/configure +++ b/configure @@ -6620,7 +6620,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/fixincludes/ChangeLog b/fixincludes/ChangeLog index 1472c9fe265f..96107ab50152 100644 --- a/fixincludes/ChangeLog +++ b/fixincludes/ChangeLog @@ -1,3 +1,11 @@ +2018-06-22 Jakub Jelinek + + Backported from mainline + 2018-04-18 David Malcolm + + PR jit/85384 + * configure: Regenerate. + 2018-01-25 Release Manager * GCC 7.3.0 released. diff --git a/fixincludes/configure b/fixincludes/configure index ab97983f327d..e4b03fd588cd 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 6be713635848..9381393fe812 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,14 @@ +2018-06-22 Jakub Jelinek + + Backported from mainline + 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-06-22 Jakub Jelinek Backported from mainline diff --git a/gcc/configure b/gcc/configure index 0fdf2b2f44c3..5dab9142e1ab 100755 --- a/gcc/configure +++ b/gcc/configure @@ -11871,7 +11871,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 @@ -25225,6 +25225,7 @@ $as_echo "#define HAVE_AS_SPARC5_VIS4 1" >>confdefs.h fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking assembler for SPARC6 instructions" >&5 $as_echo_n "checking assembler for SPARC6 instructions... " >&6; } if test "${gcc_cv_as_sparc_sparc6+set}" = set; then : @@ -25261,6 +25262,7 @@ $as_echo "#define HAVE_AS_SPARC6 1" >>confdefs.h fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking assembler for LEON instructions" >&5 $as_echo_n "checking assembler for LEON instructions... " >&6; } if test "${gcc_cv_as_sparc_leon+set}" = set; then : @@ -29785,8 +29787,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 < + + Backported from mainline + 2018-04-18 David Malcolm + + PR jit/85384 + * configure: Regenerate. + 2018-01-25 Release Manager * GCC 7.3.0 released. diff --git a/libada/configure b/libada/configure index 17a52c81db28..13e267a7f4e7 100755 --- a/libada/configure +++ b/libada/configure @@ -3018,7 +3018,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 629048c3e644..5faddcc6a7ae 100644 --- a/libatomic/ChangeLog +++ b/libatomic/ChangeLog @@ -1,3 +1,11 @@ +2018-06-22 Jakub Jelinek + + Backported from mainline + 2018-04-18 David Malcolm + + PR jit/85384 + * configure: Regenerate. + 2018-03-09 Andreas Krebbel Backport from mainline diff --git a/libatomic/configure b/libatomic/configure index c05fc9d11418..2ae9b8d40f30 100755 --- a/libatomic/configure +++ b/libatomic/configure @@ -12333,6 +12333,7 @@ _ACEOF + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __atomic_load/store for size 2" >&5 $as_echo_n "checking for __atomic_load/store for size 2... " >&6; } if test "${libat_cv_have_at_ldst_2+set}" = set; then : @@ -12400,6 +12401,7 @@ _ACEOF + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __atomic_load/store for size 4" >&5 $as_echo_n "checking for __atomic_load/store for size 4... " >&6; } if test "${libat_cv_have_at_ldst_4+set}" = set; then : @@ -12467,6 +12469,7 @@ _ACEOF + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __atomic_load/store for size 8" >&5 $as_echo_n "checking for __atomic_load/store for size 8... " >&6; } if test "${libat_cv_have_at_ldst_8+set}" = set; then : @@ -12534,6 +12537,7 @@ _ACEOF + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __atomic_load/store for size 16" >&5 $as_echo_n "checking for __atomic_load/store for size 16... " >&6; } if test "${libat_cv_have_at_ldst_16+set}" = set; then : @@ -12602,6 +12606,7 @@ _ACEOF + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __atomic_test_and_set for size 1" >&5 $as_echo_n "checking for __atomic_test_and_set for size 1... " >&6; } if test "${libat_cv_have_at_tas_1+set}" = set; then : @@ -15267,7 +15272,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 c61190f7a7fd..98501d052768 100644 --- a/libcc1/ChangeLog +++ b/libcc1/ChangeLog @@ -1,3 +1,11 @@ +2018-06-22 Jakub Jelinek + + Backported from mainline + 2018-04-18 David Malcolm + + PR jit/85384 + * configure: Regenerate. + 2018-01-25 Release Manager * GCC 7.3.0 released. diff --git a/libcc1/configure b/libcc1/configure index d6f480fe930d..962d34d92714 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 diff --git a/libcilkrts/ChangeLog b/libcilkrts/ChangeLog index ec16da84f000..1893d0dfbfb1 100644 --- a/libcilkrts/ChangeLog +++ b/libcilkrts/ChangeLog @@ -1,3 +1,11 @@ +2018-06-22 Jakub Jelinek + + Backported from mainline + 2018-04-18 David Malcolm + + PR jit/85384 + * configure: Regenerate. + 2018-01-25 Release Manager * GCC 7.3.0 released. diff --git a/libcilkrts/configure b/libcilkrts/configure index 3cc8c999733c..503337dc4b47 100644 --- a/libcilkrts/configure +++ b/libcilkrts/configure @@ -15413,7 +15413,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/libffi/ChangeLog b/libffi/ChangeLog index ec5dc75d4638..f3136eabbc20 100644 --- a/libffi/ChangeLog +++ b/libffi/ChangeLog @@ -1,3 +1,11 @@ +2018-06-22 Jakub Jelinek + + Backported from mainline + 2018-04-18 David Malcolm + + PR jit/85384 + * configure: Regenerate. + 2018-01-25 Release Manager * GCC 7.3.0 released. diff --git a/libffi/configure b/libffi/configure index 74b747b3b7e8..790a291011f6 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 f26d2bbfcb88..7d54d6800f5e 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,11 @@ +2018-06-22 Jakub Jelinek + + Backported from mainline + 2018-04-18 David Malcolm + + PR jit/85384 + * configure: Regenerate. + 2018-06-22 Andre Vieira Backport from mainline diff --git a/libgcc/configure b/libgcc/configure index 9a7eb8446bb1..441601a1f76a 100644 --- a/libgcc/configure +++ b/libgcc/configure @@ -5298,7 +5298,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 958b65e73c33..afe561b2162d 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,11 @@ +2018-06-22 Jakub Jelinek + + Backported from mainline + 2018-04-18 David Malcolm + + PR jit/85384 + * configure: Regenerate. + 2018-06-09 Jerry DeLisle Backport from trunk. diff --git a/libgfortran/configure b/libgfortran/configure index 81238fcb79c6..1db8f5f52247 100755 --- a/libgfortran/configure +++ b/libgfortran/configure @@ -26370,7 +26370,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 cc4635321571..9829516a532d 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,11 @@ +2018-06-22 Jakub Jelinek + + Backported from mainline + 2018-04-18 David Malcolm + + PR jit/85384 + * configure: Regenerate. + 2018-05-01 Tom de Vries backport from trunk: diff --git a/libgomp/configure b/libgomp/configure index b7e9f40b8529..06166c66120f 100755 --- a/libgomp/configure +++ b/libgomp/configure @@ -16823,7 +16823,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 ae7bfb6854cb..5d18dbb66b4b 100644 --- a/libhsail-rt/ChangeLog +++ b/libhsail-rt/ChangeLog @@ -1,3 +1,11 @@ +2018-06-22 Jakub Jelinek + + Backported from mainline + 2018-04-18 David Malcolm + + PR jit/85384 + * configure: Regenerate. + 2018-01-25 Release Manager * GCC 7.3.0 released. diff --git a/libhsail-rt/configure b/libhsail-rt/configure index a490125f5b33..a4fcc10c1f9b 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 f66dd31b03aa..2d2fee851d04 100644 --- a/libitm/ChangeLog +++ b/libitm/ChangeLog @@ -1,3 +1,11 @@ +2018-06-22 Jakub Jelinek + + Backported from mainline + 2018-04-18 David Malcolm + + PR jit/85384 + * configure: Regenerate. + 2018-01-25 Release Manager * GCC 7.3.0 released. diff --git a/libitm/configure b/libitm/configure index 775f370fbb5d..96c494d4a3fa 100644 --- a/libitm/configure +++ b/libitm/configure @@ -17647,7 +17647,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 af0595017c9f..e10a10c719ba 100644 --- a/libmpx/ChangeLog +++ b/libmpx/ChangeLog @@ -1,3 +1,11 @@ +2018-06-22 Jakub Jelinek + + Backported from mainline + 2018-04-18 David Malcolm + + PR jit/85384 + * configure: Regenerate. + 2018-01-25 Release Manager * GCC 7.3.0 released. diff --git a/libmpx/configure b/libmpx/configure index 853993a522f1..2fd71ca89f6d 100644 --- a/libmpx/configure +++ b/libmpx/configure @@ -11596,7 +11596,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 78121927ba01..1f1e198cc451 100644 --- a/libobjc/ChangeLog +++ b/libobjc/ChangeLog @@ -1,3 +1,11 @@ +2018-06-22 Jakub Jelinek + + Backported from mainline + 2018-04-18 David Malcolm + + PR jit/85384 + * configure: Regenerate. + 2018-01-25 Release Manager * GCC 7.3.0 released. diff --git a/libobjc/configure b/libobjc/configure index abf5aed71cfa..84862a828640 100755 --- a/libobjc/configure +++ b/libobjc/configure @@ -11708,7 +11708,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 42d03b2e7bef..2b20f8a3f1a4 100644 --- a/liboffloadmic/ChangeLog +++ b/liboffloadmic/ChangeLog @@ -1,3 +1,12 @@ +2018-06-22 Jakub Jelinek + + Backported from mainline + 2018-04-18 David Malcolm + + PR jit/85384 + * configure: Regenerate. + * plugin/confugure: Regenerate. + 2018-01-25 Release Manager * GCC 7.3.0 released. diff --git a/liboffloadmic/configure b/liboffloadmic/configure index e22b214ddbce..f873716991bb 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 8b8c041d2bf8..c031eb3e7fa8 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 4c66b338b2c4..004c808fb3de 100644 --- a/libquadmath/ChangeLog +++ b/libquadmath/ChangeLog @@ -1,3 +1,11 @@ +2018-06-22 Jakub Jelinek + + Backported from mainline + 2018-04-18 David Malcolm + + PR jit/85384 + * configure: Regenerate. + 2018-01-25 Release Manager * GCC 7.3.0 released. diff --git a/libquadmath/configure b/libquadmath/configure index d2f13bf7751e..76a2c20b7e19 100755 --- a/libquadmath/configure +++ b/libquadmath/configure @@ -12929,7 +12929,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 3a1619045eb6..a127bb0c2d60 100644 --- a/libsanitizer/ChangeLog +++ b/libsanitizer/ChangeLog @@ -1,3 +1,11 @@ +2018-06-22 Jakub Jelinek + + Backported from mainline + 2018-04-18 David Malcolm + + PR jit/85384 + * configure: Regenerate. + 2018-06-07 Richard Biener Backport from mainline diff --git a/libsanitizer/configure b/libsanitizer/configure index 8e0c47ea8384..a3a08d635f4c 100755 --- a/libsanitizer/configure +++ b/libsanitizer/configure @@ -16511,7 +16511,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 299029f8521f..9ae263e73baa 100644 --- a/libssp/ChangeLog +++ b/libssp/ChangeLog @@ -1,3 +1,11 @@ +2018-06-22 Jakub Jelinek + + Backported from mainline + 2018-04-18 David Malcolm + + PR jit/85384 + * configure: Regenerate. + 2018-01-25 Release Manager * GCC 7.3.0 released. diff --git a/libssp/configure b/libssp/configure index b14e922e6f15..ee1751d20db1 100755 --- a/libssp/configure +++ b/libssp/configure @@ -11082,7 +11082,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 4acbd4b8a102..60a81cc09418 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2018-06-22 Jakub Jelinek + + Backported from mainline + 2018-04-18 David Malcolm + + PR jit/85384 + * configure: Regenerate. + 2018-06-22 Jonathan Wakely Backport from mainline diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index 9e56113b8729..bc624207ce63 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -81697,7 +81697,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 4f4d7e00de4b..1f5a9f6deb85 100644 --- a/libvtv/ChangeLog +++ b/libvtv/ChangeLog @@ -1,3 +1,11 @@ +2018-06-22 Jakub Jelinek + + Backported from mainline + 2018-04-18 David Malcolm + + PR jit/85384 + * configure: Regenerate. + 2018-01-25 Release Manager * GCC 7.3.0 released. diff --git a/libvtv/configure b/libvtv/configure index c3bed2dfc708..dfb9162c79fa 100755 --- a/libvtv/configure +++ b/libvtv/configure @@ -15516,7 +15516,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 -- 2.47.2