I'm afraid I don't understand this part of the code well, and I've really been away from GCC work for years, and I'm not sure what tests should be run to verify that this is working, so I don't feel comfortable approving it by myself. It looks right though.
On Tue, Aug 1, 2023, at 1:55 AM, Jan Beulich wrote: > ./multilib.am already specifies this same command, and make warns about > the earlier one being ignored when seeing the later one. All that needs > retaining to still satisfy the preceding comment is the extra > dependency. > > libatomic/ > > * Makefile.am (all-multi): Drop commands. > * Makefile.in: Update accordingly. > --- > While originally sent over a year ago and pinged subsequently, I can't > quite view changes like this as "trivial" ... > > --- a/libatomic/Makefile.am > +++ b/libatomic/Makefile.am > @@ -149,12 +149,11 @@ 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 > +# Amend 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) > > # target overrides > -include $(tmake_file) > --- a/libatomic/Makefile.in > +++ b/libatomic/Makefile.in > @@ -892,12 +892,11 @@ 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 > +# Amend 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) > > # target overrides > -include $(tmake_file)
