On Thu, Jul 24, 2025 at 2:01 PM Alex Bennée <alex.ben...@linaro.org> wrote: > > We are about to change the way the plugin runs are done and having > this included by default will complicate things. > > Signed-off-by: Alex Bennée <alex.ben...@linaro.org> > --- > tests/tcg/Makefile.target | 6 ++++++ > tests/tcg/multiarch/system/Makefile.softmmu-target | 5 +++++ > 2 files changed, 11 insertions(+) > > diff --git a/tests/tcg/Makefile.target b/tests/tcg/Makefile.target > index 97ebe8f9bc9..a12b15637ea 100644 > --- a/tests/tcg/Makefile.target > +++ b/tests/tcg/Makefile.target > @@ -127,8 +127,14 @@ else > # build options for bare programs are usually pretty different. They > # are expected to provide their own build recipes. > EXTRA_CFLAGS += -ffreestanding -fno-stack-protector > + > +# We skip the multiarch tests if the target hasn't provided a boot.S > +MULTIARCH_SOFTMMU_TARGETS = i386 alpha aarch64 arm loongarch64 s390x x86_64 > + > +ifneq ($(filter $(TARGET_NAME),$(MULTIARCH_SOFTMMU_TARGETS)),) > -include $(SRC_PATH)/tests/tcg/minilib/Makefile.target > -include $(SRC_PATH)/tests/tcg/multiarch/system/Makefile.softmmu-target > +endif > -include $(SRC_PATH)/tests/tcg/$(TARGET_NAME)/Makefile.softmmu-target > > endif > diff --git a/tests/tcg/multiarch/system/Makefile.softmmu-target > b/tests/tcg/multiarch/system/Makefile.softmmu-target > index 07be001102b..5acf2700812 100644 > --- a/tests/tcg/multiarch/system/Makefile.softmmu-target > +++ b/tests/tcg/multiarch/system/Makefile.softmmu-target > @@ -6,6 +6,11 @@ > # architecture to add to the test dependencies and deal with the > # complications of building. > # > +# To support the multiarch guests the target arch needs to provide a > +# boot.S that jumps to main and provides a __sys_outc functions.
s/functions/function > +# Remember to update MULTIARCH_SOFTMMU_TARGETS in the tcg test > +# Makefile.target when this is done. > +# > > MULTIARCH_SRC=$(SRC_PATH)/tests/tcg/multiarch > MULTIARCH_SYSTEM_SRC=$(MULTIARCH_SRC)/system > -- > 2.47.2 > > Otherwise Reviewed-by: Manos Pitsidianakis <manos.pitsidiana...@linaro.org>
