backport: re PR other/67627 (libatomic parallel build failure)

2016-01-06  Szabolcs Nagy  <szabolcs.nagy@arm.com>

	Backport from mainline:
	2016-01-06  Szabolcs Nagy  <szabolcs.nagy@arm.com>

	PR other/67627
	* Makefile.am (all-multi): Add dependency.
	* Makefile.in: Regenerate.

From-SVN: r232107

diff --git a/libatomic/ChangeLog b/libatomic/ChangeLog
index 1deda88729f115a6f267c64c9e2c3b2e9b4a74ea..afe96b791dff6a33f28099f13de888c777d10c7f 100644 (file)
--- a/libatomic/ChangeLog
+++ b/libatomic/ChangeLog
@@ -1,3 +1,12 @@
+2016-01-06  Szabolcs Nagy  <szabolcs.nagy@arm.com>
+
+       Backport from mainline:
+       2016-01-06  Szabolcs Nagy  <szabolcs.nagy@arm.com>
+
+       PR other/67627
+       * Makefile.am (all-multi): Add dependency.
+       * Makefile.in: Regenerate.
+
 2015-06-26  Release Manager
 
        * GCC 4.9.3 released.

diff --git a/libatomic/Makefile.am b/libatomic/Makefile.am
index 47f25df0d22a6fb736a78ed3e0f0a0c75bb7d133..fde12a5766ecc0b1a865b2000f2ca5cc81018800 100644 (file)
--- a/libatomic/Makefile.am
+++ b/libatomic/Makefile.am
@@ -139,3 +139,10 @@ endif
 
 libatomic_convenience_la_SOURCES = $(libatomic_la_SOURCES)
 libatomic_convenience_la_LIBADD = $(libatomic_la_LIBADD)
+
+# Override the automake generated all-multi rule to guarantee that all-multi
+# is not run in parallel with the %_.lo rules which generate $(DEPDIR)/*.Ppo
+# makefile fragments to avoid broken *.Ppo getting included into the Makefile
+# when it is reloaded during the build of all-multi.
+all-multi: $(libatomic_la_LIBADD)
+       $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do # $(MAKE)

diff --git a/libatomic/Makefile.in b/libatomic/Makefile.in
index 22c384b43222ca1761f5dc90637a380eddbfff58..42fd2c7fda5887a4c0e75abcc309aced6c012777 100644 (file)
--- a/libatomic/Makefile.in
+++ b/libatomic/Makefile.in
@@ -465,12 +465,6 @@ clean-libtool:
 
 distclean-libtool:
        -rm -f libtool config.lt
-
-# GNU Make needs to see an explicit $(MAKE) variable in the command it
-# runs to enable its job server during parallel builds.  Hence the
-# comments below.
-all-multi:
-       $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do # $(MAKE)
 install-multi:
        $(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do # $(MAKE)
 
@@ -764,6 +758,13 @@ vpath % $(strip $(search_path))
 %_.lo: Makefile
        $(LTCOMPILE) $(M_DEPS) $(M_SIZE) $(M_IFUNC) -c -o $@ $(M_SRC)
 
+# Override the automake generated all-multi rule to guarantee that all-multi
+# is not run in parallel with the %_.lo rules which generate $(DEPDIR)/*.Ppo
+# makefile fragments to avoid broken *.Ppo getting included into the Makefile
+# when it is reloaded during the build of all-multi.
+all-multi: $(libatomic_la_LIBADD)
+       $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do # $(MAKE)
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: