backport: re PR jit/85384 (libgccjit does not work if --with-gcc-major-version is...

2018-06-22  Jakub Jelinek  <jakub@redhat.com>

	Backported from mainline
	2018-04-18  David Malcolm  <dmalcolm@redhat.com>

	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

diff --git a/ChangeLog b/ChangeLog
index 670d2bb20fddd53566929331792475acf752786f..f5199ea8db6e0f78b3ea0e51df1b336a6202a3a0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2018-06-22  Jakub Jelinek  <jakub@redhat.com>
+
+       Backported from mainline
+       2018-04-18  David Malcolm  <dmalcolm@redhat.com>
+
+       PR jit/85384
+       * configure: Regenerate.
+
 2018-01-25  Release Manager
 
        * GCC 7.3.0 released.

diff --git a/config/ChangeLog b/config/ChangeLog
index abce453d1f7a7e2e1c27048fd175da4d5fddd3a3..57c8ff87fcfe1ebbfc8f082c97421da0cd7e349b 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,11 @@
+2018-06-22  Jakub Jelinek  <jakub@redhat.com>
+
+       Backported from mainline
+       2018-04-18  David Malcolm  <dmalcolm@redhat.com>
+
+       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 aa1d34b2b4962abe22cddd6b65ff05446056986f..87c1b5e29322142b35e791d1e3ad4495ecf6ef53 100644 (file)
--- 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 32a38633ad85543da0caf9bcac75636c2ce4ee44..32ee91f949e5a6c8e6c7f3b0d581024000484ec8 100755 (executable)
--- 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 1472c9fe265f8de3758c2bbc46ce8992fbafd1ac..96107ab501522797d60313e785e0fbf68465dfa5 100644 (file)
--- a/fixincludes/ChangeLog
+++ b/fixincludes/ChangeLog
@@ -1,3 +1,11 @@
+2018-06-22  Jakub Jelinek  <jakub@redhat.com>
+
+       Backported from mainline
+       2018-04-18  David Malcolm  <dmalcolm@redhat.com>
+
+       PR jit/85384
+       * configure: Regenerate.
+
 2018-01-25  Release Manager
 
        * GCC 7.3.0 released.

diff --git a/fixincludes/configure b/fixincludes/configure
index ab97983f327d487bb87e0e4130706dd54c4fc769..e4b03fd588cd92280b658c76844a54a2e535641e 100755 (executable)
--- 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 6be713635848e3e1e3049240394e42923f8229b8..9381393fe81239ff6ea466a9d6fd6cffb6203334 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,14 @@
+2018-06-22  Jakub Jelinek  <jakub@redhat.com>
+
+       Backported from mainline
+       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-06-22  Jakub Jelinek  <jakub@redhat.com>
 
        Backported from mainline

diff --git a/gcc/configure b/gcc/configure
index 0fdf2b2f44c31e2f9d120f0f44337e0d00440aad..5dab9142e1abd0dc60cd513194a078434acb8307 100755 (executable)
--- 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 <<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 eec1b0efacac0302e0900bb5583f38ac2b906096..e1fa8af5e4f463d51beab1ae76fe97b1177f8357 100644 (file)
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -6300,8 +6300,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 6a950729892836833e505afa8d3279421691808c..452a58a4d488194d586eedcdf5d77fe8b26a9356 100644 (file)
--- a/libada/ChangeLog
+++ b/libada/ChangeLog
@@ -1,3 +1,11 @@
+2018-06-22  Jakub Jelinek  <jakub@redhat.com>
+
+       Backported from mainline
+       2018-04-18  David Malcolm  <dmalcolm@redhat.com>
+
+       PR jit/85384
+       * configure: Regenerate.
+
 2018-01-25  Release Manager
 
        * GCC 7.3.0 released.

diff --git a/libada/configure b/libada/configure
index 17a52c81db28a5a99ce0fa9957a2351980227a4b..13e267a7f4e74a2ac1ec5f6d1e5af57f47c12b90 100755 (executable)
--- 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 629048c3e64455cbe0211a1efce1fbba9530e31b..5faddcc6a7ae22d515db2285901965a5e7deda02 100644 (file)
--- a/libatomic/ChangeLog
+++ b/libatomic/ChangeLog
@@ -1,3 +1,11 @@
+2018-06-22  Jakub Jelinek  <jakub@redhat.com>
+
+       Backported from mainline
+       2018-04-18  David Malcolm  <dmalcolm@redhat.com>
+
+       PR jit/85384
+       * configure: Regenerate.
+
 2018-03-09  Andreas Krebbel  <krebbel@linux.vnet.ibm.com>
 
        Backport from mainline

diff --git a/libatomic/configure b/libatomic/configure
index c05fc9d11418539ae7267541469ddb16c1097f0b..2ae9b8d40f30434124b37b51ef0676cf495bd8bc 100755 (executable)
--- 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 c61190f7a7fd254d38ae31a2cc33aeda0685ad7f..98501d052768ef14a84c6f340f1e85014b1f5180 100644 (file)
--- a/libcc1/ChangeLog
+++ b/libcc1/ChangeLog
@@ -1,3 +1,11 @@
+2018-06-22  Jakub Jelinek  <jakub@redhat.com>
+
+       Backported from mainline
+       2018-04-18  David Malcolm  <dmalcolm@redhat.com>
+
+       PR jit/85384
+       * configure: Regenerate.
+
 2018-01-25  Release Manager
 
        * GCC 7.3.0 released.

diff --git a/libcc1/configure b/libcc1/configure
index d6f480fe930d384bb3baa532930b840780d997c7..962d34d927140d4d1bd0f1190e2afdf0aa7e0a27 100755 (executable)
--- 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 ec16da84f000eac26226a596bcf57552d8781802..1893d0dfbfb134fa831e3961c460be577df9d787 100644 (file)
--- a/libcilkrts/ChangeLog
+++ b/libcilkrts/ChangeLog
@@ -1,3 +1,11 @@
+2018-06-22  Jakub Jelinek  <jakub@redhat.com>
+
+       Backported from mainline
+       2018-04-18  David Malcolm  <dmalcolm@redhat.com>
+
+       PR jit/85384
+       * configure: Regenerate.
+
 2018-01-25  Release Manager
 
        * GCC 7.3.0 released.

diff --git a/libcilkrts/configure b/libcilkrts/configure
index 3cc8c999733c3df495a68c355539a8db60ec10e8..503337dc4b47696ae7f5b50e597dacfa121e5e4e 100644 (file)
--- 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 ec5dc75d463853d65cdb3c55ccebea7032771af7..f3136eabbc205f680fb9f03825f970ef6c00eba1 100644 (file)
--- a/libffi/ChangeLog
+++ b/libffi/ChangeLog
@@ -1,3 +1,11 @@
+2018-06-22  Jakub Jelinek  <jakub@redhat.com>
+
+       Backported from mainline
+       2018-04-18  David Malcolm  <dmalcolm@redhat.com>
+
+       PR jit/85384
+       * configure: Regenerate.
+
 2018-01-25  Release Manager
 
        * GCC 7.3.0 released.

diff --git a/libffi/configure b/libffi/configure
index 74b747b3b7e89e2c7e08154f20e75e27b35f4717..790a291011f6e7c37a4547fb643102317caf3e42 100755 (executable)
--- 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 f26d2bbfcb8814f37faa9b1f68bd5499a9728df3..7d54d6800f5e089943f98a4d016e487964829b2f 100644 (file)
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,11 @@
+2018-06-22  Jakub Jelinek  <jakub@redhat.com>
+
+       Backported from mainline
+       2018-04-18  David Malcolm  <dmalcolm@redhat.com>
+
+       PR jit/85384
+       * configure: Regenerate.
+
 2018-06-22  Andre Vieira  <andre.simoesdiasvieira@arm.com>
 
        Backport from mainline

diff --git a/libgcc/configure b/libgcc/configure
index 9a7eb8446bb1f10f921550aaa6d790907fa8d904..441601a1f76a158e7bbe26c29135ba634e5fc06c 100644 (file)
--- 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 958b65e73c33b402bb72b2c51d04203cd06ebc09..afe561b2162dacc62f8ad9cfc0132e92f656c35c 100644 (file)
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,11 @@
+2018-06-22  Jakub Jelinek  <jakub@redhat.com>
+
+       Backported from mainline
+       2018-04-18  David Malcolm  <dmalcolm@redhat.com>
+
+       PR jit/85384
+       * configure: Regenerate.
+
 2018-06-09  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
 
        Backport from trunk.

diff --git a/libgfortran/configure b/libgfortran/configure
index 81238fcb79c6aed7aa24ecb4d9b3c0d9751176e9..1db8f5f5224739cb03181e0784f5cd8d6daf0872 100755 (executable)
--- 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 cc463532157128ea57436c326b6d717964ed1e2f..9829516a532d538b5f7509a2fa57ba0ba3941041 100644 (file)
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,11 @@
+2018-06-22  Jakub Jelinek  <jakub@redhat.com>
+
+       Backported from mainline
+       2018-04-18  David Malcolm  <dmalcolm@redhat.com>
+
+       PR jit/85384
+       * configure: Regenerate.
+
 2018-05-01  Tom de Vries  <tom@codesourcery.com>
 
        backport from trunk:

diff --git a/libgomp/configure b/libgomp/configure
index b7e9f40b85292526e136f272c42897eea8086015..06166c66120fca26d26533b44701ca69869a133a 100755 (executable)
--- 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 ae7bfb6854cb85ee85db0d9044fc5d19726dfc91..5d18dbb66b4bda15028491a6c7b8dc34797bfe20 100644 (file)
--- a/libhsail-rt/ChangeLog
+++ b/libhsail-rt/ChangeLog
@@ -1,3 +1,11 @@
+2018-06-22  Jakub Jelinek  <jakub@redhat.com>
+
+       Backported from mainline
+       2018-04-18  David Malcolm  <dmalcolm@redhat.com>
+
+       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 a490125f5b337d13391daaf64c737517c1785364..a4fcc10c1f9bf0581f6f2df5c256b30ea1267fb3 100755 (executable)
--- 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 f66dd31b03aa35ef3ab50026ab7ae936a2db6e7e..2d2fee851d0472c1c748e283d2840bb2ed1867a0 100644 (file)
--- a/libitm/ChangeLog
+++ b/libitm/ChangeLog
@@ -1,3 +1,11 @@
+2018-06-22  Jakub Jelinek  <jakub@redhat.com>
+
+       Backported from mainline
+       2018-04-18  David Malcolm  <dmalcolm@redhat.com>
+
+       PR jit/85384
+       * configure: Regenerate.
+
 2018-01-25  Release Manager
 
        * GCC 7.3.0 released.

diff --git a/libitm/configure b/libitm/configure
index 775f370fbb5dc75197d62bd395f92cbd67c92210..96c494d4a3fac3e542de32989700cc674bc7f2c2 100644 (file)
--- 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 af0595017c9f60ae22ae2248cedee2b21565ffae..e10a10c719ba414f5d9781ac4bc32cd457518862 100644 (file)
--- a/libmpx/ChangeLog
+++ b/libmpx/ChangeLog
@@ -1,3 +1,11 @@
+2018-06-22  Jakub Jelinek  <jakub@redhat.com>
+
+       Backported from mainline
+       2018-04-18  David Malcolm  <dmalcolm@redhat.com>
+
+       PR jit/85384
+       * configure: Regenerate.
+
 2018-01-25  Release Manager
 
        * GCC 7.3.0 released.

diff --git a/libmpx/configure b/libmpx/configure
index 853993a522f1a298d5fee223aec74810aca9131b..2fd71ca89f6d72a5d304fc452fabee8aa7b9aef9 100644 (file)
--- 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 78121927ba01fabf3702774293dc94391e78a9bf..1f1e198cc451915ecfe36cc194dcc3905c633b34 100644 (file)
--- a/libobjc/ChangeLog
+++ b/libobjc/ChangeLog
@@ -1,3 +1,11 @@
+2018-06-22  Jakub Jelinek  <jakub@redhat.com>
+
+       Backported from mainline
+       2018-04-18  David Malcolm  <dmalcolm@redhat.com>
+
+       PR jit/85384
+       * configure: Regenerate.
+
 2018-01-25  Release Manager
 
        * GCC 7.3.0 released.

diff --git a/libobjc/configure b/libobjc/configure
index abf5aed71cfa5a105574dfb2d9d2651aaaad5657..84862a8286406f7acfad2016ab739684e83a1b2c 100755 (executable)
--- 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 42d03b2e7bef89943aacaf143f29aafe0baef508..2b20f8a3f1a4217517595fa965229161b523d70e 100644 (file)
--- a/liboffloadmic/ChangeLog
+++ b/liboffloadmic/ChangeLog
@@ -1,3 +1,12 @@
+2018-06-22  Jakub Jelinek  <jakub@redhat.com>
+
+       Backported from mainline
+       2018-04-18  David Malcolm  <dmalcolm@redhat.com>
+
+       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 e22b214ddbce37ff6ed8c075c7367ea0af292c7e..f873716991bbe4b22ae7907f4e25720d32c870ae 100644 (file)
--- 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 8b8c041d2bf87d001ce352387ec6017f7969559e..c031eb3e7fa8a043b593024845086e96089463fd 100644 (file)
--- 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 4c66b338b2c4a840ad0d22dd80f2349cc31facac..004c808fb3deb8b4b2b6b41675e539ca76b3a017 100644 (file)
--- a/libquadmath/ChangeLog
+++ b/libquadmath/ChangeLog
@@ -1,3 +1,11 @@
+2018-06-22  Jakub Jelinek  <jakub@redhat.com>
+
+       Backported from mainline
+       2018-04-18  David Malcolm  <dmalcolm@redhat.com>
+
+       PR jit/85384
+       * configure: Regenerate.
+
 2018-01-25  Release Manager
 
        * GCC 7.3.0 released.

diff --git a/libquadmath/configure b/libquadmath/configure
index d2f13bf7751e5dbfad167d93823832b9a3cd92fc..76a2c20b7e19c989c0e0c51de0fafec811be30c4 100755 (executable)
--- 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 3a1619045eb688bb261228d58a495aa071324774..a127bb0c2d60145d1ad23936b0ea3d7e0db021ce 100644 (file)
--- a/libsanitizer/ChangeLog
+++ b/libsanitizer/ChangeLog
@@ -1,3 +1,11 @@
+2018-06-22  Jakub Jelinek  <jakub@redhat.com>
+
+       Backported from mainline
+       2018-04-18  David Malcolm  <dmalcolm@redhat.com>
+
+       PR jit/85384
+       * configure: Regenerate.
+
 2018-06-07  Richard Biener  <rguenther@suse.de>
 
        Backport from mainline

diff --git a/libsanitizer/configure b/libsanitizer/configure
index 8e0c47ea8384882b25fd664d41555a383d7fb3b8..a3a08d635f4c273d227036924d249346bc5432d3 100755 (executable)
--- 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 299029f8521fdb4dcc780f4357ea0bf02fe2220c..9ae263e73baa1db9acdb5b468ccb11c55a56fe7d 100644 (file)
--- a/libssp/ChangeLog
+++ b/libssp/ChangeLog
@@ -1,3 +1,11 @@
+2018-06-22  Jakub Jelinek  <jakub@redhat.com>
+
+       Backported from mainline
+       2018-04-18  David Malcolm  <dmalcolm@redhat.com>
+
+       PR jit/85384
+       * configure: Regenerate.
+
 2018-01-25  Release Manager
 
        * GCC 7.3.0 released.

diff --git a/libssp/configure b/libssp/configure
index b14e922e6f158a419b7dd7e8bef1fddbf063b6bb..ee1751d20db1cd9c9db79785469a104b390b23d9 100755 (executable)
--- 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 4acbd4b8a1021067ce553a0b2441680c76163588..60a81cc0941881f2b16dedbc3ed4043c8fb1b2e0 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2018-06-22  Jakub Jelinek  <jakub@redhat.com>
+
+       Backported from mainline
+       2018-04-18  David Malcolm  <dmalcolm@redhat.com>
+
+       PR jit/85384
+       * configure: Regenerate.
+
 2018-06-22  Jonathan Wakely  <jwakely@redhat.com>
 
        Backport from mainline

diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 9e56113b87295fdc0951f55372d63ec97d463714..bc624207ce638c97d055a2aa925e49c55d323096 100755 (executable)
--- 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 4f4d7e00de4b9bd592dc2e1788661d7582a00b4c..1f5a9f6deb858551415651ab4869ef5aee96b63c 100644 (file)
--- a/libvtv/ChangeLog
+++ b/libvtv/ChangeLog
@@ -1,3 +1,11 @@
+2018-06-22  Jakub Jelinek  <jakub@redhat.com>
+
+       Backported from mainline
+       2018-04-18  David Malcolm  <dmalcolm@redhat.com>
+
+       PR jit/85384
+       * configure: Regenerate.
+
 2018-01-25  Release Manager
 
        * GCC 7.3.0 released.

diff --git a/libvtv/configure b/libvtv/configure
index c3bed2dfc708431b672fb4d46e52aecfee96396d..dfb9162c79fa8aa743d4e07660c4b2b7d42a696b 100755 (executable)
--- 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