| Message ID | 20241216133819.78583-1-iii@linux.ibm.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | tests/tcg/s390x: Use the SLOF libc headers for the multiarch tests | expand |
On 16/12/24 14:37, Ilya Leoshkevich wrote: > Compiling the s390x tests on Fedora, which has the s390x cross-compiler > installed, fails with: > > In file included from qemu/tests/tcg/s390x/console.c:8: > qemu/tests/tcg/s390x/../../../pc-bios/s390-ccw/sclp.c:11:10: fatal error: string.h: No such file or directory > 11 | #include <string.h> > > This is because Fedora does not have a cross-libc. Since console.c > already uses the SLOF libc implementation, add the respective headers > to the include path. > > Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com> > --- > tests/tcg/s390x/Makefile.softmmu-target | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
On 16/12/2024 14.37, Ilya Leoshkevich wrote: > Compiling the s390x tests on Fedora, which has the s390x cross-compiler > installed, fails with: > > In file included from qemu/tests/tcg/s390x/console.c:8: > qemu/tests/tcg/s390x/../../../pc-bios/s390-ccw/sclp.c:11:10: fatal error: string.h: No such file or directory > 11 | #include <string.h> > > This is because Fedora does not have a cross-libc. Since console.c > already uses the SLOF libc implementation, add the respective headers > to the include path. > > Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com> > --- > tests/tcg/s390x/Makefile.softmmu-target | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/tests/tcg/s390x/Makefile.softmmu-target b/tests/tcg/s390x/Makefile.softmmu-target > index 969bc5728fa..7adde2fa087 100644 > --- a/tests/tcg/s390x/Makefile.softmmu-target > +++ b/tests/tcg/s390x/Makefile.softmmu-target > @@ -45,7 +45,8 @@ TESTS += $(ASM_TESTS) > S390X_MULTIARCH_RUNTIME_OBJS = head64.o console.o $(MINILIB_OBJS) > $(MULTIARCH_TESTS): $(S390X_MULTIARCH_RUNTIME_OBJS) > $(MULTIARCH_TESTS): LDFLAGS += $(S390X_MULTIARCH_RUNTIME_OBJS) > -$(MULTIARCH_TESTS): CFLAGS += $(MINILIB_INC) > +$(MULTIARCH_TESTS): CFLAGS += $(MINILIB_INC) \ > + -I$(SRC_PATH)/roms/SLOF/lib/libc/include/ > memory: CFLAGS += -DCHECK_UNALIGNED=0 > > # s390x clears the BSS section so we need to account for that Tested-by: Thomas Huth <thuth@redhat.com> ... and queued for my next pull request, thanks!
diff --git a/tests/tcg/s390x/Makefile.softmmu-target b/tests/tcg/s390x/Makefile.softmmu-target index 969bc5728fa..7adde2fa087 100644 --- a/tests/tcg/s390x/Makefile.softmmu-target +++ b/tests/tcg/s390x/Makefile.softmmu-target @@ -45,7 +45,8 @@ TESTS += $(ASM_TESTS) S390X_MULTIARCH_RUNTIME_OBJS = head64.o console.o $(MINILIB_OBJS) $(MULTIARCH_TESTS): $(S390X_MULTIARCH_RUNTIME_OBJS) $(MULTIARCH_TESTS): LDFLAGS += $(S390X_MULTIARCH_RUNTIME_OBJS) -$(MULTIARCH_TESTS): CFLAGS += $(MINILIB_INC) +$(MULTIARCH_TESTS): CFLAGS += $(MINILIB_INC) \ + -I$(SRC_PATH)/roms/SLOF/lib/libc/include/ memory: CFLAGS += -DCHECK_UNALIGNED=0 # s390x clears the BSS section so we need to account for that
Compiling the s390x tests on Fedora, which has the s390x cross-compiler installed, fails with: In file included from qemu/tests/tcg/s390x/console.c:8: qemu/tests/tcg/s390x/../../../pc-bios/s390-ccw/sclp.c:11:10: fatal error: string.h: No such file or directory 11 | #include <string.h> This is because Fedora does not have a cross-libc. Since console.c already uses the SLOF libc implementation, add the respective headers to the include path. Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com> --- tests/tcg/s390x/Makefile.softmmu-target | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)