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 18f65078c427c64cd972f3be8208ec8593be1457..b73c1d181a14404e13882cebc26d334078e3a955 100644 (file)
--- 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 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/fixincludes/ChangeLog b/fixincludes/ChangeLog
index 808b64aeb761664ea30d543232cfad65d81aab14..fc6e80d61231166bdd037ad559ad71b8a7d14f10 100644 (file)
--- 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 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 0bfafdd242aa64037c80388976f8b8288139d4b1..a74304871afc3d9117bb7894db06b88e2df4ae97 100644 (file)
--- 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 7fe7efe8bb468b1e56fd9e4f2d90dbfe93ad801d..6121e163259dd6c09188b48218b3fec63d41b2f8 100755 (executable)
--- 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 67e1682ad6640225ac50ff3d875e6a1a4e928086..b066cc609e1c2615e66307d5439f765a4f3b286b 100644 (file)
--- 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 3894505f32950d115322ed1c2c90851676fdf1e6..6661c4d3832e28215ffa3efe8c9f9dbb21478843 100644 (file)
--- 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 76b39921e7273323ff839636cd0b148ae4673263..aedb04ab4f99bfa3f4a7ceb99cd59e3ec479de23 100755 (executable)
--- 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 81aaba4b11f5c3a42325db04fbd37885553fde0e..8da3219e158ad810a657535185b41a1fe6ffe20c 100644 (file)
--- 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 9445aee12918447ac2dbc2b71d9592a83d2af976..d0d8495ba05163f6ffb6b33dc35c206be4d72f7b 100755 (executable)
--- 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 dee8441dc0a7d174c3f0d24c2174d5be892ab81c..cd65832e960e703cd124c98cb9b03ffb926b2048 100644 (file)
--- 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 23d1a7645ff3a85059d650380fc14a8f8cb46be1..f53a121611cfef36656da743374795d1e5431677 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
@@ -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 f7de95059b11ef9309e16cb333043f9f1d1509f0..eaface5ef2f7097a82b400b7120e094aa25a6b70 100644 (file)
--- 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 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 aeaa65391677b8765e9118dfa0fd24960297507c..353848483183f9eddcb06980c25ccb64c42097a5 100644 (file)
--- 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 7399c862bb0937323261bd1a9ea35808067a11a4..e0caeecd3bb17a312a03384eec26de9a1ac43f14 100644 (file)
--- 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 c7b334668a328329ccfe8eea9e9a47d3436591f9..03b1f01e93b4590108c95a96be44d956d6d338ff 100644 (file)
--- 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 86904ef7eeabf620a93855fe0613fd1df3e2d892..cede17dc0b8890ffd643527d85d1eba13279227e 100755 (executable)
--- 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 ef528093c124b9a316f3e979f417b1297c70cce4..0703dac14c735e421aeff40985d47978317e3c4d 100644 (file)
--- 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 92b8142b0b1861577eb5b823353c3874569609e5..fa217c41cd20777c0bc917f2bb467c00fac86d87 100755 (executable)
--- 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 372917daa50f3433e2506dd95bb3fb6688454634..3c16d0ee7f50ac7b15a41ad077ba2111af93dc31 100644 (file)
--- 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 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 c5ca3875fa5da8aa83ba2c97cda2844243730e2a..659eea68618fc352ac982c4282014e3a06b72874 100644 (file)
--- 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 a57805e20df3254183163bc938fe65a811eedaa1..03e4274de303854309757e2c4b9ed71d787bdc2b 100644 (file)
--- 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 f8cc639fd0d5519d4508583d06372d8971fc8166..f3dae22254766e8aec5f0ab47030a304a7db5ade 100644 (file)
--- 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 dfa4419b8400426238418fb7322e29fc0aec220a..bd73ef7286aa0c993c27af83075610b35d159a10 100644 (file)
--- 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 b5422e3845f2b9ea7514189cf268d976b85ab560..a26055cf816fc9dd5af11b68a7865f651d151355 100644 (file)
--- 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 ce52fab100c4526a45b4ee4717033593c63e6f97..855cba2edf98b507776aca918f8c7ef964c5b954 100755 (executable)
--- 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 72f07523637ca0e3a072181728e9de8819c558a7..28c8abd535a714bbff8f910df503ed856c111fd4 100644 (file)
--- 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 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 33ca15f055579645ab0104535d2c683fec0bc1db..3aa70f1c4694f61d9a8af916d7c870346215e91a 100644 (file)
--- 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 2a6947995962d930921baa6f702f59635d91dfa4..ca9f6482063a8a8bd756148d717ed67a0d3913f9 100755 (executable)
--- 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 922e947af08d0e72ccd22fb083f73c601103c784..1854bc8fc3bdf0dcf90cc3327dacf5cb9c1f19c1 100644 (file)
--- 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 3b61a1f7537d949980ec381c2b278a1eded629fc..3614f8ae9180eda52c7e8fc9c3de3e0557527a7e 100755 (executable)
--- 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 b5e81131f25ce3cb809f71f617a2a494c0349caa..2ed241ec14956fcce70974e915e7faf239b91da6 100644 (file)
--- 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 df7bff70ba18c950e287ce00f7e04ea3210832e0..f88c04cd4e3fdeec7024ceaaaf7dc82034fb2b5f 100755 (executable)
--- 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 13d666cd803e1307b539bd8f8830421a04cda9b4..e407fc66ea750d3519c2076716129fd846897089 100644 (file)
--- 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 ad6c506c60652685418adc7bbd7ec35f085d7b0a..48b56537aa71e05a279a750cfeb499b33598c538 100755 (executable)
--- 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 82b52bc4845c768b046396a078e252cc6b70d7d4..0d38b1105e9ac9519946c5fc2237723cf0206893 100644 (file)
--- 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 1cd1f70cd768d35fa38075fb81d73286283248d4..b94f78585c0ebe0a86d8836420c25c101a6a0f05 100755 (executable)
--- 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 7b2170c4f4f2761e5355ed73d1434ea5619a965a..04dc03c0751b749c0fbd77823f79b07fa6892d50 100644 (file)
--- 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 cdea9eac3eeb87d2b64605ac80d50a7d0e28d377..7843cd7f6a340b7218303e1cdde066e4d7ed048f 100755 (executable)
--- 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