git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: r232105
This commit is contained in:
Szabolcs Nagy 2016-01-06 17:32:41 +00:00 committed by Szabolcs Nagy
parent 2ecbc6cab7
commit 42a11bf849
3 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libatomic/ChangeLog
View File

@ -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-12-04 Release Manager 2015-12-04 Release Manager
* GCC 5.3.0 released. * GCC 5.3.0 released.

7
libatomic/Makefile.am
View File

@ -139,3 +139,10 @@ endif
libatomic_convenience_la_SOURCES = $(libatomic_la_SOURCES) libatomic_convenience_la_SOURCES = $(libatomic_la_SOURCES)
libatomic_convenience_la_LIBADD = $(libatomic_la_LIBADD) 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)

13
libatomic/Makefile.in
View File

@ -494,12 +494,6 @@ clean-libtool:
distclean-libtool: distclean-libtool:
-rm -f libtool config.lt -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: install-multi:
$(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do # $(MAKE) $(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do # $(MAKE)
@ -798,6 +792,13 @@ vpath % $(strip $(search_path))
%_.lo: Makefile %_.lo: Makefile
$(LTCOMPILE) $(M_DEPS) $(M_SIZE) $(M_IFUNC) -c -o $@ $(M_SRC) $(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. # 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. # Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT: .NOEXPORT: