On 30/07/19 14:44, Philippe Mathieu-Daudé wrote: > On 7/30/19 2:37 PM, Paolo Bonzini wrote: > [...] >> Drop the usage of TARGET_BASE_ARCH, which is ignored by everything except >> x86_64 and aarch64. Fix x86 tests by using -cpu max and, while >> at it, standardize on QEMU_OPTS for aarch64 tests too. >> >> Signed-off-by: Paolo Bonzini <pbonz...@redhat.com> >> --- > [...] >> --- a/tests/tcg/Makefile.include >> +++ b/tests/tcg/Makefile.qemu >> @@ -2,20 +2,23 @@ >> # >> # TCG tests (per-target rules) >> # >> -# This Makefile fragment is included from the per-target >> -# Makefile.target so will be invoked for each linux-user program we >> -# build. We have two options for compiling, either using a configured >> -# guest compiler or calling one of our docker images to do it for us. >> +# This Makefile fragment is included from the build-tcg target, once >> +# for each target we build. We have two options for compiling, either >> +# using a configured guest compiler or calling one of our docker images >> +# to do it for us. >> # >> >> # The per ARCH makefile, if it exists, holds extra information about >> # useful docker images or alternative compiler flags. >> >> --include $(SRC_PATH)/tests/tcg/$(TARGET_BASE_ARCH)/Makefile.include >> --include $(SRC_PATH)/tests/tcg/$(TARGET_NAME)/Makefile.include >> +include $(TARGET_DIR)config-target.mak >> +include $(SRC_PATH)/rules.mak >> +include $(wildcard \ >> + $(SRC_PATH)/tests/tcg/$(TARGET_BASE_ARCH)/Makefile.include \ >> + $(SRC_PATH)/tests/tcg/$(TARGET_NAME)/Makefile.include) >> > > It is still used here... Else we could clean ./configure way more.
Yes, I only made that part go away in the next patch to keep it simple (the next patch gets rid of Makefile.include altogether, so I didn't want to add churn in this one). But it would not clean ./configure much since TARGET_BASE_ARCH is used by QEMU itself. Paolo
