From 8d67fcd84efbfc5bd5459a44c09cc82ee0e34457 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Fri, 20 Jan 2017 09:27:29 +0100 Subject: [PATCH] re PR other/79046 (g++ -print-file-name=plugin uses full version number in path) PR other/79046 liboffloadmic/ * aclocal.m4: Regenerated. * Makefile.in: Regenerated. libcilkrts/ * aclocal.m4: Regenerated. * Makefile.in: Regenerated. From-SVN: r244684 --- libcilkrts/ChangeLog | 6 ++++++ libcilkrts/Makefile.in | 10 +++++----- libcilkrts/aclocal.m4 | 2 +- libmpx/ChangeLog | 2 +- liboffloadmic/ChangeLog | 6 ++++++ liboffloadmic/Makefile.in | 10 +++++----- liboffloadmic/aclocal.m4 | 2 +- 7 files changed, 25 insertions(+), 13 deletions(-) diff --git a/libcilkrts/ChangeLog b/libcilkrts/ChangeLog index 9dcff74830d..603b05a2a24 100644 --- a/libcilkrts/ChangeLog +++ b/libcilkrts/ChangeLog @@ -1,3 +1,9 @@ +2017-01-20 Jakub Jelinek + + PR other/79046 + * aclocal.m4: Regenerated. + * Makefile.in: Regenerated. + 2017-01-17 Jakub Jelinek PR other/79046 diff --git a/libcilkrts/Makefile.in b/libcilkrts/Makefile.in index 551a360ea2f..a89960d51e0 100644 --- a/libcilkrts/Makefile.in +++ b/libcilkrts/Makefile.in @@ -161,14 +161,14 @@ DIST_COMMON = $(srcdir)/include/internal/rev.mk README ChangeLog \ @MAC_LINKER_SCRIPT_TRUE@am__append_2 = -Wl,-exported_symbols_list,$(srcdir)/runtime/mac-symbols.txt subdir = . 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 \ - $(top_srcdir)/../config/acx.m4 $(top_srcdir)/../libtool.m4 \ - $(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \ - $(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \ + $(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \ + $(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ diff --git a/libcilkrts/aclocal.m4 b/libcilkrts/aclocal.m4 index 71023b2c723..4bb1d43a5e5 100644 --- a/libcilkrts/aclocal.m4 +++ b/libcilkrts/aclocal.m4 @@ -988,11 +988,11 @@ 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]) m4_include([../config/override.m4]) -m4_include([../config/acx.m4]) m4_include([../libtool.m4]) m4_include([../ltoptions.m4]) m4_include([../ltsugar.m4]) diff --git a/libmpx/ChangeLog b/libmpx/ChangeLog index 4e344597d81..16c40e005e1 100644 --- a/libmpx/ChangeLog +++ b/libmpx/ChangeLog @@ -1,7 +1,7 @@ 2017-01-19 Jakub Jelinek PR other/79046 - * aclocal.m4: Include ../config/acx.m4. + * aclocal.m4: Regenerated. * configure: Regenerated. * Makefile.in: Regenerated. * mpxrt/Makefile.in: Regenerated. diff --git a/liboffloadmic/ChangeLog b/liboffloadmic/ChangeLog index 4960f5637e8..71c9a1cc674 100644 --- a/liboffloadmic/ChangeLog +++ b/liboffloadmic/ChangeLog @@ -1,3 +1,9 @@ +2017-01-20 Jakub Jelinek + + PR other/79046 + * aclocal.m4: Regenerated. + * Makefile.in: Regenerated. + 2017-01-17 Jakub Jelinek PR other/79046 diff --git a/liboffloadmic/Makefile.in b/liboffloadmic/Makefile.in index 591b3c90ebb..f4470c6e4d4 100644 --- a/liboffloadmic/Makefile.in +++ b/liboffloadmic/Makefile.in @@ -89,14 +89,14 @@ DIST_COMMON = ChangeLog $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(srcdir)/liboffloadmic_host.spec.in \ $(srcdir)/liboffloadmic_target.spec.in $(srcdir)/../depcomp 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 \ - $(top_srcdir)/../config/acx.m4 $(top_srcdir)/../libtool.m4 \ - $(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \ - $(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \ + $(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \ + $(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ diff --git a/liboffloadmic/aclocal.m4 b/liboffloadmic/aclocal.m4 index 71023b2c723..4bb1d43a5e5 100644 --- a/liboffloadmic/aclocal.m4 +++ b/liboffloadmic/aclocal.m4 @@ -988,11 +988,11 @@ 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]) m4_include([../config/override.m4]) -m4_include([../config/acx.m4]) m4_include([../libtool.m4]) m4_include([../ltoptions.m4]) m4_include([../ltsugar.m4])