On Thu, Apr 12, 2018 at 04:51:21PM -0400, David Malcolm wrote:
> Successfully bootstrapped & regrtested on x86_64-pc-linux-gnu.
>
> OK for trunk?
>
> config/ChangeLog:
> PR jit/85384
> * acx.m4 (GCC_BASE_VER): Remove \$\$ from sed expression.
>
> gcc/ChangeLog:
> 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.ac: Regenerate.
I'd prefer not touching acx.m4 and instead just:
gcc_driver_version=$gcc_BASEVER
if test x$with_gcc_major_version_only = xyes ; then
gcc_driver_version=`echo $gcc_BASEVER | sed -e 's/^\([0-9]*\).*$/\1/'`
fi
in configure.ac; after all, it is something what is done elsewhere in
configure.ac:
#define GCCPLUGIN_VERSION_MAJOR `echo $gcc_BASEVER | sed -e
's/^\([0-9]*\).*$/\1/'`
#define GCCPLUGIN_VERSION_MINOR `echo $gcc_BASEVER | sed -e
's/^[0-9]*\.\([0-9]*\).*$/\1/'`
#define GCCPLUGIN_VERSION_PATCHLEVEL `echo $gcc_BASEVER | sed -e
's/^[0-9]*\.[0-9]*\.\([0-9]*\)$/\1/'`
and the $ is used in all similar sed patterns.
> --- 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.
Jakub
