diff options
author | Jakub Jelinek <jakub@redhat.com> | 2017-01-21 09:47:11 +0100 |
---|---|---|
committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2017-01-21 09:47:11 +0100 |
commit | 73aa401ecf498ad3d739bde4127da73e2eb01932 (patch) | |
tree | 6a14b97f2fe0573dfa5371387fc81ee79e32e653 /libitm | |
parent | ea9f867b7b5985b98e9f5c6ff9a2239f3a9e8496 (diff) | |
download | gcc-73aa401ecf498ad3d739bde4127da73e2eb01932.tar.gz |
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 'libitm')
-rw-r--r-- | libitm/ChangeLog | 7 | ||||
-rw-r--r-- | libitm/testsuite/Makefile.am | 2 | ||||
-rw-r--r-- | libitm/testsuite/Makefile.in | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/libitm/ChangeLog b/libitm/ChangeLog index 5f44e3f1250..f930cf38797 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 561b7e25448..a9a0144185a 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 04c4d8abe10..eb9e992279d 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) |