diff --git a/libatomic/ChangeLog b/libatomic/ChangeLog
index 9e0c02f5c0e967b04425643468476d5c810c7909..f87859d3c517c58c1530a9ad56393e22325e8fdf 100644
--- a/libatomic/ChangeLog
+++ b/libatomic/ChangeLog
@@ -1,3 +1,10 @@
+2017-01-21 Jakub Jelinek <jakub@redhat.com>
+
+ PR other/79046
+ * testsuite/Makefile.am (gcc_version): Use @get_gcc_base_ver@ instead
+ of cat to get version from BASE-VER file.
+ * testsuite/Makefile.in: Regenerated.
+
2017-01-17 Jakub Jelinek <jakub@redhat.com>
PR other/79046
diff --git a/libatomic/testsuite/Makefile.am b/libatomic/testsuite/Makefile.am
index 561b7e25448e27f1236ee70a80b0ce5110194ef7..a9a0144185abd39efd4b33cc2ea27eac637d2899 100644
--- a/libatomic/testsuite/Makefile.am
+++ b/libatomic/testsuite/Makefile.am
@@ -3,7 +3,7 @@
AUTOMAKE_OPTIONS = foreign dejagnu
# May be used by various substitution variables.
-gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
+gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER)
EXPECT = $(shell if test -f $(top_builddir)/../expect/expect; then \
echo $(top_builddir)/../expect/expect; else echo expect; fi)
diff --git a/libatomic/testsuite/Makefile.in b/libatomic/testsuite/Makefile.in
index f0928b2f3dcc702e8569c03440d627032ce40f54..adfc231484a6c81a3ea9bac8a6efce276e610647 100644
--- a/libatomic/testsuite/Makefile.in
+++ b/libatomic/testsuite/Makefile.in
@@ -215,7 +215,7 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign dejagnu
# May be used by various substitution variables.
-gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
+gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER)
EXPECT = $(shell if test -f $(top_builddir)/../expect/expect; then \
echo $(top_builddir)/../expect/expect; else echo expect; fi)
diff --git a/libffi/ChangeLog b/libffi/ChangeLog
index a0ed590c8a5a3ce24b6e3ac921fe6946545ac384..e73b93b5470f2b760abfce0dbf82bfd0cfad50a3 100644
--- a/libffi/ChangeLog
+++ b/libffi/ChangeLog
@@ -1,3 +1,15 @@
+2017-01-21 Jakub Jelinek <jakub@redhat.com>
+
+ PR other/79046
+ * configure.ac: Add GCC_BASE_VER.
+ * include/Makefile.am (gcc_version): Use @get_gcc_base_ver@ instead
+ of cat to get version from BASE-VER file.
+ * configure: Regenerated.
+ * testsuite/Makefile.in: Regenerated.
+ * include/Makefile.in: Regenerated.
+ * Makefile.in: Regenerated.
+ * man/Makefile.in: Regenerated.
+
2016-11-15 Matthias Klose <doko@ubuntu.com>
* configure: Regenerate.
diff --git a/libffi/Makefile.in b/libffi/Makefile.in
index f4292b5dd805f7fa05f585f36ca72f8a6010dfee..8a99ee58b68da65f0360ce7c5b8eb91adb12dab8 100644
--- a/libffi/Makefile.in
+++ b/libffi/Makefile.in
@@ -293,6 +293,7 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+get_gcc_base_ver = @get_gcc_base_ver@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
diff --git a/libffi/configure b/libffi/configure
index 4648c43e903de815150aafd50d00ea3597ffd866..74b747b3b7e89e2c7e08154f20e75e27b35f4717 100755
--- a/libffi/configure
+++ b/libffi/configure
@@ -604,6 +604,7 @@ ac_subst_vars='am__EXEEXT_FALSE
am__EXEEXT_TRUE
LTLIBOBJS
LIBOBJS
+get_gcc_base_ver
LIBAT_BUILD_VERSIONED_SHLIB_SUN_FALSE
LIBAT_BUILD_VERSIONED_SHLIB_SUN_TRUE
LIBAT_BUILD_VERSIONED_SHLIB_GNU_FALSE
@@ -777,6 +778,7 @@ enable_structs
enable_raw_api
enable_purify_safety
enable_symvers
+with_gcc_major_version_only
'
ac_precious_vars='build_alias
host_alias
@@ -1434,6 +1436,8 @@ Optional Packages:
--with-pic try to use only PIC/non-PIC objects [default=use
both]
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
+ --with-gcc-major-version-only
+ use only GCC major number in filesystem paths
Some influential environment variables:
CC C compiler command
@@ -11386,7 +11390,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11389 "configure"
+#line 11393 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11492,7 +11496,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11495 "configure"
+#line 11499 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -16433,6 +16437,21 @@ fi
$as_echo "$as_me: versioning on shared library symbols is $enable_symvers" >&6;}
+# Determine what GCC version number to use in filesystem paths.
+
+ get_gcc_base_ver="cat"
+
+# 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/'"
+ fi
+
+fi
+
+
+
+
ac_config_commands="$ac_config_commands include"
ac_config_commands="$ac_config_commands src"
diff --git a/libffi/configure.ac b/libffi/configure.ac
index 6205a10c36babaafbaa5e661cf706b4186a9ae51..a01d8ac16b0ff8b01746f6ec330dd28366b9086e 100644
--- a/libffi/configure.ac
+++ b/libffi/configure.ac
@@ -358,6 +358,9 @@ fi
# Check linker support.
LIBAT_ENABLE_SYMVERS
+# Determine what GCC version number to use in filesystem paths.
+GCC_BASE_VER
+
AC_CONFIG_COMMANDS(include, [test -d include || mkdir include])
AC_CONFIG_COMMANDS(src, [
test -d src || mkdir src
diff --git a/libffi/include/Makefile.am b/libffi/include/Makefile.am
index 79f222c482ce63912245fe368215e533ab82f6e7..37fde6e968066a66576020683c48e05be390c2cf 100644
--- a/libffi/include/Makefile.am
+++ b/libffi/include/Makefile.am
@@ -7,7 +7,7 @@ noinst_HEADERS=ffi_common.h ffi_cfi.h
EXTRA_DIST=ffi.h.in
# Where generated headers like ffitarget.h get installed.
-gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
+gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER)
toollibffidir := $(libdir)/gcc/$(target_alias)/$(gcc_version)/include
toollibffi_HEADERS = ffi.h ffitarget.h
diff --git a/libffi/include/Makefile.in b/libffi/include/Makefile.in
index 82b25d7267edbf0e82bee8a2dd1696fb21adf05a..e0c75992327498b3d969fe38aed22141ae42da3d 100644
--- a/libffi/include/Makefile.in
+++ b/libffi/include/Makefile.in
@@ -211,6 +211,7 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+get_gcc_base_ver = @get_gcc_base_ver@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -252,7 +253,7 @@ noinst_HEADERS = ffi_common.h ffi_cfi.h
EXTRA_DIST = ffi.h.in
# Where generated headers like ffitarget.h get installed.
-gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
+gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER)
toollibffidir := $(libdir)/gcc/$(target_alias)/$(gcc_version)/include
toollibffi_HEADERS = ffi.h ffitarget.h
all: all-am
diff --git a/libffi/man/Makefile.in b/libffi/man/Makefile.in
index be296a57db983e45498997042102bcdf412df5d3..0243bdbedfa21a3ca7be41cb1db6db70d3c8ed19 100644
--- a/libffi/man/Makefile.in
+++ b/libffi/man/Makefile.in
@@ -209,6 +209,7 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+get_gcc_base_ver = @get_gcc_base_ver@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
diff --git a/libffi/testsuite/Makefile.in b/libffi/testsuite/Makefile.in
index 0e244202326ffad1af7e4b14975a9132d797be5c..b7da4b0b3e7248899a1efa5d418f1e20c3a653bf 100644
--- a/libffi/testsuite/Makefile.in
+++ b/libffi/testsuite/Makefile.in
@@ -180,6 +180,7 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+get_gcc_base_ver = @get_gcc_base_ver@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index d1c1ae1bb9178351de670fff25bfbb936a923a81..806c4f2f2bdb3a3b1f6a6c39437f18637d040c5b 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,10 @@
+2017-01-21 Jakub Jelinek <jakub@redhat.com>
+
+ PR other/79046
+ * testsuite/Makefile.am (gcc_version): Use @get_gcc_base_ver@ instead
+ of cat to get version from BASE-VER file.
+ * testsuite/Makefile.in: Regenerated.
+
2017-01-19 Jakub Jelinek <jakub@redhat.com>
* plugin/cuda/cuda.h (CUdeviceptr): Typedef to unsigned long long even
diff --git a/libgomp/testsuite/Makefile.am b/libgomp/testsuite/Makefile.am
index 66a9d947e044278ec2ee0b2894c89c1ef51cc991..e2a3f460eb0fe89f8e09f3378c4ca8da0e9b0646 100644
--- a/libgomp/testsuite/Makefile.am
+++ b/libgomp/testsuite/Makefile.am
@@ -3,7 +3,7 @@
AUTOMAKE_OPTIONS = foreign dejagnu
# May be used by various substitution variables.
-gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
+gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER)
EXPECT = $(shell if test -f $(top_builddir)/../expect/expect; then \
echo $(top_builddir)/../expect/expect; else echo expect; fi)
diff --git a/libgomp/testsuite/Makefile.in b/libgomp/testsuite/Makefile.in
index 9a1305016c9b5a09fb950cddba9a0b69d4e1c2b3..6edb7ae7ade7b487cfa8b835cec983ea23c09355 100644
--- a/libgomp/testsuite/Makefile.in
+++ b/libgomp/testsuite/Makefile.in
@@ -246,7 +246,7 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign dejagnu
# May be used by various substitution variables.
-gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
+gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER)
EXPECT = $(shell if test -f $(top_builddir)/../expect/expect; then \
echo $(top_builddir)/../expect/expect; else echo expect; fi)
diff --git a/libitm/ChangeLog b/libitm/ChangeLog
index 5f44e3f1250b59e963f485a7c39a81bda1948cdb..f930cf38797def8526c07e708be283780e218512 100644
--- a/libitm/ChangeLog
+++ b/libitm/ChangeLog
@@ -1,3 +1,10 @@
+2017-01-21 Jakub Jelinek <jakub@redhat.com>
+
+ PR other/79046
+ * testsuite/Makefile.am (gcc_version): Use @get_gcc_base_ver@ instead
+ of cat to get version from BASE-VER file.
+ * testsuite/Makefile.in: Regenerated.
+
2017-01-19 Uros Bizjak <ubizjak@gmail.com>
* config/x86/target.h (htm_available): Determine vendor from
diff --git a/libitm/testsuite/Makefile.am b/libitm/testsuite/Makefile.am
index 561b7e25448e27f1236ee70a80b0ce5110194ef7..a9a0144185abd39efd4b33cc2ea27eac637d2899 100644
--- a/libitm/testsuite/Makefile.am
+++ b/libitm/testsuite/Makefile.am
@@ -3,7 +3,7 @@
AUTOMAKE_OPTIONS = foreign dejagnu
# May be used by various substitution variables.
-gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
+gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER)
EXPECT = $(shell if test -f $(top_builddir)/../expect/expect; then \
echo $(top_builddir)/../expect/expect; else echo expect; fi)
diff --git a/libitm/testsuite/Makefile.in b/libitm/testsuite/Makefile.in
index 04c4d8abe103e0bcfe096c4acf8cc5f4a3746454..eb9e992279ddfccac3c5795eda095c4af6a752d9 100644
--- a/libitm/testsuite/Makefile.in
+++ b/libitm/testsuite/Makefile.in
@@ -226,7 +226,7 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign dejagnu
# May be used by various substitution variables.
-gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
+gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER)
EXPECT = $(shell if test -f $(top_builddir)/../expect/expect; then \
echo $(top_builddir)/../expect/expect; else echo expect; fi)
diff --git a/libmpx/ChangeLog b/libmpx/ChangeLog
index 16c40e005e122ef539fbe358a0e5c6bc077cc79e..82daa1fc946549d57d6af833d0ec29890bfe7e00 100644
--- a/libmpx/ChangeLog
+++ b/libmpx/ChangeLog
@@ -1,3 +1,12 @@
+2017-01-21 Jakub Jelinek <jakub@redhat.com>
+
+ PR other/79046
+ * mpxrt/Makefile.am (gcc_version): Use @get_gcc_base_ver@ instead
+ of cat to get version from BASE-VER file.
+ * mpxwrap/Makefile.am (gcc_version): Likewise.
+ * mpxrt/Makefile.in: Regenerated.
+ * mpxwrap/Makefile.in: Regenerated.
+
2017-01-19 Jakub Jelinek <jakub@redhat.com>
PR other/79046
diff --git a/libmpx/mpxrt/Makefile.am b/libmpx/mpxrt/Makefile.am
index 3280b62a96a6a96a4cdaff208116f28df083a544..41c806f97228b2bc7537c27aee0b651826e16421 100644
--- a/libmpx/mpxrt/Makefile.am
+++ b/libmpx/mpxrt/Makefile.am
@@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I $(top_srcdir) -I $(top_srcdir)/config
if LIBMPX_SUPPORTED
# May be used by toolexeclibdir.
-gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
+gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER)
AM_CPPFLAGS = -I$(top_srcdir)/..
AM_CFLAGS = $(XCFLAGS)
diff --git a/libmpx/mpxrt/Makefile.in b/libmpx/mpxrt/Makefile.in
index 1770350e9233ea1295bc82b9f884c41ce7e26235..4c55d20c13ebf7ac4ebb3dc2c5a85d24970ed260 100644
--- a/libmpx/mpxrt/Makefile.in
+++ b/libmpx/mpxrt/Makefile.in
@@ -251,7 +251,7 @@ top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I $(top_srcdir) -I $(top_srcdir)/config
# May be used by toolexeclibdir.
-@LIBMPX_SUPPORTED_TRUE@gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
+@LIBMPX_SUPPORTED_TRUE@gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER)
@LIBMPX_SUPPORTED_TRUE@AM_CPPFLAGS = -I$(top_srcdir)/..
@LIBMPX_SUPPORTED_TRUE@AM_CFLAGS = $(XCFLAGS)
@LIBMPX_SUPPORTED_TRUE@toolexeclib_LTLIBRARIES = libmpx.la
diff --git a/libmpx/mpxwrap/Makefile.am b/libmpx/mpxwrap/Makefile.am
index f24cdc835dc5217c7a1ad9083bf434a9a1635d82..d9e84ae66219d117e55cbc6be9dee18b55d573f6 100644
--- a/libmpx/mpxwrap/Makefile.am
+++ b/libmpx/mpxwrap/Makefile.am
@@ -2,7 +2,7 @@ ALCLOCAL_AMFLAGS = -I .. -I ../config
AM_CPPFLAGS = -I $(top_srcdir)
# May be used by toolexeclibdir.
-gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
+gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER)
libmpxwrappers_la_CFLAGS = -fcheck-pointer-bounds -mmpx -fno-chkp-check-read \
-fno-chkp-check-write -fno-chkp-use-wrappers -fPIC
diff --git a/libmpx/mpxwrap/Makefile.in b/libmpx/mpxwrap/Makefile.in
index 19209b3a49b382f396b78664cd257f09bacd3f7e..1b929b9f59810fc679a0dc13a94be1018aa80fb6 100644
--- a/libmpx/mpxwrap/Makefile.in
+++ b/libmpx/mpxwrap/Makefile.in
@@ -251,7 +251,7 @@ ALCLOCAL_AMFLAGS = -I .. -I ../config
AM_CPPFLAGS = -I $(top_srcdir)
# May be used by toolexeclibdir.
-gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
+gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER)
libmpxwrappers_la_CFLAGS = -fcheck-pointer-bounds -mmpx -fno-chkp-check-read \
-fno-chkp-check-write -fno-chkp-use-wrappers -fPIC
diff --git a/liboffloadmic/ChangeLog b/liboffloadmic/ChangeLog
index 71c9a1cc674eec0a45d1b9ab2b2d105e1bfaad8d..3d8ad67d2d4b66e7171fbd83d26444f786ad3585 100644
--- a/liboffloadmic/ChangeLog
+++ b/liboffloadmic/ChangeLog
@@ -1,3 +1,13 @@
+2017-01-21 Jakub Jelinek <jakub@redhat.com>
+
+ PR other/79046
+ * plugin/configure.ac: Add GCC_BASE_VER.
+ * plugin/Makefile.am (gcc_version): Use @get_gcc_base_ver@ instead
+ of cat to get version from BASE-VER file.
+ * plugin/configure: Regenerated.
+ * plugin/aclocal.m4: Regenerated.
+ * plugin/Makefile.in: Regenerated.
+
2017-01-20 Jakub Jelinek <jakub@redhat.com>
PR other/79046
diff --git a/liboffloadmic/plugin/Makefile.am b/liboffloadmic/plugin/Makefile.am
index d80c970add077a49e7bb0d28e04edf44ded60642..7a42238581a4a8d9e398b8a56a1c7b36dc448f08 100644
--- a/liboffloadmic/plugin/Makefile.am
+++ b/liboffloadmic/plugin/Makefile.am
@@ -1,6 +1,6 @@
# Plugin for offload execution on Intel MIC devices.
#
-# Copyright (C) 2014 Free Software Foundation, Inc.
+# Copyright (C) 2014-2017 Free Software Foundation, Inc.
#
# Contributed by Ilya Verbin <ilya.verbin@intel.com> and
# Andrey Turetskiy <andrey.turetskiy@intel.com>.
@@ -42,7 +42,7 @@ liboffload_src_dir = $(top_srcdir)/../runtime
liboffload_dir = $(top_builddir)/..
# May be used by toolexeclibdir.
-gcc_version := $(shell cat $(top_srcdir)/../../gcc/BASE-VER)
+gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../../gcc/BASE-VER)
libsubincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)$(MULTISUBDIR)/include
# Search for main_target_image.h in these directories
target_prefix_dir = $(libdir)/gcc/$(accel_target)/$(gcc_version)$(MULTISUBDIR)
diff --git a/liboffloadmic/plugin/Makefile.in b/liboffloadmic/plugin/Makefile.in
index e052a4e4b7f8e7e29e92dc1a8b74f29b33548f05..2a7c8d2ec6c8fff9fac13d09d44f5c29c8443353 100644
--- a/liboffloadmic/plugin/Makefile.in
+++ b/liboffloadmic/plugin/Makefile.in
@@ -17,7 +17,7 @@
# Plugin for offload execution on Intel MIC devices.
#
-# Copyright (C) 2014 Free Software Foundation, Inc.
+# Copyright (C) 2014-2017 Free Software Foundation, Inc.
#
# Contributed by Ilya Verbin <ilya.verbin@intel.com> and
# Andrey Turetskiy <andrey.turetskiy@intel.com>.
@@ -88,7 +88,8 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(srcdir)/../../mkinstalldirs $(srcdir)/../../depcomp \
$(am__plugin_include_HEADERS_DIST)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/../../config/acx.m4 \
+ $(top_srcdir)/../../config/depstand.m4 \
$(top_srcdir)/../../config/lead-dot.m4 \
$(top_srcdir)/../../config/multi.m4 \
$(top_srcdir)/../../config/override.m4 \
@@ -263,6 +264,7 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+get_gcc_base_ver = @get_gcc_base_ver@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -312,7 +314,7 @@ liboffload_src_dir = $(top_srcdir)/../runtime
liboffload_dir = $(top_builddir)/..
# May be used by toolexeclibdir.
-gcc_version := $(shell cat $(top_srcdir)/../../gcc/BASE-VER)
+gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../../gcc/BASE-VER)
libsubincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)$(MULTISUBDIR)/include
# Search for main_target_image.h in these directories
target_prefix_dir = $(libdir)/gcc/$(accel_target)/$(gcc_version)$(MULTISUBDIR)
diff --git a/liboffloadmic/plugin/aclocal.m4 b/liboffloadmic/plugin/aclocal.m4
index efeb122691a9b8be1b6751a9189da8c5a66bdc81..a4179ef40ac88c16597d8e9ae3dd03ba0c2fdec9 100644
--- a/liboffloadmic/plugin/aclocal.m4
+++ b/liboffloadmic/plugin/aclocal.m4
@@ -988,6 +988,7 @@ AC_SUBST([am__tar])
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
+m4_include([../../config/acx.m4])
m4_include([../../config/depstand.m4])
m4_include([../../config/lead-dot.m4])
m4_include([../../config/multi.m4])
diff --git a/liboffloadmic/plugin/configure b/liboffloadmic/plugin/configure
index 13736707dc5c53376ce83d9c34a8ef6a2d074a56..8b8c041d2bf87d001ce352387ec6017f7969559e 100644
--- a/liboffloadmic/plugin/configure
+++ b/liboffloadmic/plugin/configure
@@ -601,6 +601,7 @@ ac_subst_vars='am__EXEEXT_FALSE
am__EXEEXT_TRUE
LTLIBOBJS
LIBOBJS
+get_gcc_base_ver
toolexeclibdir
toolexecdir
CXXCPP
@@ -740,6 +741,7 @@ with_pic
enable_fast_install
with_gnu_ld
enable_libtool_lock
+with_gcc_major_version_only
'
ac_precious_vars='build_alias
host_alias
@@ -1395,6 +1397,8 @@ Optional Packages:
--with-pic try to use only PIC/non-PIC objects [default=use
both]
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
+ --with-gcc-major-version-only
+ use only GCC major number in filesystem paths
Some influential environment variables:
CC C compiler command
@@ -8783,7 +8787,7 @@ _LT_EOF
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
else
- export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
fi
aix_use_runtimelinking=no
@@ -10811,7 +10815,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10814 "configure"
+#line 10818 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10917,7 +10921,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10920 "configure"
+#line 10924 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13269,7 +13273,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
else
- export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
fi
;;
pw32*)
@@ -14176,6 +14180,21 @@ hardcode_into_libs=no
+# Determine what GCC version number to use in filesystem paths.
+
+ get_gcc_base_ver="cat"
+
+# 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/'"
+ fi
+
+fi
+
+
+
+
# Must be last
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -14915,7 +14934,6 @@ CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
CC="$CC"
CXX="$CXX"
GFORTRAN="$GFORTRAN"
-GCJ="$GCJ"
# The HP-UX ksh and POSIX shell print the target directory to stdout
diff --git a/liboffloadmic/plugin/configure.ac b/liboffloadmic/plugin/configure.ac
index a2dd02de1e4238d7f7b98dd955fd83ed0ad1072f..9c48cafd38b1ca5457da27895d491e59f8fffeda 100644
--- a/liboffloadmic/plugin/configure.ac
+++ b/liboffloadmic/plugin/configure.ac
@@ -132,5 +132,8 @@ hardcode_into_libs=no
AC_SUBST(toolexecdir)
AC_SUBST(toolexeclibdir)
+# Determine what GCC version number to use in filesystem paths.
+GCC_BASE_VER
+
# Must be last
AC_OUTPUT
diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog
index 1e0d0f09d310bbbaebe121f4d7937092a00b8389..bdc4fb106a2f0061f8805e14f3d1aaab249e53ba 100644
--- a/libsanitizer/ChangeLog
+++ b/libsanitizer/ChangeLog
@@ -1,3 +1,20 @@
+2017-01-21 Jakub Jelinek <jakub@redhat.com>
+
+ PR other/79046
+ * interception/Makefile.am (gcc_version): Use @get_gcc_base_ver@
+ instead of cat to get version from BASE-VER file.
+ * asan/Makefile.am (gcc_version): Likewise.
+ * ubsan/Makefile.am (gcc_version): Likewise.
+ * sanitizer_common/Makefile.am (gcc_version): Likewise.
+ * lsan/Makefile.am (gcc_version): Likewise.
+ * tsan/Makefile.am (gcc_version): Likewise.
+ * interception/Makefile.in: Regenerated.
+ * asan/Makefile.in: Regenerated.
+ * ubsan/Makefile.in: Regenerated.
+ * sanitizer_common/Makefile.in: Regenerated.
+ * lsan/Makefile.in: Regenerated.
+ * tsan/Makefile.in: Regenerated.
+
2017-01-17 Jakub Jelinek <jakub@redhat.com>
PR other/79046
diff --git a/libsanitizer/asan/Makefile.am b/libsanitizer/asan/Makefile.am
index bfd28c0388e4edca5c05f0adfd625f99c82908d4..43377a95622743bafd8329d86b50567876e41f3b 100644
--- a/libsanitizer/asan/Makefile.am
+++ b/libsanitizer/asan/Makefile.am
@@ -1,7 +1,7 @@
AM_CPPFLAGS = -I $(top_srcdir)/include -I $(top_srcdir)
# May be used by toolexeclibdir.
-gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
+gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER)
DEFS = -D_GNU_SOURCE -D_DEBUG -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -DASAN_HAS_EXCEPTIONS=1 -DASAN_NEEDS_SEGV=1 -DCAN_SANITIZE_UB=0
if USING_MAC_INTERPOSE
diff --git a/libsanitizer/asan/Makefile.in b/libsanitizer/asan/Makefile.in
index 9fe24166dd3053f5311d54be12cf4a5acba1d8e3..4dad60ba1ae10f2dc079de15809648b8d1b81210 100644
--- a/libsanitizer/asan/Makefile.in
+++ b/libsanitizer/asan/Makefile.in
@@ -298,7 +298,7 @@ top_srcdir = @top_srcdir@
AM_CPPFLAGS = -I $(top_srcdir)/include -I $(top_srcdir)
# May be used by toolexeclibdir.
-gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
+gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER)
AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic \
-Wno-long-long -fPIC -fno-builtin -fno-exceptions -fno-rtti \
-fomit-frame-pointer -funwind-tables -fvisibility=hidden \
diff --git a/libsanitizer/interception/Makefile.am b/libsanitizer/interception/Makefile.am
index 4fb69a963d36a9306afac6960292828242e3676b..bd3172309bd060b6b2246ae9e944ad4e48378f53 100644
--- a/libsanitizer/interception/Makefile.am
+++ b/libsanitizer/interception/Makefile.am
@@ -1,7 +1,7 @@
AM_CPPFLAGS = -I $(top_srcdir)/include -I $(top_srcdir)
# May be used by toolexeclibdir.
-gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
+gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER)
DEFS = -D_GNU_SOURCE -D_DEBUG -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS
AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic -Wno-long-long -fPIC -fno-builtin -fno-exceptions -fno-rtti -fomit-frame-pointer -funwind-tables -fvisibility=hidden -Wno-variadic-macros
diff --git a/libsanitizer/interception/Makefile.in b/libsanitizer/interception/Makefile.in
index cf06a831152dfc6dc5e0faa16b318f3df404735e..c71fb57b8b839bcbe6a756d2f3ea9a9ebff79c8e 100644
--- a/libsanitizer/interception/Makefile.in
+++ b/libsanitizer/interception/Makefile.in
@@ -247,7 +247,7 @@ top_srcdir = @top_srcdir@
AM_CPPFLAGS = -I $(top_srcdir)/include -I $(top_srcdir)
# May be used by toolexeclibdir.
-gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
+gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER)
AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic \
-Wno-long-long -fPIC -fno-builtin -fno-exceptions -fno-rtti \
-fomit-frame-pointer -funwind-tables -fvisibility=hidden \
diff --git a/libsanitizer/lsan/Makefile.am b/libsanitizer/lsan/Makefile.am
index 03ec4fe91fe0f48f5fab8bf2ff2ba56177d9ad16..294342b1926994edde41030b175c2261c53103ff 100644
--- a/libsanitizer/lsan/Makefile.am
+++ b/libsanitizer/lsan/Makefile.am
@@ -1,7 +1,7 @@
AM_CPPFLAGS = -I $(top_srcdir)/include -I $(top_srcdir)
# May be used by toolexeclibdir.
-gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
+gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER)
DEFS = -D_GNU_SOURCE -D_DEBUG -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS
AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic -Wno-long-long -fPIC -fno-builtin -fno-exceptions -fno-rtti -fomit-frame-pointer -funwind-tables -fvisibility=hidden -Wno-variadic-macros
diff --git a/libsanitizer/lsan/Makefile.in b/libsanitizer/lsan/Makefile.in
index fdc1a059fb367f3503c969376e6120bf7809729d..d951741c300df3841ec8215163c17f2a4cb729ab 100644
--- a/libsanitizer/lsan/Makefile.in
+++ b/libsanitizer/lsan/Makefile.in
@@ -288,7 +288,7 @@ top_srcdir = @top_srcdir@
AM_CPPFLAGS = -I $(top_srcdir)/include -I $(top_srcdir)
# May be used by toolexeclibdir.
-gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
+gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER)
AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic \
-Wno-long-long -fPIC -fno-builtin -fno-exceptions -fno-rtti \
-fomit-frame-pointer -funwind-tables -fvisibility=hidden \
diff --git a/libsanitizer/sanitizer_common/Makefile.am b/libsanitizer/sanitizer_common/Makefile.am
index 8b6336fd3ade88307fe5bd41e165eb4e9e2886f0..92c8419f33d44783bf310013227645662d882dfe 100644
--- a/libsanitizer/sanitizer_common/Makefile.am
+++ b/libsanitizer/sanitizer_common/Makefile.am
@@ -1,7 +1,7 @@
AM_CPPFLAGS = -I $(top_srcdir)/include -isystem $(top_srcdir)/include/system
# May be used by toolexeclibdir.
-gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
+gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER)
DEFS = -D_GNU_SOURCE -D_DEBUG -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS @RPC_DEFS@
AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic -Wno-long-long -fPIC -fno-builtin -fno-exceptions -fno-rtti -fomit-frame-pointer -funwind-tables -fvisibility=hidden -Wno-variadic-macros
diff --git a/libsanitizer/sanitizer_common/Makefile.in b/libsanitizer/sanitizer_common/Makefile.in
index b015a624237c751fd52a8b39ada05b618544f4d7..c375f63a3806dee2d6ee12a4df2d3ba5f633cfbd 100644
--- a/libsanitizer/sanitizer_common/Makefile.in
+++ b/libsanitizer/sanitizer_common/Makefile.in
@@ -291,7 +291,7 @@ top_srcdir = @top_srcdir@
AM_CPPFLAGS = -I $(top_srcdir)/include -isystem $(top_srcdir)/include/system
# May be used by toolexeclibdir.
-gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
+gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER)
AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic \
-Wno-long-long -fPIC -fno-builtin -fno-exceptions -fno-rtti \
-fomit-frame-pointer -funwind-tables -fvisibility=hidden \
diff --git a/libsanitizer/tsan/Makefile.am b/libsanitizer/tsan/Makefile.am
index 7a0c29711433dc89947c5444eb204f9cfc7589e4..53a8d1cb0cd06c07c4dfd03e005d2fa4ea295a16 100644
--- a/libsanitizer/tsan/Makefile.am
+++ b/libsanitizer/tsan/Makefile.am
@@ -1,7 +1,7 @@
AM_CPPFLAGS = -I $(top_srcdir) -I $(top_srcdir)/include
# May be used by toolexeclibdir.
-gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
+gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER)
DEFS = -D_GNU_SOURCE -D_DEBUG -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -DCAN_SANITIZE_UB=0
AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic -Wno-long-long -fPIC -fno-builtin -fno-exceptions -fno-rtti -fomit-frame-pointer -funwind-tables -fvisibility=hidden -Wno-variadic-macros
diff --git a/libsanitizer/tsan/Makefile.in b/libsanitizer/tsan/Makefile.in
index 7a58323ff2f7ae1daeafe9d814a73192b86fe90b..770c053e64f608aee698df91a744314eca3990e7 100644
--- a/libsanitizer/tsan/Makefile.in
+++ b/libsanitizer/tsan/Makefile.in
@@ -307,7 +307,7 @@ top_srcdir = @top_srcdir@
AM_CPPFLAGS = -I $(top_srcdir) -I $(top_srcdir)/include
# May be used by toolexeclibdir.
-gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
+gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER)
AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic \
-Wno-long-long -fPIC -fno-builtin -fno-exceptions -fno-rtti \
-fomit-frame-pointer -funwind-tables -fvisibility=hidden \
diff --git a/libsanitizer/ubsan/Makefile.am b/libsanitizer/ubsan/Makefile.am
index 9e70b12d3fdc6cfd66cbb32c67c84018fda9b728..cb27091137a03e29378469d8b0edc5009f28fb75 100644
--- a/libsanitizer/ubsan/Makefile.am
+++ b/libsanitizer/ubsan/Makefile.am
@@ -1,7 +1,7 @@
AM_CPPFLAGS = -I $(top_srcdir) -I $(top_srcdir)/include
# May be used by toolexeclibdir.
-gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
+gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER)
DEFS = -D_GNU_SOURCE -D_DEBUG -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -DPIC -DCAN_SANITIZE_UB=1
AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic -Wno-long-long -fPIC -fno-builtin -fno-exceptions -fno-rtti -fomit-frame-pointer -funwind-tables -fvisibility=hidden -Wno-variadic-macros
diff --git a/libsanitizer/ubsan/Makefile.in b/libsanitizer/ubsan/Makefile.in
index 23939f0bf68c7dda120fdac287ccdc8ec1ef0014..1664ce9497e7104a162a62c5b377d29515379e86 100644
--- a/libsanitizer/ubsan/Makefile.in
+++ b/libsanitizer/ubsan/Makefile.in
@@ -286,7 +286,7 @@ top_srcdir = @top_srcdir@
AM_CPPFLAGS = -I $(top_srcdir) -I $(top_srcdir)/include
# May be used by toolexeclibdir.
-gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
+gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER)
AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic \
-Wno-long-long -fPIC -fno-builtin -fno-exceptions -fno-rtti \
-fomit-frame-pointer -funwind-tables -fvisibility=hidden \
diff --git a/libvtv/ChangeLog b/libvtv/ChangeLog
index 45b24c8431c9f53e7dadf8f3995331ad52326fa4..be5d9930ecc7cb81534b0e8fe3d350a9f27cf59b 100644
--- a/libvtv/ChangeLog
+++ b/libvtv/ChangeLog
@@ -1,3 +1,10 @@
+2017-01-21 Jakub Jelinek <jakub@redhat.com>
+
+ PR other/79046
+ * testsuite/Makefile.am (gcc_version): Use @get_gcc_base_ver@ instead
+ of cat to get version from BASE-VER file.
+ * testsuite/Makefile.in: Regenerated.
+
2017-01-17 Jakub Jelinek <jakub@redhat.com>
PR other/79046
diff --git a/libvtv/testsuite/Makefile.am b/libvtv/testsuite/Makefile.am
index 561b7e25448e27f1236ee70a80b0ce5110194ef7..a9a0144185abd39efd4b33cc2ea27eac637d2899 100644
--- a/libvtv/testsuite/Makefile.am
+++ b/libvtv/testsuite/Makefile.am
@@ -3,7 +3,7 @@
AUTOMAKE_OPTIONS = foreign dejagnu
# May be used by various substitution variables.
-gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
+gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER)
EXPECT = $(shell if test -f $(top_builddir)/../expect/expect; then \
echo $(top_builddir)/../expect/expect; else echo expect; fi)
diff --git a/libvtv/testsuite/Makefile.in b/libvtv/testsuite/Makefile.in
index 7688f3c88c8df1521d057b234ec5e4ed84b9b3f3..b5dfd29973ce8afad2af63ec50a1717d2360078c 100644
--- a/libvtv/testsuite/Makefile.in
+++ b/libvtv/testsuite/Makefile.in
@@ -220,7 +220,7 @@ toplevel_srcdir = @toplevel_srcdir@
AUTOMAKE_OPTIONS = foreign dejagnu
# May be used by various substitution variables.
-gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
+gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER)
EXPECT = $(shell if test -f $(top_builddir)/../expect/expect; then \
echo $(top_builddir)/../expect/expect; else echo expect; fi)