From nobody Mon Feb 9 22:19:56 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1567631273; cv=none; d=zoho.com; s=zohoarc; b=AFV7P3szrWPa6noOB5IiMUR8iDysnqFrKcgg89n21Eytz7g2iozZ/5upyaaiC1dwvYOEQYRRt050wtbDTUqYS2AfRXLUJnQHkI96YSBJJcFhyUliFYo9mP8Nvmix4VO2tBdZvRLMSyHaMZIDgqaoX7CEFbePTBUWVZYIO2m0y/g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1567631273; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=RQ+w2ffSJd/RpKk495uXzETqMFts2Vn6aZXPqkkPBt0=; b=QPD9h0OaEH4fARt5nNisjrRY7x+kT8rfULEcBXMCPb9+jfZAAZGxyyuzHHjCNKfOSm5Bq0Okgs3blRVdLuHASoYPPuU2xqsAzEnhsgkKyq2zPTeA40j/Kucomx3UBv9FDy5onW9n9JX+aC10AqHnhUVkv9tvlhZnU6q7WNB3ONA= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1567631273529349.2969247082614; Wed, 4 Sep 2019 14:07:53 -0700 (PDT) Received: from localhost ([::1]:39858 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5cVI-0004aC-NQ for importer@patchew.org; Wed, 04 Sep 2019 17:07:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49832) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5bvJ-0008CD-RD for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:30:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5bv9-0006dr-EG for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:30:37 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:39838) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i5bv7-0006a6-JL for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:30:26 -0400 Received: by mail-wr1-x42a.google.com with SMTP id t16so182509wra.6 for ; Wed, 04 Sep 2019 13:30:24 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id v11sm39461709wrv.54.2019.09.04.13.30.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2019 13:30:18 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id DC12F1FF92; Wed, 4 Sep 2019 21:30:13 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RQ+w2ffSJd/RpKk495uXzETqMFts2Vn6aZXPqkkPBt0=; b=OVP3wva9bR2vV66E8RVzSY7NYpmJTsi6K1D3L7Mz09nk0M46aNd7L1KzRLv6et2n/x UF2s/S67ygCcrgYNqCP86t6Hf+Eyto/MNdvPmvy1Y+FH5gVl1DfmaRxs/GZJ0kBZaNLk 2K0TsHg121+aFmeD9Y7U6CKL39RB3DIKx653SfKMjQpm995NupcPOkw2t1N5Z1Epbrhl ypREV9M4rdlz/6TC4jUT9h9lRLcQdOvWTJVpz0jveflDDZBgE3xZHGuunegVRXGcSTWM zX1MRF7iW1IflGV2kzqAdzytShYwS7vlTdrP4csdXi8nyQn26LVpbgBcozk83VCL5jZq wxKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RQ+w2ffSJd/RpKk495uXzETqMFts2Vn6aZXPqkkPBt0=; b=nGBumpclwSAYfqAT8sfzQD/Mx81MTgM23ppd1rDIXeii6waOv2ogRWmf47GZG2Wj+c 8BwNqJB1UDE1EIIr6nQddxZTclcxTN/0Xiyy0xci5BwGx1vfJVmLhbW/Cqy6bIIrj31X sZ5GsYmfI0MTfYf/UO37S050VwA6dVaoOp5q+oC0Sb/GN4nPWFrJJu3ebTUx55lD18Xo JK899LIa4axyq54GErLPXf7XptxoONtIyhK/UpuDZNxn9qVAh/MzhLf3xlBpiXvtDBhf lBOGgyo0HmxseHI0GEefuyBZ6CeyImWdRH9teFyGN1LDDy+Zu6YDYTXx97ta5Ut2alkR YsuQ== X-Gm-Message-State: APjAAAVkz6sYMAI/XCuU1t5TfUqb+IlYZd/JbFlcdHJBLUMAmUbxbckL +0o/Pvrl0bSpw/6sgxy3kg/elw== X-Google-Smtp-Source: APXvYqyIsTqFlvK5kpnz2KXdlMfdAi56Q5sCladsKxsQzi/Wnfx3osFTwEGBwKSswreaAxwq6jAG0Q== X-Received: by 2002:adf:e30e:: with SMTP id b14mr50437707wrj.168.1567629022880; Wed, 04 Sep 2019 13:30:22 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 4 Sep 2019 21:29:36 +0100 Message-Id: <20190904203013.9028-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904203013.9028-1-alex.bennee@linaro.org> References: <20190904203013.9028-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42a Subject: [Qemu-devel] [PATCH v1 05/42] tests/tcg: cleanup Makefile inclusions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Peter Maydell , berrange@redhat.com, Eduardo Habkost , stefanb@linux.vnet.ibm.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , cota@braap.org, stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, "open list:ARM TCG CPUs" , aurelien@aurel32.net, Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Paolo Bonzini Rename Makefile.probe to Makefile.prereqs and make it actually define rules for the tests. Rename Makefile to Makefile.target, since it is not a toplevel makefile. Rename Makefile.include to Makefile.qemu and disentangle it from the QEMU Makefile.target, so that it is invoked recursively by tests/Makefile.include. Tests are now placed in tests/tcg/$(TARGET). 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 Message-Id: <20190807143523.15917-3-pbonzini@redhat.com> --- Makefile.target | 3 -- tests/Makefile.include | 23 +++++---- .../tcg/{Makefile.probe =3D> Makefile.prereqs} | 5 +- tests/tcg/{Makefile.include =3D> Makefile.qemu} | 48 +++++++++++-------- tests/tcg/{Makefile =3D> Makefile.target} | 13 ++--- tests/tcg/aarch64/Makefile.target | 12 +++-- tests/tcg/arm/Makefile.softmmu-target | 4 -- tests/tcg/i386/Makefile.softmmu-target | 8 ---- tests/tcg/i386/Makefile.target | 13 ++--- tests/tcg/x86_64/Makefile.softmmu-target | 36 ++++++++++++++ tests/tcg/x86_64/Makefile.target | 7 +-- 11 files changed, 100 insertions(+), 72 deletions(-) rename tests/tcg/{Makefile.probe =3D> Makefile.prereqs} (92%) rename tests/tcg/{Makefile.include =3D> Makefile.qemu} (52%) rename tests/tcg/{Makefile =3D> Makefile.target} (92%) create mode 100644 tests/tcg/x86_64/Makefile.softmmu-target diff --git a/Makefile.target b/Makefile.target index 933b27453a1..5e916230c43 100644 --- a/Makefile.target +++ b/Makefile.target @@ -39,9 +39,6 @@ endif PROGS=3D$(QEMU_PROG) $(QEMU_PROGW) STPFILES=3D =20 -# Makefile Tests -include $(SRC_PATH)/tests/tcg/Makefile.include - config-target.h: config-target.h-timestamp config-target.h-timestamp: config-target.mak =20 diff --git a/tests/Makefile.include b/tests/Makefile.include index f5ac09549ca..8400656b9d3 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -1062,23 +1062,28 @@ RUN_TCG_TARGET_RULES=3D$(patsubst %,run-tcg-tests-%= , $(TARGET_DIRS)) ifeq ($(HAVE_USER_DOCKER),y) # Probe for the Docker Builds needed for each build $(foreach PROBE_TARGET,$(TARGET_DIRS), \ - $(eval -include $(SRC_PATH)/tests/tcg/Makefile.probe) \ - $(if $(DOCKER_PREREQ), \ - $(eval build-tcg-tests-$(PROBE_TARGET): $(DOCKER_PREREQ)))) + $(eval -include $(SRC_PATH)/tests/tcg/Makefile.prereqs)) endif =20 build-tcg-tests-%: - $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $* V=3D"$(V)" \ - SKIP_DOCKER_BUILD=3D1 TARGET_DIR=3D"$*/" guest-tests, \ + $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) \ + -f $(SRC_PATH)/tests/tcg/Makefile.qemu \ + SRC_PATH=3D$(SRC_PATH) \ + V=3D"$(V)" TARGET_DIR=3D"$*/" guest-tests, \ "BUILD", "TCG tests for $*") =20 -run-tcg-tests-%: % build-tcg-tests-% - $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $* V=3D"$(V)" \ - SKIP_DOCKER_BUILD=3D1 TARGET_DIR=3D"$*/" run-guest-tests, \ +run-tcg-tests-%: build-tcg-tests-% %/all + $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) \ + -f $(SRC_PATH)/tests/tcg/Makefile.qemu \ + SRC_PATH=3D$(SRC_PATH) SPEED=3D"$(SPEED)" \ + V=3D"$(V)" TARGET_DIR=3D"$*/" run-guest-tests, \ "RUN", "TCG tests for $*") =20 clean-tcg-tests-%: - $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $* V=3D"$(V)" TARGET_= DIR=3D"$*/" clean-guest-tests,) + $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) \ + -f $(SRC_PATH)/tests/tcg/Makefile.qemu \ + SRC_PATH=3D$(SRC_PATH) TARGET_DIR=3D"$*/" clean-guest-tests, \ + "RUN", "TCG tests for $*") =20 .PHONY: build-tcg build-tcg: $(BUILD_TCG_TARGET_RULES) diff --git a/tests/tcg/Makefile.probe b/tests/tcg/Makefile.prereqs similarity index 92% rename from tests/tcg/Makefile.probe rename to tests/tcg/Makefile.prereqs index 9dc654663d6..53b01962e1d 100644 --- a/tests/tcg/Makefile.probe +++ b/tests/tcg/Makefile.prereqs @@ -8,20 +8,19 @@ # each target. =20 # First we need the target makefile which tells us the target architecture +CROSS_CC_GUEST:=3D -include $(BUILD_DIR)/$(PROBE_TARGET)/config-target.mak =20 # Then we load up the target architecture makefiles which tell us # about the compilers -CROSS_CC_GUEST:=3D DOCKER_IMAGE:=3D -DOCKER_PREREQ:=3D =20 -include $(SRC_PATH)/tests/tcg/$(TARGET_BASE_ARCH)/Makefile.include -include $(SRC_PATH)/tests/tcg/$(TARGET_NAME)/Makefile.include =20 ifndef CROSS_CC_GUEST ifneq ($(DOCKER_IMAGE),) -DOCKER_PREREQ:=3Ddocker-image-$(DOCKER_IMAGE) +build-tcg-tests-$(PROBE_TARGET): docker-image-$(DOCKER_IMAGE) endif endif =20 diff --git a/tests/tcg/Makefile.include b/tests/tcg/Makefile.qemu similarity index 52% rename from tests/tcg/Makefile.include rename to tests/tcg/Makefile.qemu index 210f8428237..7eff11d434e 100644 --- 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. # =20 # The per ARCH makefile, if it exists, holds extra information about # useful docker images or alternative compiler flags. =20 --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) =20 GUEST_BUILD=3D -TCG_MAKE=3D$(SRC_PATH)/tests/tcg/Makefile +TCG_MAKE=3D../Makefile.target # Support installed Cross Compilers =20 ifdef CROSS_CC_GUEST @@ -23,9 +26,9 @@ ifdef CROSS_CC_GUEST .PHONY: cross-build-guest-tests cross-build-guest-tests: $(call quiet-command, \ - (mkdir -p tests && cd tests && \ - $(MAKE) -f $(TCG_MAKE) CC=3D$(CROSS_CC_GUEST) \ - BUILD_STATIC=3D$(CROSS_CC_GUEST_STATIC) \ + (mkdir -p tests/tcg/$(TARGET_DIR) && cd tests/tcg/$(TARGET_DIR) && \ + $(MAKE) -f $(TCG_MAKE) TARGET_DIR=3D"$(TARGET_DIR)" CC=3D"$(CROSS_CC_= GUEST)" \ + SRC_PATH=3D"$(SRC_PATH)" BUILD_STATIC=3D$(CROSS_CC_GUEST_STATIC) \ EXTRA_CFLAGS=3D$(CROSS_CC_GUEST_CFLAGS)), \ "BUILD","$(TARGET_NAME) guest-tests with $(CROSS_CC_GUEST)") =20 @@ -39,20 +42,20 @@ ifeq ($(HAVE_USER_DOCKER)$(GUEST_BUILD),y) ifneq ($(DOCKER_IMAGE),) =20 # We also need the Docker make rules to depend on +SKIP_DOCKER_BUILD=3D1 include $(SRC_PATH)/tests/docker/Makefile.include =20 DOCKER_COMPILE_CMD=3D"$(DOCKER_SCRIPT) cc \ --cc $(DOCKER_CROSS_COMPILER) \ -i qemu:$(DOCKER_IMAGE) \ -s $(SRC_PATH) -- " -DOCKER_PREREQ=3Ddocker-image-$(DOCKER_IMAGE) =20 .PHONY: docker-build-guest-tests -docker-build-guest-tests: $(DOCKER_PREREQ) +docker-build-guest-tests: docker-image-$(DOCKER_IMAGE) $(call quiet-command, \ - (mkdir -p tests && cd tests && \ - $(MAKE) -f $(TCG_MAKE) CC=3D$(DOCKER_COMPILE_CMD) \ - BUILD_STATIC=3Dy \ + (mkdir -p tests/tcg/$(TARGET_DIR) && cd tests/tcg/$(TARGET_DIR) && \ + $(MAKE) -f $(TCG_MAKE) TARGET_DIR=3D"$(TARGET_DIR)" CC=3D$(DOCKER_COMP= ILE_CMD) \ + SRC_PATH=3D"$(SRC_PATH)" BUILD_STATIC=3Dy \ EXTRA_CFLAGS=3D$(DOCKER_CROSS_COMPILER_CFLAGS)), \ "BUILD","$(TARGET_NAME) guest-tests with docker qemu:$(DOCKER_IMAGE)") =20 @@ -62,27 +65,32 @@ endif endif =20 # Final targets +all: + @echo "Do not invoke this Makefile directly"; exit 1 + .PHONY: guest-tests =20 ifneq ($(GUEST_BUILD),) guest-tests: $(GUEST_BUILD) =20 -run-guest-tests: guest-tests qemu-$(subst y,system-,$(CONFIG_SOFTMMU))$(TA= RGET_NAME) +run-guest-tests: guest-tests $(call quiet-command, \ - (cd tests && $(MAKE) -f $(TCG_MAKE) SPEED=3D$(SPEED) run), \ + (cd tests/tcg/$(TARGET_DIR) && \ + $(MAKE) -f $(TCG_MAKE) TARGET_DIR=3D"$(TARGET_DIR)" \ + SRC_PATH=3D"$(SRC_PATH)" SPEED=3D$(SPEED) run), \ "RUN", "tests for $(TARGET_NAME)") =20 else guest-tests: $(call quiet-command, /bin/true, "BUILD", \ - "$(TARGET_NAME) guest-tests SKIPPED") + "$(TARGET_DIR) guest-tests SKIPPED") =20 run-guest-tests: $(call quiet-command, /bin/true, "RUN", \ - "tests for $(TARGET_NAME) SKIPPED") + "tests for $(TARGET_DIR) SKIPPED") endif =20 # It doesn't matter if these don't exits .PHONY: clean-guest-tests clean-guest-tests: - rm -rf tests || echo "no $(TARGET_NAME) tests to remove" + rm -rf tests/tcg/$(TARGET_DIR) diff --git a/tests/tcg/Makefile b/tests/tcg/Makefile.target similarity index 92% rename from tests/tcg/Makefile rename to tests/tcg/Makefile.target index 9f567686240..8dbcba4474f 100644 --- a/tests/tcg/Makefile +++ b/tests/tcg/Makefile.target @@ -29,8 +29,9 @@ # We also expect to be in the tests build dir for the FOO-(linux-user|soft= mmu). # =20 +all: -include ../../config-host.mak --include ../config-target.mak +-include ../../../$(TARGET_DIR)/config-target.mak =20 # for including , in command strings COMMA :=3D , @@ -64,9 +65,9 @@ LDFLAGS=3D =20 # The QEMU for this TARGET ifdef CONFIG_USER_ONLY -QEMU=3D../qemu-$(TARGET_NAME) +QEMU=3D../../../$(TARGET_DIR)/qemu-$(TARGET_NAME) else -QEMU=3D../qemu-system-$(TARGET_NAME) +QEMU=3D../../../$(TARGET_DIR)/qemu-system-$(TARGET_NAME) endif QEMU_OPTS=3D =20 @@ -82,10 +83,7 @@ ifdef CONFIG_USER_ONLY # The order we include is important. We include multiarch, base arch # and finally arch if it's not the same as base arch. -include $(SRC_PATH)/tests/tcg/multiarch/Makefile.target --include $(SRC_PATH)/tests/tcg/$(TARGET_BASE_ARCH)/Makefile.target -ifneq ($(TARGET_BASE_ARCH),$(TARGET_NAME)) -include $(SRC_PATH)/tests/tcg/$(TARGET_NAME)/Makefile.target -endif =20 # Add the common build options CFLAGS+=3D-Wall -O0 -g -fno-strict-aliasing @@ -101,10 +99,7 @@ else # are expected to provide their own build recipes. -include $(SRC_PATH)/tests/tcg/minilib/Makefile.target -include $(SRC_PATH)/tests/tcg/multiarch/system/Makefile.softmmu-target --include $(SRC_PATH)/tests/tcg/$(TARGET_BASE_ARCH)/Makefile.softmmu-target -ifneq ($(TARGET_BASE_ARCH),$(TARGET_NAME)) -include $(SRC_PATH)/tests/tcg/$(TARGET_NAME)/Makefile.softmmu-target -endif =20 endif =20 diff --git a/tests/tcg/aarch64/Makefile.target b/tests/tcg/aarch64/Makefile= .target index 31ba9cfcaa1..e763dd9da37 100644 --- a/tests/tcg/aarch64/Makefile.target +++ b/tests/tcg/aarch64/Makefile.target @@ -2,12 +2,14 @@ # # AArch64 specific tweaks =20 +ARM_SRC=3D$(SRC_PATH)/tests/tcg/arm +VPATH +=3D $(ARM_SRC) + AARCH64_SRC=3D$(SRC_PATH)/tests/tcg/aarch64 VPATH +=3D $(AARCH64_SRC) =20 -# we don't build any of the ARM tests -AARCH64_TESTS=3D$(filter-out $(ARM_TESTS), $(TESTS)) -AARCH64_TESTS+=3Dfcvt +# we don't build any other ARM test +AARCH64_TESTS=3Dfcvt =20 fcvt: LDFLAGS+=3D-lm =20 @@ -16,6 +18,6 @@ run-fcvt: fcvt $(call diff-out,$<,$(AARCH64_SRC)/fcvt.ref) =20 AARCH64_TESTS +=3D pauth-1 pauth-2 -run-pauth-%: QEMU +=3D -cpu max +run-pauth-%: QEMU_OPTS +=3D -cpu max =20 -TESTS:=3D$(AARCH64_TESTS) +TESTS +=3D $(AARCH64_TESTS) diff --git a/tests/tcg/arm/Makefile.softmmu-target b/tests/tcg/arm/Makefile= .softmmu-target index 2deb06e6e46..231e9a57b48 100644 --- a/tests/tcg/arm/Makefile.softmmu-target +++ b/tests/tcg/arm/Makefile.softmmu-target @@ -3,8 +3,6 @@ # ARM SoftMMU tests - included from tests/tcg/Makefile # =20 -ifeq ($(TARGET_ABI_DIR),arm) - ARM_SRC=3D$(SRC_PATH)/tests/tcg/arm =20 # Set search path for all sources @@ -25,5 +23,3 @@ LDFLAGS+=3D-nostdlib -N -static test-armv6m-undef: EXTRA_CFLAGS+=3D-mcpu=3Dcortex-m0 =20 run-test-armv6m-undef: QEMU_OPTS+=3D-semihosting -M microbit -kernel - -endif diff --git a/tests/tcg/i386/Makefile.softmmu-target b/tests/tcg/i386/Makefi= le.softmmu-target index cee342017e5..1c8790eecd2 100644 --- a/tests/tcg/i386/Makefile.softmmu-target +++ b/tests/tcg/i386/Makefile.softmmu-target @@ -12,17 +12,9 @@ X64_SYSTEM_SRC=3D$(SRC_PATH)/tests/tcg/x86_64/system # These objects provide the basic boot code and helper functions for all t= ests CRT_OBJS=3Dboot.o =20 -ifeq ($(TARGET_X86_64), y) -CRT_PATH=3D$(X64_SYSTEM_SRC) -CFLAGS=3D-march=3Dx86-64 -LINK_SCRIPT=3D$(X64_SYSTEM_SRC)/kernel.ld -LDFLAGS=3D-Wl,-T$(LINK_SCRIPT) -Wl,-melf_x86_64 -else CRT_PATH=3D$(I386_SYSTEM_SRC) -CFLAGS+=3D-m32 LINK_SCRIPT=3D$(I386_SYSTEM_SRC)/kernel.ld LDFLAGS=3D-Wl,-T$(LINK_SCRIPT) -Wl,-melf_i386 -endif CFLAGS+=3D-nostdlib -ggdb -O0 $(MINILIB_INC) LDFLAGS+=3D-static -nostdlib $(CRT_OBJS) $(MINILIB_OBJS) -lgcc =20 diff --git a/tests/tcg/i386/Makefile.target b/tests/tcg/i386/Makefile.target index d0eb7023e52..08c5736a4d4 100644 --- a/tests/tcg/i386/Makefile.target +++ b/tests/tcg/i386/Makefile.target @@ -6,14 +6,11 @@ I386_SRC=3D$(SRC_PATH)/tests/tcg/i386 VPATH +=3D $(I386_SRC) =20 I386_SRCS=3D$(notdir $(wildcard $(I386_SRC)/*.c)) -I386_TESTS=3D$(I386_SRCS:.c=3D) -I386_ONLY_TESTS=3D$(filter-out test-i386-ssse3, $(I386_TESTS)) +ALL_X86_TESTS=3D$(I386_SRCS:.c=3D) +I386_TESTS:=3D$(filter-out test-i386-ssse3, $(ALL_X86_TESTS)) +X86_64_TESTS:=3D$(filter test-i386-ssse3, $(ALL_X86_TESTS)) # Update TESTS -TESTS+=3D$(I386_ONLY_TESTS) - -ifneq ($(TARGET_NAME),x86_64) -CFLAGS+=3D-m32 -endif +TESTS=3D$(MULTIARCH_TESTS) $(I386_TESTS) =20 # # hello-i386 is a barebones app @@ -26,7 +23,7 @@ hello-i386: LDFLAGS+=3D-nostdlib # =20 test-i386: test-i386.c test-i386-code16.S test-i386-vm86.S test-i386.h tes= t-i386-shift.h test-i386-muldiv.h - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ \ + $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_CFLAGS) -o $@ \ $(