| Message ID | 20240202065740.68643-2-npiggin@gmail.com (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | Multi-migration support | expand |
On Fri, Feb 02, 2024 at 04:57:32PM +1000, Nicholas Piggin wrote: > Using all prerequisites for the source file results in the build > dying on the second time around with: > > gcc: fatal error: cannot specify ‘-o’ with ‘-c’, ‘-S’ or ‘-E’ with multiple files > > This is due to auxinfo.h becoming a prerequisite after the first > build recorded the dependency. > > Use the first prerequisite for this recipe. > > Fixes: f2372f2d49135 ("(arm|powerpc|s390x): Makefile: add `%.aux.o` target") > Signed-off-by: Nicholas Piggin <npiggin@gmail.com> > --- > arm/Makefile.common | 2 +- > powerpc/Makefile.common | 2 +- > s390x/Makefile | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/arm/Makefile.common b/arm/Makefile.common > index 54cb4a63..c2ee568c 100644 > --- a/arm/Makefile.common > +++ b/arm/Makefile.common > @@ -71,7 +71,7 @@ FLATLIBS = $(libcflat) $(LIBFDT_archive) $(libeabi) > > ifeq ($(CONFIG_EFI),y) > %.aux.o: $(SRCDIR)/lib/auxinfo.c > - $(CC) $(CFLAGS) -c -o $@ $^ \ > + $(CC) $(CFLAGS) -c -o $@ $< \ > -DPROGNAME=\"$(@:.aux.o=.efi)\" -DAUXFLAGS=$(AUXFLAGS) There are two instances of the %.aux.o target in arm/Makefile.common. We need to fix both. We can actually pull the target out of the two arms of the CONFIG_EFI if-else, though, by changing the .efi/.flat to .$(exe). Thanks, drew > > %.so: EFI_LDFLAGS += -defsym=EFI_SUBSYSTEM=0xa --no-undefined > diff --git a/powerpc/Makefile.common b/powerpc/Makefile.common > index 483ff648..eb88398d 100644 > --- a/powerpc/Makefile.common > +++ b/powerpc/Makefile.common > @@ -48,7 +48,7 @@ cflatobjs += lib/powerpc/smp.o > OBJDIRS += lib/powerpc > > %.aux.o: $(SRCDIR)/lib/auxinfo.c > - $(CC) $(CFLAGS) -c -o $@ $^ -DPROGNAME=\"$(@:.aux.o=.elf)\" > + $(CC) $(CFLAGS) -c -o $@ $< -DPROGNAME=\"$(@:.aux.o=.elf)\" > > FLATLIBS = $(libcflat) $(LIBFDT_archive) > %.elf: CFLAGS += $(arch_CFLAGS) > diff --git a/s390x/Makefile b/s390x/Makefile > index e64521e0..b72f7578 100644 > --- a/s390x/Makefile > +++ b/s390x/Makefile > @@ -177,7 +177,7 @@ lds-autodepend-flags = -MMD -MF $(dir $*).$(notdir $*).d -MT $@ > $(CPP) $(lds-autodepend-flags) $(CPPFLAGS) -P -C -o $@ $< > > %.aux.o: $(SRCDIR)/lib/auxinfo.c > - $(CC) $(CFLAGS) -c -o $@ $^ -DPROGNAME=\"$(@:.aux.o=.elf)\" > + $(CC) $(CFLAGS) -c -o $@ $< -DPROGNAME=\"$(@:.aux.o=.elf)\" > > .SECONDEXPANSION: > %.elf: $(FLATLIBS) $(asmlib) $(SRCDIR)/s390x/flat.lds $$(snippets-obj) $$(snippet-hdr-obj) %.o %.aux.o > -- > 2.42.0 >
On 02/02/2024 10.30, Andrew Jones wrote: > On Fri, Feb 02, 2024 at 04:57:32PM +1000, Nicholas Piggin wrote: >> Using all prerequisites for the source file results in the build >> dying on the second time around with: >> >> gcc: fatal error: cannot specify ‘-o’ with ‘-c’, ‘-S’ or ‘-E’ with multiple files >> >> This is due to auxinfo.h becoming a prerequisite after the first >> build recorded the dependency. D'oh, of course I only tried to run "make" once when testing that patch :-/ >> diff --git a/arm/Makefile.common b/arm/Makefile.common >> index 54cb4a63..c2ee568c 100644 >> --- a/arm/Makefile.common >> +++ b/arm/Makefile.common >> @@ -71,7 +71,7 @@ FLATLIBS = $(libcflat) $(LIBFDT_archive) $(libeabi) >> >> ifeq ($(CONFIG_EFI),y) >> %.aux.o: $(SRCDIR)/lib/auxinfo.c >> - $(CC) $(CFLAGS) -c -o $@ $^ \ >> + $(CC) $(CFLAGS) -c -o $@ $< \ >> -DPROGNAME=\"$(@:.aux.o=.efi)\" -DAUXFLAGS=$(AUXFLAGS) > > There are two instances of the %.aux.o target in arm/Makefile.common. We > need to fix both. We can actually pull the target out of the two arms of > the CONFIG_EFI if-else, though, by changing the .efi/.flat to .$(exe). I went ahead and pushed this patch with the trivial fix for the else-branch to the repo to unbreak the build. If you think it's worthwhile to unify the target, please provide a patch to do so, thanks! Thomas
On Fri, Feb 02, 2024 at 04:57 PM +1000, Nicholas Piggin <npiggin@gmail.com> wrote: > Using all prerequisites for the source file results in the build > dying on the second time around with: > > gcc: fatal error: cannot specify ‘-o’ with ‘-c’, ‘-S’ or ‘-E’ with multiple files > > This is due to auxinfo.h becoming a prerequisite after the first > build recorded the dependency. > > Use the first prerequisite for this recipe. > > Fixes: f2372f2d49135 ("(arm|powerpc|s390x): Makefile: add `%.aux.o` target") > Signed-off-by: Nicholas Piggin <npiggin@gmail.com> > --- > arm/Makefile.common | 2 +- […snip] Thanks a ton for fixing this! Reviewed-by: Marc Hartmayer <mhartmay@linux.ibm.com>
diff --git a/arm/Makefile.common b/arm/Makefile.common index 54cb4a63..c2ee568c 100644 --- a/arm/Makefile.common +++ b/arm/Makefile.common @@ -71,7 +71,7 @@ FLATLIBS = $(libcflat) $(LIBFDT_archive) $(libeabi) ifeq ($(CONFIG_EFI),y) %.aux.o: $(SRCDIR)/lib/auxinfo.c - $(CC) $(CFLAGS) -c -o $@ $^ \ + $(CC) $(CFLAGS) -c -o $@ $< \ -DPROGNAME=\"$(@:.aux.o=.efi)\" -DAUXFLAGS=$(AUXFLAGS) %.so: EFI_LDFLAGS += -defsym=EFI_SUBSYSTEM=0xa --no-undefined diff --git a/powerpc/Makefile.common b/powerpc/Makefile.common index 483ff648..eb88398d 100644 --- a/powerpc/Makefile.common +++ b/powerpc/Makefile.common @@ -48,7 +48,7 @@ cflatobjs += lib/powerpc/smp.o OBJDIRS += lib/powerpc %.aux.o: $(SRCDIR)/lib/auxinfo.c - $(CC) $(CFLAGS) -c -o $@ $^ -DPROGNAME=\"$(@:.aux.o=.elf)\" + $(CC) $(CFLAGS) -c -o $@ $< -DPROGNAME=\"$(@:.aux.o=.elf)\" FLATLIBS = $(libcflat) $(LIBFDT_archive) %.elf: CFLAGS += $(arch_CFLAGS) diff --git a/s390x/Makefile b/s390x/Makefile index e64521e0..b72f7578 100644 --- a/s390x/Makefile +++ b/s390x/Makefile @@ -177,7 +177,7 @@ lds-autodepend-flags = -MMD -MF $(dir $*).$(notdir $*).d -MT $@ $(CPP) $(lds-autodepend-flags) $(CPPFLAGS) -P -C -o $@ $< %.aux.o: $(SRCDIR)/lib/auxinfo.c - $(CC) $(CFLAGS) -c -o $@ $^ -DPROGNAME=\"$(@:.aux.o=.elf)\" + $(CC) $(CFLAGS) -c -o $@ $< -DPROGNAME=\"$(@:.aux.o=.elf)\" .SECONDEXPANSION: %.elf: $(FLATLIBS) $(asmlib) $(SRCDIR)/s390x/flat.lds $$(snippets-obj) $$(snippet-hdr-obj) %.o %.aux.o
Using all prerequisites for the source file results in the build dying on the second time around with: gcc: fatal error: cannot specify ‘-o’ with ‘-c’, ‘-S’ or ‘-E’ with multiple files This is due to auxinfo.h becoming a prerequisite after the first build recorded the dependency. Use the first prerequisite for this recipe. Fixes: f2372f2d49135 ("(arm|powerpc|s390x): Makefile: add `%.aux.o` target") Signed-off-by: Nicholas Piggin <npiggin@gmail.com> --- arm/Makefile.common | 2 +- powerpc/Makefile.common | 2 +- s390x/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)