[kvm-unit-tests PATCH v1 0/2] s390x: Improve out-of-source builds

[kvm-unit-tests PATCH v1 0/2] s390x: Improve out-of-source builds

[Marc Hartmayer]

Marc Hartmayer (2):
  s390x/Makefile: Make sure the linker script is generated in the build
    directory
  s390x/Makefile: Add auxinfo.o to cflatobjs

 s390x/Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)


base-commit: 0ed2cdf3c80ee803b9150898e687e77e4d6f5db2
-- 
2.48.1

[kvm-unit-tests PATCH v1 1/2] s390x/Makefile: Make sure the linker script is generated in the build directory

[Marc Hartmayer]

This change makes sure that the 'flat.lds' linker script is actually generated
in the build directory and not source directory - this makes a difference in
case of an out-of-source build.

Signed-off-by: Marc Hartmayer <mhartmay@linux.ibm.com>
---
 s390x/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/s390x/Makefile b/s390x/Makefile
index 23342bd64f44..71bfa787fe59 100644
--- a/s390x/Makefile
+++ b/s390x/Makefile
@@ -182,8 +182,8 @@ lds-autodepend-flags = -MMD -MF $(dir $*).$(notdir $*).d -MT $@
 	$(CC) $(CFLAGS) -c -o $@ $< -DPROGNAME=\"$(@:.aux.o=.elf)\"
 
 .SECONDEXPANSION:
-%.elf: $(FLATLIBS) $(asmlib) $(SRCDIR)/s390x/flat.lds $$(snippets-obj) $$(snippet-hdr-obj) %.o %.aux.o
-	@$(CC) $(LDFLAGS) -o $@ -T $(SRCDIR)/s390x/flat.lds \
+%.elf: $(FLATLIBS) $(asmlib) s390x/flat.lds $$(snippets-obj) $$(snippet-hdr-obj) %.o %.aux.o
+	@$(CC) $(LDFLAGS) -o $@ -T s390x/flat.lds \
 		$(filter %.o, $^) $(FLATLIBS) $(snippets-obj) $(snippet-hdr-obj) || \
 		{ echo "Failure probably caused by missing definition of gen-se-header executable"; exit 1; }
 	@chmod a-x $@
-- 
2.48.1

[kvm-unit-tests PATCH v1 2/2] s390x/Makefile: Add auxinfo.o to cflatobjs

[Marc Hartmayer]

This makes sure that the file is removed in case of `make clean` as the top
Makefile cleans all objects defined in 'cflagsobjs'.

Signed-off-by: Marc Hartmayer <mhartmay@linux.ibm.com>
--
Note: AFAICT, the computed sh256sum values of the generated .elf and .bin files
      did not change.
---
 s390x/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/s390x/Makefile b/s390x/Makefile
index 71bfa787fe59..1b0e9d63de13 100644
--- a/s390x/Makefile
+++ b/s390x/Makefile
@@ -90,6 +90,7 @@ LDFLAGS += -Wl,--build-id=none
 asm-offsets = lib/$(ARCH)/asm-offsets.h
 include $(SRCDIR)/scripts/asm-offsets.mak
 
+cflatobjs += lib/auxinfo.o
 cflatobjs += lib/util.o
 cflatobjs += lib/alloc.o
 cflatobjs += lib/alloc_phys.o
-- 
2.48.1

Re: [kvm-unit-tests PATCH v1 1/2] s390x/Makefile: Make sure the linker script is generated in the build directory

[Marc Hartmayer]

On Tue, Jan 28, 2025 at 11:06 AM +0100, Marc Hartmayer <mhartmay@linux.ibm.com> wrote:
> This change makes sure that the 'flat.lds' linker script is actually generated
> in the build directory and not source directory - this makes a difference in
> case of an out-of-source build.
>
> Signed-off-by: Marc Hartmayer <mhartmay@linux.ibm.com>
> ---
>  s390x/Makefile | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/s390x/Makefile b/s390x/Makefile
> index 23342bd64f44..71bfa787fe59 100644
> --- a/s390x/Makefile
> +++ b/s390x/Makefile
> @@ -182,8 +182,8 @@ lds-autodepend-flags = -MMD -MF $(dir $*).$(notdir $*).d -MT $@
>  	$(CC) $(CFLAGS) -c -o $@ $< -DPROGNAME=\"$(@:.aux.o=.elf)\"
>  
>  .SECONDEXPANSION:
> -%.elf: $(FLATLIBS) $(asmlib) $(SRCDIR)/s390x/flat.lds $$(snippets-obj) $$(snippet-hdr-obj) %.o %.aux.o
> -	@$(CC) $(LDFLAGS) -o $@ -T $(SRCDIR)/s390x/flat.lds \

> +%.elf: $(FLATLIBS) $(asmlib) s390x/flat.lds $$(snippets-obj) $$(snippet-hdr-obj) %.o %.aux.o
> +	@$(CC) $(LDFLAGS) -o $@ -T s390x/flat.lds \

s390x/flat.lds should be replaced by $(TESTDIR)/flat.lds

>  		$(filter %.o, $^) $(FLATLIBS) $(snippets-obj) $(snippet-hdr-obj) || \
>  		{ echo "Failure probably caused by missing definition of gen-se-header executable"; exit 1; }
>  	@chmod a-x $@
> -- 
> 2.48.1
>
>
-- 
Kind regards / Beste Grüße
   Marc Hartmayer

IBM Deutschland Research & Development GmbH
Vorsitzender des Aufsichtsrats: Wolfgang Wendt
Geschäftsführung: David Faller
Sitz der Gesellschaft: Böblingen
Registergericht: Amtsgericht Stuttgart, HRB 243294

