summaryrefslogtreecommitdiffstats
path: root/libvtv
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2017-01-21 09:47:11 +0100
committerJakub Jelinek <jakub@gcc.gnu.org>2017-01-21 09:47:11 +0100
commit73aa401ecf498ad3d739bde4127da73e2eb01932 (patch)
tree6a14b97f2fe0573dfa5371387fc81ee79e32e653 /libvtv
parentre PR rtl-optimization/79125 (ICE in rtl_verify_bb_insns, at cfgrtl.c:2661 (e... (diff)
downloadgcc-73aa401ecf498ad3d739bde4127da73e2eb01932.tar.gz
gcc-73aa401ecf498ad3d739bde4127da73e2eb01932.tar.bz2
gcc-73aa401ecf498ad3d739bde4127da73e2eb01932.tar.xz
re PR other/79046 (g++ -print-file-name=plugin uses full version number in path)
PR other/79046 libatomic/ * testsuite/Makefile.am (gcc_version): Use @get_gcc_base_ver@ instead of cat to get version from BASE-VER file. * testsuite/Makefile.in: Regenerated. libffi/ * 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. libgomp/ * testsuite/Makefile.am (gcc_version): Use @get_gcc_base_ver@ instead of cat to get version from BASE-VER file. * testsuite/Makefile.in: Regenerated. libitm/ * testsuite/Makefile.am (gcc_version): Use @get_gcc_base_ver@ instead of cat to get version from BASE-VER file. * testsuite/Makefile.in: Regenerated. libmpx/ * 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. liboffloadmic/ * 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. libsanitizer/ * 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. libvtv/ * testsuite/Makefile.am (gcc_version): Use @get_gcc_base_ver@ instead of cat to get version from BASE-VER file. * testsuite/Makefile.in: Regenerated. From-SVN: r244742
Diffstat (limited to 'libvtv')
-rw-r--r--libvtv/ChangeLog7
-rw-r--r--libvtv/testsuite/Makefile.am2
-rw-r--r--libvtv/testsuite/Makefile.in2
3 files changed, 9 insertions, 2 deletions
diff --git a/libvtv/ChangeLog b/libvtv/ChangeLog
index 45b24c8431c..be5d9930ecc 100644
--- a/libvtv/ChangeLog
+++ b/libvtv/ChangeLog
@@ -1,3 +1,10 @@
12017-01-21 Jakub Jelinek <jakub@redhat.com>
2
3 PR other/79046
4 * testsuite/Makefile.am (gcc_version): Use @get_gcc_base_ver@ instead
5 of cat to get version from BASE-VER file.
6 * testsuite/Makefile.in: Regenerated.
7
12017-01-17 Jakub Jelinek <jakub@redhat.com> 82017-01-17 Jakub Jelinek <jakub@redhat.com>
2 9
3 PR other/79046 10 PR other/79046
diff --git a/libvtv/testsuite/Makefile.am b/libvtv/testsuite/Makefile.am
index 561b7e25448..a9a0144185a 100644
--- a/libvtv/testsuite/Makefile.am
+++ b/libvtv/testsuite/Makefile.am
@@ -3,7 +3,7 @@
3AUTOMAKE_OPTIONS = foreign dejagnu 3AUTOMAKE_OPTIONS = foreign dejagnu
4 4
5# May be used by various substitution variables. 5# May be used by various substitution variables.
6gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) 6gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER)
7 7
8EXPECT = $(shell if test -f $(top_builddir)/../expect/expect; then \ 8EXPECT = $(shell if test -f $(top_builddir)/../expect/expect; then \
9 echo $(top_builddir)/../expect/expect; else echo expect; fi) 9 echo $(top_builddir)/../expect/expect; else echo expect; fi)
diff --git a/libvtv/testsuite/Makefile.in b/libvtv/testsuite/Makefile.in
index 7688f3c88c8..b5dfd29973c 100644
--- a/libvtv/testsuite/Makefile.in
+++ b/libvtv/testsuite/Makefile.in
@@ -220,7 +220,7 @@ toplevel_srcdir = @toplevel_srcdir@
220AUTOMAKE_OPTIONS = foreign dejagnu 220AUTOMAKE_OPTIONS = foreign dejagnu
221 221
222# May be used by various substitution variables. 222# May be used by various substitution variables.
223gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) 223gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER)
224EXPECT = $(shell if test -f $(top_builddir)/../expect/expect; then \ 224EXPECT = $(shell if test -f $(top_builddir)/../expect/expect; then \
225 echo $(top_builddir)/../expect/expect; else echo expect; fi) 225 echo $(top_builddir)/../expect/expect; else echo expect; fi)
226 226