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 /gcc | |
| 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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 8 | ||||
| -rwxr-xr-x | gcc/configure | 6 | ||||
| -rw-r--r-- | gcc/configure.ac | 4 |
3 files changed, 15 insertions, 3 deletions
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. |