Re: [kvm-unit-tests PATCH v1 2/2] s390x/Makefile: Add auxinfo.o to cflatobjs

[Nico Boehr]

On Tue Jan 28, 2025 at 11:06 AM CET, Marc Hartmayer wrote:
> This makes sure that the file is removed in case of `make clean` as the top
> Makefile cleans all objects defined in 'cflagsobjs'.
>
> Signed-off-by: Marc Hartmayer <mhartmay@linux.ibm.com>

Reviewed-by: Nico Boehr <nrb@linux.ibm.com>

Re: [kvm-unit-tests PATCH v1 1/2] s390x/Makefile: Make sure the linker script is generated in the build directory

[Nico Boehr]

On Tue Jan 28, 2025 at 11:06 AM CET, Marc Hartmayer wrote:
> This change makes sure that the 'flat.lds' linker script is actually generated
> in the build directory and not source directory - this makes a difference in
> case of an out-of-source build.
>
> Signed-off-by: Marc Hartmayer <mhartmay@linux.ibm.com>

Reviewed-by: Nico Boehr <nrb@linux.ibm.com>

Re: [kvm-unit-tests PATCH v1 1/2] s390x/Makefile: Make sure the linker script is generated in the build directory

[Nico Boehr]

On Tue Jan 28, 2025 at 11:14 AM CET, Marc Hartmayer wrote:
> On Tue, Jan 28, 2025 at 11:06 AM +0100, Marc Hartmayer <mhartmay@linux.ibm.com> wrote:
> > This change makes sure that the 'flat.lds' linker script is actually generated
> > in the build directory and not source directory - this makes a difference in
> > case of an out-of-source build.
> >
> > Signed-off-by: Marc Hartmayer <mhartmay@linux.ibm.com>
> > ---
> >  s390x/Makefile | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/s390x/Makefile b/s390x/Makefile
> > index 23342bd64f44..71bfa787fe59 100644
> > --- a/s390x/Makefile
> > +++ b/s390x/Makefile
> > @@ -182,8 +182,8 @@ lds-autodepend-flags = -MMD -MF $(dir $*).$(notdir $*).d -MT $@
> >  	$(CC) $(CFLAGS) -c -o $@ $< -DPROGNAME=\"$(@:.aux.o=.elf)\"
> >  
> >  .SECONDEXPANSION:
> > -%.elf: $(FLATLIBS) $(asmlib) $(SRCDIR)/s390x/flat.lds $$(snippets-obj) $$(snippet-hdr-obj) %.o %.aux.o
> > -	@$(CC) $(LDFLAGS) -o $@ -T $(SRCDIR)/s390x/flat.lds \
>
> > +%.elf: $(FLATLIBS) $(asmlib) s390x/flat.lds $$(snippets-obj) $$(snippet-hdr-obj) %.o %.aux.o
> > +	@$(CC) $(LDFLAGS) -o $@ -T s390x/flat.lds \
>
> s390x/flat.lds should be replaced by $(TESTDIR)/flat.lds

fwiw, s/TESTDIR/TEST_DIR/

Otherwise, yes, will fix it up when picking. Thanks!

Re: [kvm-unit-tests PATCH v1 1/2] s390x/Makefile: Make sure the linker script is generated in the build directory

[Marc Hartmayer]

On Fri, Jan 31, 2025 at 10:20 AM +0100, "Nico Boehr" <nrb@linux.ibm.com> wrote:
> On Tue Jan 28, 2025 at 11:14 AM CET, Marc Hartmayer wrote:
>> On Tue, Jan 28, 2025 at 11:06 AM +0100, Marc Hartmayer <mhartmay@linux.ibm.com> wrote:
>> > This change makes sure that the 'flat.lds' linker script is actually generated
>> > in the build directory and not source directory - this makes a difference in
>> > case of an out-of-source build.
>> >
>> > Signed-off-by: Marc Hartmayer <mhartmay@linux.ibm.com>
>> > ---
>> >  s390x/Makefile | 4 ++--
>> >  1 file changed, 2 insertions(+), 2 deletions(-)
>> >
>> > diff --git a/s390x/Makefile b/s390x/Makefile
>> > index 23342bd64f44..71bfa787fe59 100644
>> > --- a/s390x/Makefile
>> > +++ b/s390x/Makefile
>> > @@ -182,8 +182,8 @@ lds-autodepend-flags = -MMD -MF $(dir $*).$(notdir $*).d -MT $@
>> >  	$(CC) $(CFLAGS) -c -o $@ $< -DPROGNAME=\"$(@:.aux.o=.elf)\"
>> >  
>> >  .SECONDEXPANSION:
>> > -%.elf: $(FLATLIBS) $(asmlib) $(SRCDIR)/s390x/flat.lds $$(snippets-obj) $$(snippet-hdr-obj) %.o %.aux.o
>> > -	@$(CC) $(LDFLAGS) -o $@ -T $(SRCDIR)/s390x/flat.lds \
>>
>> > +%.elf: $(FLATLIBS) $(asmlib) s390x/flat.lds $$(snippets-obj) $$(snippet-hdr-obj) %.o %.aux.o
>> > +	@$(CC) $(LDFLAGS) -o $@ -T s390x/flat.lds \
>>
>> s390x/flat.lds should be replaced by $(TESTDIR)/flat.lds
>
> fwiw, s/TESTDIR/TEST_DIR/
>
> Otherwise, yes, will fix it up when picking. Thanks!

Thanks.

-- 
Kind regards / Beste Grüße
   Marc Hartmayer

IBM Deutschland Research & Development GmbH
Vorsitzender des Aufsichtsrats: Wolfgang Wendt
Geschäftsführung: David Faller
Sitz der Gesellschaft: Böblingen
Registergericht: Amtsgericht Stuttgart, HRB 243294