diff options
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 5f44e3f..f930cf3 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 561b7e2..a9a0144 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 04c4d8a..eb9e992 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) |