mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-21 14:41:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Jakub Jelinek 2018-06-22 23:16:41 +02:00 committed by Jakub Jelinek
parent 102ea0d5f1
commit 940e9f392d
46 changed files with 216 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -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.

8
config/ChangeLog
View File

@ -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.

2
config/acx.m4
View File

@ -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
])

2
configure vendored
View File

@ -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

8
fixincludes/ChangeLog
View File

@ -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.

2
fixincludes/configure vendored
View File

@ -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

11
gcc/ChangeLog
View File

@ -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

8
gcc/configure vendored
View File

@ -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.

4
gcc/configure.ac
View File

@ -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.

8
libada/ChangeLog
View File

@ -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.

2
libada/configure vendored
View File

@ -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

8
libatomic/ChangeLog
View File

@ -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

7
libatomic/configure vendored
View File

@ -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

8
libcc1/ChangeLog
View File

@ -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.

2
libcc1/configure vendored
View File

@ -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

8
libcilkrts/ChangeLog
View File

@ -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.

2
libcilkrts/configure vendored
View File

@ -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

8
libffi/ChangeLog
View File

@ -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.

2
libffi/configure vendored
View File

@ -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

8
libgcc/ChangeLog
View File

@ -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

2
libgcc/configure vendored
View File

@ -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

8
libgfortran/ChangeLog
View File

@ -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.

2
libgfortran/configure vendored
View File

@ -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

8
libgomp/ChangeLog
View File

@ -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:

2
libgomp/configure vendored
View File

@ -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

8
libhsail-rt/ChangeLog
View File

@ -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.

2
libhsail-rt/configure vendored
View File

@ -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

8
libitm/ChangeLog
View File

@ -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.

2
libitm/configure vendored
View File

@ -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

8
libmpx/ChangeLog
View File

@ -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.

2
libmpx/configure vendored
View File

@ -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

8
libobjc/ChangeLog
View File

@ -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.

2
libobjc/configure vendored
View File

@ -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

9
liboffloadmic/ChangeLog
View File

@ -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.

2
liboffloadmic/configure vendored
View File

@ -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

2
liboffloadmic/plugin/configure vendored
View File

@ -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

8
libquadmath/ChangeLog
View File

@ -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.

2
libquadmath/configure vendored
View File

@ -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

8
libsanitizer/ChangeLog
View File

@ -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

2
libsanitizer/configure vendored
View File

@ -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

8
libssp/ChangeLog
View File

@ -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.

2
libssp/configure vendored
View File

@ -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

8
libstdc++-v3/ChangeLog
View File

@ -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

2
libstdc++-v3/configure vendored
View File

@ -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

8
libvtv/ChangeLog
View File

@ -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.

2
libvtv/configure vendored
View File

@ -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