From nobody Sun Feb 8 23:21:01 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1565188580; cv=none; d=zoho.com; s=zohoarc; b=SHoODJU0Tx82KubrRNQ1awycpd4VSKXK32Z8233tP/OR3con7fmjQ38Dl2knvl7y7z506btQkgYJRBmgDejNcUBOt5vtKEg1xNw2+165yO89NBQNWDDHj7whRW9dD6GNW9CGDu+5qYtJZfXZx3aOwL4lqEUIj/d+2XB37j9SLaI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565188580; 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=17S8+srOfxdrNTILDf4H97ECt1wzvAyOrkiP+8O9a4E=; b=jq8FCB3Kgme/2DshXgIu7eBspZXcPy/yjoE5XbZ1G4pzkcuJJPw6ylMUSfid4k7jf5DLm00w2cEMVemW5L6JH9AkjLG/9wSx5H7AgDXnEaG62NdBKZgLB31JhRNUUKFyCAAKIwTuDufgI0u+QfsQTcK/vS8Bs2B9KuZ02sIRJ2U= 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 1565188580645841.7530624893548; Wed, 7 Aug 2019 07:36:20 -0700 (PDT) Received: from localhost ([::1]:41918 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hvN2z-0004eR-2F for importer@patchew.org; Wed, 07 Aug 2019 10:36:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41740) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hvN2H-0003Wl-KS for qemu-devel@nongnu.org; Wed, 07 Aug 2019 10:35:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hvN2G-0006b2-Ho for qemu-devel@nongnu.org; Wed, 07 Aug 2019 10:35:29 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:51472) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hvN2G-0006aP-A2 for qemu-devel@nongnu.org; Wed, 07 Aug 2019 10:35:28 -0400 Received: by mail-wm1-x332.google.com with SMTP id 207so301521wma.1 for ; Wed, 07 Aug 2019 07:35:28 -0700 (PDT) Received: from donizetti.lan ([2001:b07:6468:f312:dc26:ed70:9e4c:3810]) by smtp.gmail.com with ESMTPSA id o4sm86004wmh.35.2019.08.07.07.35.25 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 07 Aug 2019 07:35:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=17S8+srOfxdrNTILDf4H97ECt1wzvAyOrkiP+8O9a4E=; b=uAMd6s8zvT8O9YKfO0CKczpOpo5SW8ErgsFw6sLovdNkx6b0uzfJ8vVKt+hJIowx0X 7ff5MuTW2MyeOOGnas5STSIKgzv565qTUhpRsqDKHOhVM5M6WHFFxofxWyUJuaFPxgCz ZFlRFAitu8PdhugYNkfIQV8YbQ2MHC2nhnDeDR9x4i+EcsP19i9O7hIc9TFpY5uKp8/I 09hjxTjWCYS2I48f9PFJ0LGIiBeT/EdmDGWy1q17ufbZty8G5vjfQqwQSvYubXPr0ZqO dPv+6LU6o/qklpqyHWNPqUH7jaB+XFK18PDaBq3XGBD0rMVsGu/ZnEKJ8gWHa4UEDliR JQwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=17S8+srOfxdrNTILDf4H97ECt1wzvAyOrkiP+8O9a4E=; b=qhLvZR8iX6wxyxtRbL50Jfrp9EVBwKDihzzDe2NEIXgOX8TCQPmFOdCL7vSMQIbyxU CkOOmaOWW19rFach5CZbu22zzJGioVCoARmMu8TCBxql7QqdUpIhTxHe26Vw6iJuwG4/ nSA3E4mWXOnJ0JGPIVxh3lQWxZ4dnTHlYyXELd8senBwQkwJMgtmrVmqucLQKohzDZ1X htaaN2RrG9gCO/b6hTu7jMIPciGLut15fgADQ0OdAe9ZY2Ozc6MP20Ol8HqfmcUQ9Sse 0lbDB2Og9P5KhHoym+QwhJaBNMqy74QMoGUgyp/zUbzZ07jyn6dQyFPa2S+44poYnAHc Ilng== X-Gm-Message-State: APjAAAUfeVRgqeomq9LDcxRaZYfhVJ4L69zqVb+H7IkSsj+O8qU5cDQ3 jJoP4IhVfqe7hu2a+GMN1dAXWZIS X-Google-Smtp-Source: APXvYqx4vw73+kgqNmdsYuZ6EtxyiELi5Wz5jc4HF2mlCixm1EWg+CBbwZm1HWifG/8TOeL94eWkXQ== X-Received: by 2002:a05:600c:230c:: with SMTP id 12mr245534wmo.151.1565188526825; Wed, 07 Aug 2019 07:35:26 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 7 Aug 2019 16:35:21 +0200 Message-Id: <20190807143523.15917-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190807143523.15917-1-pbonzini@redhat.com> References: <20190807143523.15917-1-pbonzini@redhat.com> 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::332 Subject: [Qemu-devel] [PATCH v2 1/3] tests/tcg: use EXTRA_CFLAGS everywhere 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: alex.bennee@linaro.org 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" For i386 specifically, this allows using the host GCC to compile the i386 tests. But, it should really be done for all targets, unless we want to pass $(EXTRA_CFLAGS) directly as part of $(CC). Signed-off-by: Paolo Bonzini Reviewed-by: Alex Benn=C3=A9e --- tests/tcg/aarch64/Makefile.softmmu-target | 4 ++-- tests/tcg/alpha/Makefile.softmmu-target | 4 ++-- tests/tcg/arm/Makefile.softmmu-target | 2 +- tests/tcg/i386/Makefile.softmmu-target | 4 ++-- tests/tcg/minilib/Makefile.target | 2 +- tests/tcg/xtensa/Makefile.softmmu-target | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/tcg/aarch64/Makefile.softmmu-target b/tests/tcg/aarch64/= Makefile.softmmu-target index 2e560e4d08..4c4aaf61dd 100644 --- a/tests/tcg/aarch64/Makefile.softmmu-target +++ b/tests/tcg/aarch64/Makefile.softmmu-target @@ -22,11 +22,11 @@ LDFLAGS+=3D-static -nostdlib $(CRT_OBJS) $(MINILIB_OBJS= ) -lgcc .PRECIOUS: $(CRT_OBJS) =20 %.o: $(CRT_PATH)/%.S - $(CC) $(CFLAGS) -x assembler-with-cpp -c $< -o $@ + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -x assembler-with-cpp -c $< -o $@ =20 # Build and link the tests %: %.c $(LINK_SCRIPT) $(CRT_OBJS) $(MINILIB_OBJS) - $(CC) $(CFLAGS) $< -o $@ $(LDFLAGS) + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS) =20 memory: CFLAGS+=3D-DCHECK_UNALIGNED=3D1 =20 diff --git a/tests/tcg/alpha/Makefile.softmmu-target b/tests/tcg/alpha/Make= file.softmmu-target index 3c0f34cc69..09193a62d6 100644 --- a/tests/tcg/alpha/Makefile.softmmu-target +++ b/tests/tcg/alpha/Makefile.softmmu-target @@ -22,11 +22,11 @@ LDFLAGS+=3D-static -nostdlib $(CRT_OBJS) $(MINILIB_OBJS= ) -lgcc .PRECIOUS: $(CRT_OBJS) =20 %.o: $(CRT_PATH)/%.S - $(CC) $(CFLAGS) -x assembler-with-cpp -c $< -o $@ + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -x assembler-with-cpp -c $< -o $@ =20 # Build and link the tests %: %.c $(LINK_SCRIPT) $(CRT_OBJS) $(MINILIB_OBJS) - $(CC) $(CFLAGS) $< -o $@ $(LDFLAGS) + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS) =20 memory: CFLAGS+=3D-DCHECK_UNALIGNED=3D0 =20 diff --git a/tests/tcg/arm/Makefile.softmmu-target b/tests/tcg/arm/Makefile= .softmmu-target index 49d48d8a1c..2deb06e6e4 100644 --- a/tests/tcg/arm/Makefile.softmmu-target +++ b/tests/tcg/arm/Makefile.softmmu-target @@ -18,7 +18,7 @@ CFLAGS+=3D-Wl,--build-id=3Dnone -x assembler-with-cpp LDFLAGS+=3D-nostdlib -N -static =20 %: %.S %.ld - $(CC) $(CFLAGS) $(ASFLAGS) $< -o $@ $(LDFLAGS) -T $(ARM_SRC)/$@.ld + $(CC) $(CFLAGS) $(ASFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS) -T $(ARM_S= RC)/$@.ld =20 # Specific Test Rules =20 diff --git a/tests/tcg/i386/Makefile.softmmu-target b/tests/tcg/i386/Makefi= le.softmmu-target index 0a4364868c..cee342017e 100644 --- a/tests/tcg/i386/Makefile.softmmu-target +++ b/tests/tcg/i386/Makefile.softmmu-target @@ -32,11 +32,11 @@ TESTS+=3D$(MULTIARCH_TESTS) .PRECIOUS: $(CRT_OBJS) =20 %.o: $(CRT_PATH)/%.S - $(CC) $(CFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c $< -o $@ =20 # Build and link the tests %: %.c $(LINK_SCRIPT) $(CRT_OBJS) $(MINILIB_OBJS) - $(CC) $(CFLAGS) $< -o $@ $(LDFLAGS) + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS) =20 memory: CFLAGS+=3D-DCHECK_UNALIGNED=3D1 =20 diff --git a/tests/tcg/minilib/Makefile.target b/tests/tcg/minilib/Makefile= .target index 3ed8077d0f..c821d2806a 100644 --- a/tests/tcg/minilib/Makefile.target +++ b/tests/tcg/minilib/Makefile.target @@ -18,4 +18,4 @@ MINILIB_INC=3D-isystem $(SYSTEM_MINILIB_SRC) .PRECIOUS: $(MINILIB_OBJS) =20 %.o: $(SYSTEM_MINILIB_SRC)/%.c - $(CC) $(CFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c $< -o $@ diff --git a/tests/tcg/xtensa/Makefile.softmmu-target b/tests/tcg/xtensa/Ma= kefile.softmmu-target index 8212d96b81..9530cac2ad 100644 --- a/tests/tcg/xtensa/Makefile.softmmu-target +++ b/tests/tcg/xtensa/Makefile.softmmu-target @@ -34,9 +34,9 @@ $(XTENSA_USABLE_TESTS): linker.ld macros.inc $(CRT) Makef= ile.softmmu-target =20 # special rule for common blobs %.o: %.S - $(CC) $(XTENSA_INC) $($*_ASFLAGS) $(ASFLAGS) -c $< -o $@ + $(CC) $(XTENSA_INC) $($*_ASFLAGS) $(ASFLAGS) $(EXTRA_CFLAGS) -c $< -o $@ =20 %: %.S - $(CC) $(XTENSA_INC) $(ASFLAGS) $< -o $@ $(LDFLAGS) $(NOSTDFLAGS) $(CRT) + $(CC) $(XTENSA_INC) $(ASFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS) $(NOST= DFLAGS) $(CRT) =20 endif --=20 2.21.0 From nobody Sun Feb 8 23:21:01 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1565188583; cv=none; d=zoho.com; s=zohoarc; b=biOiqL00VBkG/HlroIc6gtLkX3TXyVxwwfCFbWWCwNEIcykF0quvtzozI/F50fR9QsdlLRA1Teg/fFkxhxhzWmo7HuNDog8jNlNm7gd3VQyk10HzkN+0VJJKT+mG+1NM6UPJ2Cbgf8QdsQ6tOfXZtg547S97IrqTnjlqqLcIsGE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565188583; 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=L17nmp4EtB/bX6EdCmG6uVDw61DjK5O/rGkvV267caI=; b=ElR3DvGyZP72bheyafQCMYZXG17hcc1AQazWMzymF5mYrIpPaQlzKUWdqXKhYb/ex9fR0pcE95XrTtT4ZyvexyjUzTb68kPVzhU+R2FhIwJaioGJVcsuACj8MdoO0oc1IK6VPf89f10OgLUIYdB66fBcJEcXxe7mDBTFbkI0Dbo= 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 1565188583014477.7636867013822; Wed, 7 Aug 2019 07:36:23 -0700 (PDT) Received: from localhost ([::1]:41922 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hvN35-0004wJ-Lk for importer@patchew.org; Wed, 07 Aug 2019 10:36:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41764) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hvN2K-0003Yu-Kj for qemu-devel@nongnu.org; Wed, 07 Aug 2019 10:35:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hvN2H-0006bi-Ky for qemu-devel@nongnu.org; Wed, 07 Aug 2019 10:35:32 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:40097) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hvN2H-0006b8-Cq for qemu-devel@nongnu.org; Wed, 07 Aug 2019 10:35:29 -0400 Received: by mail-wr1-x441.google.com with SMTP id r1so91590333wrl.7 for ; Wed, 07 Aug 2019 07:35:29 -0700 (PDT) Received: from donizetti.lan ([2001:b07:6468:f312:dc26:ed70:9e4c:3810]) by smtp.gmail.com with ESMTPSA id o4sm86004wmh.35.2019.08.07.07.35.26 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 07 Aug 2019 07:35:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=L17nmp4EtB/bX6EdCmG6uVDw61DjK5O/rGkvV267caI=; b=batk8qBJkgSx9TpiC/I+ojP7pBL5bjfqkdoQnEkgcHYhPxhAXdvCC24JFHmbiSfOWi BsIGRy3OlfpnXmJEAymCj+GWf9uq+O4W1PbLJe1HwjKsFS6PE9vdYZUpCDxwUIGbyThU cdppr80uRUQx33NZn5h0hmcwK3UTKulELZlxeQUnWsSj9GoIq4/na3ysQfKW9SxnPwYZ 1jDd0w6QdalvQSOjMja9upMJVz72nEPLTh9MZA0g3WmUeSOGac4VhecxdSw5lvZwBLlx 08i6N5cmRcK0L6PkB83IjC38sKx93De4yKD7SoI7i49GbIZaanWtK57lD3rx+wOtM/fu 4jYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=L17nmp4EtB/bX6EdCmG6uVDw61DjK5O/rGkvV267caI=; b=T3o7suqJsuiRTMLwhUiEtG0Q4xADZZxD7U9Rh1BpXlELOlRlHpBTJwisr3RWokOrV9 62ADZi4l5m82+uUeuFzn7obt7GSTGIE7Xw8kC9w0oJ8oWyO2HGi7/xLEFjR3INNCpQ9N 5G/lSpHI57i2014UegjDgo45fYeQSFbgZ+vqnZfe8wsf2LHC3lr9I9svcPOmH8SbHrvX W81PzGgseaNRN/13csGqvJ5DzR51b9aIqJ6GEuNMZmyTZEk181sXl3xneg+wkUCGKCkv 15NbEm3aTmXEm7JgynJtoiwRWsfo94Qp2tgBcIuYD2mLqpb6gWY629xylgWIopbnDa26 XYNg== X-Gm-Message-State: APjAAAVfZBJ7DdgpUh/6rY+MZR+ie5J8J8A9UoOVO5HTcD+QPIy4YFWH Y8Dbyhbcg0RTHKkorXUN3aSdCyHn X-Google-Smtp-Source: APXvYqyJYKei4bqZtO6DKUjs6sEqHRdDF21Fs0qQSa1jLrjOAq57v7IziBh6dop4fxAqY60rcmWsJA== X-Received: by 2002:a5d:438e:: with SMTP id i14mr11283698wrq.122.1565188527954; Wed, 07 Aug 2019 07:35:27 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 7 Aug 2019 16:35:22 +0200 Message-Id: <20190807143523.15917-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190807143523.15917-1-pbonzini@redhat.com> References: <20190807143523.15917-1-pbonzini@redhat.com> 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::441 Subject: [Qemu-devel] [PATCH v2 2/3] 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: alex.bennee@linaro.org 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" 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 --- 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 933b27453a..5e916230c4 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 fd7fdb8658..8bb5c97b7a 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -1061,23 +1061,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 9dc654663d..53b01962e1 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 73b5626fc5..d3f34372de 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 --user $(shell id -u) \ --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 9f56768624..8dbcba4474 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 31ba9cfcaa..e763dd9da3 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 2deb06e6e4..231e9a57b4 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 cee342017e..1c8790eecd 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 d0eb7023e5..08c5736a4d 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 $@ \ $( (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 156518862794611.081132268146575; Wed, 7 Aug 2019 07:37:07 -0700 (PDT) Received: from localhost ([::1]:41936 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hvN3q-0006nO-R7 for importer@patchew.org; Wed, 07 Aug 2019 10:37:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41781) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hvN2M-0003do-VA for qemu-devel@nongnu.org; Wed, 07 Aug 2019 10:35:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hvN2J-0006cy-D0 for qemu-devel@nongnu.org; Wed, 07 Aug 2019 10:35:34 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:54982) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hvN2J-0006cB-2F for qemu-devel@nongnu.org; Wed, 07 Aug 2019 10:35:31 -0400 Received: by mail-wm1-x342.google.com with SMTP id p74so283028wme.4 for ; Wed, 07 Aug 2019 07:35:31 -0700 (PDT) Received: from donizetti.lan ([2001:b07:6468:f312:dc26:ed70:9e4c:3810]) by smtp.gmail.com with ESMTPSA id o4sm86004wmh.35.2019.08.07.07.35.27 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 07 Aug 2019 07:35:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=i4qQ+OKMWkjO/Dlg5RQ6eEY8J7ODk6SOJVH9OQ7FjhE=; b=VDhx6EOK9um5vYS1Gpsa5iiTHLEJXgJmVmGUlh7HWQfs2VkO7ThCxr2X8cPTJ94vHS bguvxqtN2iBoeOE+fYZmYo4jRR1INiZANqfZq4gwFRP6wOAd/1Pl6IjDhvrAXcr3wSuI k8V0MWspQ8fncr6lAtCiqAj+3Q6OUoHnml6G8iXqBLsxTlQXwLSNlFJObxdz4QdXB3Gd cxygYFXR0I7mBJxYyIXSDNVCZAmFDa0odT1Njjr61lefuhAbFYDm+0c0fPpJwumhRGlo pagiDL7Bmr2YlceaiLiLuh9PiQLDpXZek+cEWEr4TObdSD/qbanrqlbuShT4mEDrETPz t8Jw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=i4qQ+OKMWkjO/Dlg5RQ6eEY8J7ODk6SOJVH9OQ7FjhE=; b=k7caNVmjiSk4OnFFUTClg0ltAx6DslCaAjS4OyvPlSkRvxJKb4uwjQB2DFYAuczpWR CU8KzJCN+km+TDt/ph1/42d/OKYLNlnax2EneMDyVO6E43xFlU/fJ6jH3SDEifApIiOB H4uC/eu50Fh9SWsVo0CkJ3Cvc5wi/ic5wNixO52DtlzSzGZy1Nh2fRosZ7VFsIGtIB5r pe7VswzpFXphUfcSHshHECQc9njnuZXSwGQzCkkPjdEAnyPDI/x5MePwqgOIuxJTGX4y t9dsozJ6IXa9wIBIwfwd8uJKSQ2qFN7ub4SFLrJbOrWzIPlY8vtdsYqFEvwZw/YxfYJc M8Dw== X-Gm-Message-State: APjAAAWlqfNB28rs7QUjZWqoFVd339BQCWukVgIf9HaVuv9//em8gu4U p3yeOJW5TWLlgNES/EDWTqmcWlnK X-Google-Smtp-Source: APXvYqz0MSGc0RGHWJEBegvoo3Ptdvu1KXkmTMlUx9DghdCpzPsnk00RIYTXfo0r5Xc/598wOBpf/Q== X-Received: by 2002:a1c:1bd7:: with SMTP id b206mr255411wmb.85.1565188528995; Wed, 07 Aug 2019 07:35:28 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 7 Aug 2019 16:35:23 +0200 Message-Id: <20190807143523.15917-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190807143523.15917-1-pbonzini@redhat.com> References: <20190807143523.15917-1-pbonzini@redhat.com> 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::342 Subject: [Qemu-devel] [PATCH v2 3/3] tests/tcg: move configuration to a sub-shell script 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: alex.bennee@linaro.org 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" Avoid the repeated inclusions of config-target.mak, which have risks of namespace pollution, and instead build minimal configuration files in a configuration script. The same configuration files can also be included in Makefile and Makefile.qemu Signed-off-by: Paolo Bonzini --- Makefile | 1 + configure | 155 ++------------------ tests/Makefile.include | 8 +- tests/tcg/Makefile.prereqs | 18 +-- tests/tcg/Makefile.qemu | 51 ++++--- tests/tcg/Makefile.target | 8 +- tests/tcg/aarch64/Makefile.include | 8 - tests/tcg/alpha/Makefile.include | 2 - tests/tcg/arm/Makefile.include | 8 - tests/tcg/configure.sh | 228 +++++++++++++++++++++++++++++ tests/tcg/cris/Makefile.include | 6 - tests/tcg/hppa/Makefile.include | 2 - tests/tcg/i386/Makefile.include | 9 -- tests/tcg/m68k/Makefile.include | 2 - tests/tcg/mips/Makefile.include | 20 --- tests/tcg/ppc/Makefile.include | 10 -- tests/tcg/riscv/Makefile.include | 10 -- tests/tcg/s390x/Makefile.include | 2 - tests/tcg/sh4/Makefile.include | 4 - tests/tcg/sparc64/Makefile.include | 2 - tests/tcg/xtensa/Makefile.include | 11 -- 21 files changed, 276 insertions(+), 289 deletions(-) delete mode 100644 tests/tcg/aarch64/Makefile.include delete mode 100644 tests/tcg/alpha/Makefile.include delete mode 100644 tests/tcg/arm/Makefile.include create mode 100644 tests/tcg/configure.sh delete mode 100644 tests/tcg/cris/Makefile.include delete mode 100644 tests/tcg/hppa/Makefile.include delete mode 100644 tests/tcg/i386/Makefile.include delete mode 100644 tests/tcg/m68k/Makefile.include delete mode 100644 tests/tcg/mips/Makefile.include delete mode 100644 tests/tcg/ppc/Makefile.include delete mode 100644 tests/tcg/riscv/Makefile.include delete mode 100644 tests/tcg/s390x/Makefile.include delete mode 100644 tests/tcg/sh4/Makefile.include delete mode 100644 tests/tcg/sparc64/Makefile.include delete mode 100644 tests/tcg/xtensa/Makefile.include diff --git a/Makefile b/Makefile index ecb788b2ce..e76288abb9 100644 --- a/Makefile +++ b/Makefile @@ -718,6 +718,7 @@ endef =20 distclean: clean rm -f config-host.mak config-host.h* config-host.ld $(DOCS) qemu-options.= texi qemu-img-cmds.texi qemu-monitor.texi qemu-monitor-info.texi + rm -f tests/tcg/config-*.mak rm -f config-all-devices.mak config-all-disas.mak config.status rm -f $(SUBDIR_DEVICES_MAK) rm -f po/*.mo tests/qemu-iotests/common.env diff --git a/configure b/configure index 942a73b795..f216f3f9d9 100755 --- a/configure +++ b/configure @@ -500,22 +500,6 @@ debug_mutex=3D"no" libpmem=3D"" default_devices=3D"yes" =20 -# cross compilers defaults, can be overridden with --cross-cc-ARCH -cross_cc_aarch64=3D"aarch64-linux-gnu-gcc" -cross_cc_aarch64_be=3D"$cross_cc_aarch64" -cross_cc_cflags_aarch64_be=3D"-mbig-endian" -cross_cc_arm=3D"arm-linux-gnueabihf-gcc" -cross_cc_cflags_armeb=3D"-mbig-endian" -cross_cc_i386=3D"i386-pc-linux-gnu-gcc" -cross_cc_cflags_i386=3D"" -cross_cc_ppc=3D"powerpc-linux-gnu-gcc" -cross_cc_cflags_ppc=3D"-m32" -cross_cc_ppc64=3D"powerpc-linux-gnu-gcc" -cross_cc_cflags_ppc64=3D"-m64" -cross_cc_ppc64le=3D"powerpc64le-linux-gnu-gcc" - -enabled_cross_compilers=3D"" - supported_cpu=3D"no" supported_os=3D"no" bogus_os=3D"no" @@ -548,9 +532,12 @@ for opt do ;; --cross-cc-cflags-*) cc_arch=3D${opt#--cross-cc-flags-}; cc_arch=3D${cc_= arch%%=3D*} eval "cross_cc_cflags_${cc_arch}=3D\$optarg" + cross_cc_vars=3D"$cross_cc_vars cross_cc_cflags_${cc= _arch}" ;; --cross-cc-*) cc_arch=3D${opt#--cross-cc-}; cc_arch=3D${cc_arch%%=3D*} + cc_archs=3D"$cc_archs $cc_arch" eval "cross_cc_${cc_arch}=3D\$optarg" + cross_cc_vars=3D"$cross_cc_vars cross_cc_${cc_arch}" ;; esac done @@ -745,42 +732,34 @@ ARCH=3D case "$cpu" in ppc|ppc64|s390|s390x|sparc64|x32|riscv32|riscv64) supported_cpu=3D"yes" - eval "cross_cc_${cpu}=3D\$host_cc" ;; ppc64le) ARCH=3D"ppc64" supported_cpu=3D"yes" - cross_cc_ppc64le=3D$host_cc ;; i386|i486|i586|i686|i86pc|BePC) cpu=3D"i386" supported_cpu=3D"yes" - cross_cc_i386=3D$host_cc ;; x86_64|amd64) cpu=3D"x86_64" supported_cpu=3D"yes" - cross_cc_x86_64=3D$host_cc ;; armv*b|armv*l|arm) cpu=3D"arm" supported_cpu=3D"yes" - cross_cc_arm=3D$host_cc ;; aarch64) cpu=3D"aarch64" supported_cpu=3D"yes" - cross_cc_aarch64=3D$host_cc ;; mips*) cpu=3D"mips" supported_cpu=3D"yes" - cross_cc_mips=3D$host_cc ;; sparc|sun4[cdmuv]) cpu=3D"sparc" supported_cpu=3D"yes" - cross_cc_sparc=3D$host_cc ;; *) # This will result in either an error or falling back to TCI later @@ -1555,44 +1534,30 @@ case "$cpu" in ppc) CPU_CFLAGS=3D"-m32" LDFLAGS=3D"-m32 $LDFLAGS" - cross_cc_ppc=3D$cc - cross_cc_cflags_ppc=3D"$CPU_CFLAGS" ;; ppc64) CPU_CFLAGS=3D"-m64" LDFLAGS=3D"-m64 $LDFLAGS" - cross_cc_ppc64=3D$cc - cross_cc_cflags_ppc64=3D"$CPU_CFLAGS" ;; sparc) CPU_CFLAGS=3D"-m32 -mv8plus -mcpu=3Dultrasparc" LDFLAGS=3D"-m32 -mv8plus $LDFLAGS" - cross_cc_sparc=3D$cc - cross_cc_cflags_sparc=3D"$CPU_CFLAGS" ;; sparc64) CPU_CFLAGS=3D"-m64 -mcpu=3Dultrasparc" LDFLAGS=3D"-m64 $LDFLAGS" - cross_cc_sparc64=3D$cc - cross_cc_cflags_sparc64=3D"$CPU_CFLAGS" ;; s390) CPU_CFLAGS=3D"-m31" LDFLAGS=3D"-m31 $LDFLAGS" - cross_cc_s390=3D$cc - cross_cc_cflags_s390=3D"$CPU_CFLAGS" ;; s390x) CPU_CFLAGS=3D"-m64" LDFLAGS=3D"-m64 $LDFLAGS" - cross_cc_s390x=3D$cc - cross_cc_cflags_s390x=3D"$CPU_CFLAGS" ;; i386) CPU_CFLAGS=3D"-m32" LDFLAGS=3D"-m32 $LDFLAGS" - cross_cc_i386=3D$cc - cross_cc_cflags_i386=3D"$CPU_CFLAGS" ;; x86_64) # ??? Only extremely old AMD cpus do not have cmpxchg16b. @@ -1600,18 +1565,16 @@ case "$cpu" in # runtime and generate the fallback to serial emulation. CPU_CFLAGS=3D"-m64 -mcx16" LDFLAGS=3D"-m64 $LDFLAGS" - cross_cc_x86_64=3D$cc - cross_cc_cflags_x86_64=3D"$CPU_CFLAGS" ;; x32) CPU_CFLAGS=3D"-mx32" LDFLAGS=3D"-mx32 $LDFLAGS" - cross_cc_i386=3D$cc - cross_cc_cflags_i386=3D"$CPU_CFLAGS" ;; # No special flags required for other host CPUs esac =20 +eval "cross_cc_${cpu}=3D\$host_cc" +cross_cc_vars=3D"$cross_cc_vars cross_cc_${cpu}" QEMU_CFLAGS=3D"$CPU_CFLAGS $QEMU_CFLAGS" =20 # For user-mode emulation the host arch has to be one we explicitly @@ -5893,17 +5856,6 @@ EOF fi fi =20 -########################################## -# Docker and cross-compiler support -# -# This is specifically for building test -# cases for foreign architectures, not -# cross-compiling QEMU itself. - -if has "docker"; then - docker=3D$($python $source_path/tests/docker/docker.py probe) -fi - ########################################## # check for libpmem =20 @@ -7388,10 +7340,6 @@ if test "$gcov" =3D "yes" ; then echo "GCOV=3D$gcov_tool" >> $config_host_mak fi =20 -if test "$docker" !=3D "no"; then - echo "HAVE_USER_DOCKER=3Dy" >> $config_host_mak -fi - if test "$libudev" !=3D "no"; then echo "CONFIG_LIBUDEV=3Dy" >> $config_host_mak echo "LIBUDEV_LIBS=3D$libudev_libs" >> $config_host_mak @@ -7465,10 +7413,6 @@ case "$target" in ;; esac =20 -target_compiler=3D"" -target_compiler_static=3D"" -target_compiler_cflags=3D"" - mkdir -p $target_dir echo "# Automatically generated by configure - do not modify" > $config_ta= rget_mak =20 @@ -7485,26 +7429,20 @@ case "$target_name" in i386) mttcg=3D"yes" gdb_xml_files=3D"i386-32bit.xml" - target_compiler=3D$cross_cc_i386 - target_compiler_cflags=3D$cross_cc_ccflags_i386 ;; x86_64) TARGET_BASE_ARCH=3Di386 mttcg=3D"yes" gdb_xml_files=3D"i386-64bit.xml" - target_compiler=3D$cross_cc_x86_64 ;; alpha) mttcg=3D"yes" - target_compiler=3D$cross_cc_alpha ;; arm|armeb) TARGET_ARCH=3Darm bflt=3D"yes" mttcg=3D"yes" gdb_xml_files=3D"arm-core.xml arm-vfp.xml arm-vfp3.xml arm-neon.xml" - target_compiler=3D$cross_cc_arm - eval "target_compiler_cflags=3D\$cross_cc_cflags_${target_name}" ;; aarch64|aarch64_be) TARGET_ARCH=3Daarch64 @@ -7512,41 +7450,32 @@ case "$target_name" in bflt=3D"yes" mttcg=3D"yes" gdb_xml_files=3D"aarch64-core.xml aarch64-fpu.xml arm-core.xml arm-vfp= .xml arm-vfp3.xml arm-neon.xml" - target_compiler=3D$cross_cc_aarch64 - eval "target_compiler_cflags=3D\$cross_cc_cflags_${target_name}" ;; cris) - target_compiler=3D$cross_cc_cris ;; hppa) mttcg=3D"yes" - target_compiler=3D$cross_cc_hppa ;; lm32) - target_compiler=3D$cross_cc_lm32 ;; m68k) bflt=3D"yes" gdb_xml_files=3D"cf-core.xml cf-fp.xml m68k-fp.xml" - target_compiler=3D$cross_cc_m68k ;; microblaze|microblazeel) TARGET_ARCH=3Dmicroblaze bflt=3D"yes" echo "TARGET_ABI32=3Dy" >> $config_target_mak - target_compiler=3D$cross_cc_microblaze ;; mips|mipsel) mttcg=3D"yes" TARGET_ARCH=3Dmips - target_compiler=3D$cross_cc_mips echo "TARGET_ABI_MIPSO32=3Dy" >> $config_target_mak ;; mipsn32|mipsn32el) mttcg=3D"yes" TARGET_ARCH=3Dmips64 TARGET_BASE_ARCH=3Dmips - target_compiler=3D$cross_cc_mipsn32 echo "TARGET_ABI_MIPSN32=3Dy" >> $config_target_mak echo "TARGET_ABI32=3Dy" >> $config_target_mak ;; @@ -7554,32 +7483,24 @@ case "$target_name" in mttcg=3D"yes" TARGET_ARCH=3Dmips64 TARGET_BASE_ARCH=3Dmips - target_compiler=3D$cross_cc_mips64 echo "TARGET_ABI_MIPSN64=3Dy" >> $config_target_mak ;; moxie) - target_compiler=3D$cross_cc_moxie ;; nios2) - target_compiler=3D$cross_cc_nios2 ;; or1k) - target_compiler=3D$cross_cc_or1k TARGET_ARCH=3Dopenrisc TARGET_BASE_ARCH=3Dopenrisc ;; ppc) gdb_xml_files=3D"power-core.xml power-fpu.xml power-altivec.xml power-= spe.xml" - target_compiler=3D$cross_cc_ppc - target_compiler_cflags=3D"$cross_cc_cflags_ppc" ;; ppc64) TARGET_BASE_ARCH=3Dppc TARGET_ABI_DIR=3Dppc mttcg=3Dyes gdb_xml_files=3D"power64-core.xml power-fpu.xml power-altivec.xml powe= r-spe.xml power-vsx.xml" - target_compiler=3D$cross_cc_ppc64 - target_compiler_cflags=3D"$cross_cc_cflags_ppc64" ;; ppc64le) TARGET_ARCH=3Dppc64 @@ -7587,7 +7508,6 @@ case "$target_name" in TARGET_ABI_DIR=3Dppc mttcg=3Dyes gdb_xml_files=3D"power64-core.xml power-fpu.xml power-altivec.xml powe= r-spe.xml power-vsx.xml" - target_compiler=3D$cross_cc_ppc64le ;; ppc64abi32) TARGET_ARCH=3Dppc64 @@ -7595,60 +7515,48 @@ case "$target_name" in TARGET_ABI_DIR=3Dppc echo "TARGET_ABI32=3Dy" >> $config_target_mak gdb_xml_files=3D"power64-core.xml power-fpu.xml power-altivec.xml powe= r-spe.xml power-vsx.xml" - target_compiler=3D$cross_cc_ppc64abi32 ;; riscv32) TARGET_BASE_ARCH=3Driscv TARGET_ABI_DIR=3Driscv mttcg=3Dyes gdb_xml_files=3D"riscv-32bit-cpu.xml riscv-32bit-fpu.xml riscv-32bit-c= sr.xml" - target_compiler=3D$cross_cc_riscv32 ;; riscv64) TARGET_BASE_ARCH=3Driscv TARGET_ABI_DIR=3Driscv mttcg=3Dyes gdb_xml_files=3D"riscv-64bit-cpu.xml riscv-64bit-fpu.xml riscv-64bit-c= sr.xml" - target_compiler=3D$cross_cc_riscv64 ;; sh4|sh4eb) TARGET_ARCH=3Dsh4 bflt=3D"yes" - target_compiler=3D$cross_cc_sh4 ;; sparc) - target_compiler=3D$cross_cc_sparc ;; sparc64) TARGET_BASE_ARCH=3Dsparc - target_compiler=3D$cross_cc_sparc64 ;; sparc32plus) TARGET_ARCH=3Dsparc64 TARGET_BASE_ARCH=3Dsparc TARGET_ABI_DIR=3Dsparc - target_compiler=3D$cross_cc_sparc32plus echo "TARGET_ABI32=3Dy" >> $config_target_mak ;; s390x) mttcg=3Dyes gdb_xml_files=3D"s390x-core64.xml s390-acr.xml s390-fpr.xml s390-vx.xm= l s390-cr.xml s390-virt.xml s390-gs.xml" - target_compiler=3D$cross_cc_s390x ;; tilegx) - target_compiler=3D$cross_cc_tilegx ;; tricore) - target_compiler=3D$cross_cc_tricore ;; unicore32) - target_compiler=3D$cross_cc_unicore32 ;; xtensa|xtensaeb) TARGET_ARCH=3Dxtensa bflt=3D"yes" mttcg=3D"yes" - target_compiler=3D$cross_cc_xtensa ;; *) error_exit "Unsupported target CPU" @@ -7659,27 +7567,6 @@ if [ "$TARGET_BASE_ARCH" =3D "" ]; then TARGET_BASE_ARCH=3D$TARGET_ARCH fi =20 -# Do we have a cross compiler for this target? -if has $target_compiler; then - - write_c_skeleton - - if ! do_compiler "$target_compiler" $target_compiler_cflags -o $TMPE $= TMPC -static ; then - # For host systems we might get away with building without -static - if ! do_compiler "$target_compiler" $target_compiler_cflags -o $TM= PE $TMPC ; then - target_compiler=3D"" - else - enabled_cross_compilers=3D"${enabled_cross_compilers} '${targe= t_compiler}'" - target_compiler_static=3D"n" - fi - else - enabled_cross_compilers=3D"${enabled_cross_compilers} '${target_co= mpiler}'" - target_compiler_static=3D"y" - fi -else - target_compiler=3D"" -fi - symlink "$source_path/Makefile.target" "$target_dir/Makefile" =20 upper() { @@ -7756,18 +7643,6 @@ if test "$target_bsd_user" =3D "yes" ; then echo "CONFIG_BSD_USER=3Dy" >> $config_target_mak fi =20 -if test -n "$target_compiler"; then - echo "CROSS_CC_GUEST=3D\"$target_compiler\"" >> $config_target_mak - - if test -n "$target_compiler_static"; then - echo "CROSS_CC_GUEST_STATIC=3D$target_compiler_static" >> $config_ta= rget_mak - fi - - if test -n "$target_compiler_cflags"; then - echo "CROSS_CC_GUEST_CFLAGS=3D$target_compiler_cflags" >> $config_ta= rget_mak - fi -fi - =20 # generate QEMU_CFLAGS/LDFLAGS for targets =20 @@ -7898,11 +7773,6 @@ done # for target in $targets echo "PIXMAN_CFLAGS=3D$pixman_cflags" >> $config_host_mak echo "PIXMAN_LIBS=3D$pixman_libs" >> $config_host_mak =20 -if test -n "$enabled_cross_compilers"; then - echo - echo "NOTE: cross-compilers enabled: $enabled_cross_compilers" -fi - if [ "$fdt" =3D "git" ]; then echo "config-host.h: dtc/all" >> $config_host_mak fi @@ -7931,15 +7801,14 @@ fi # so the build tree will be missing the link back to the new file, and # tests might fail. Prefer to keep the relevant files in their own # directory and symlink the directory instead. -DIRS=3D"tests tests/tcg tests/tcg/cris tests/tcg/lm32 tests/libqos tests/q= api-schema tests/tcg/xtensa tests/qemu-iotests tests/vm" +DIRS=3D"tests tests/tcg tests/tcg/lm32 tests/libqos tests/qapi-schema test= s/qemu-iotests tests/vm" DIRS=3D"$DIRS tests/fp tests/qgraph" DIRS=3D"$DIRS docs docs/interop fsdev scsi" DIRS=3D"$DIRS pc-bios/optionrom pc-bios/spapr-rtas pc-bios/s390-ccw" DIRS=3D"$DIRS roms/seabios roms/vgabios" -LINKS=3D"Makefile tests/tcg/Makefile" -LINKS=3D"$LINKS tests/tcg/cris/Makefile tests/tcg/cris/.gdbinit" -LINKS=3D"$LINKS tests/tcg/lm32/Makefile tests/tcg/xtensa/Makefile po/Makef= ile" -LINKS=3D"$LINKS tests/fp/Makefile" +LINKS=3D"Makefile" +LINKS=3D"$LINKS tests/tcg/lm32/Makefile po/Makefile" +LINKS=3D"$LINKS tests/tcg/Makefile.target tests/fp/Makefile" LINKS=3D"$LINKS pc-bios/optionrom/Makefile pc-bios/keymaps" LINKS=3D"$LINKS pc-bios/spapr-rtas/Makefile" LINKS=3D"$LINKS pc-bios/s390-ccw/Makefile" @@ -7969,6 +7838,12 @@ for f in $LINKS ; do fi done =20 +(for i in $cross_cc_vars; do + export $i +done +export target_list source_path +$source_path/tests/tcg/configure.sh) + # temporary config to build submodules for rom in seabios vgabios ; do config_mak=3Droms/$rom/config.mak diff --git a/tests/Makefile.include b/tests/Makefile.include index 8bb5c97b7a..a3ee649854 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -1058,30 +1058,28 @@ BUILD_TCG_TARGET_RULES=3D$(patsubst %,build-tcg-tes= ts-%, $(TARGET_DIRS)) CLEAN_TCG_TARGET_RULES=3D$(patsubst %,clean-tcg-tests-%, $(TARGET_DIRS)) RUN_TCG_TARGET_RULES=3D$(patsubst %,run-tcg-tests-%, $(TARGET_DIRS)) =20 -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.prereqs)) -endif =20 build-tcg-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, \ + V=3D"$(V)" TARGET=3D"$*" guest-tests, \ "BUILD", "TCG tests for $*") =20 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, \ + V=3D"$(V)" TARGET=3D"$*" run-guest-tests, \ "RUN", "TCG tests for $*") =20 clean-tcg-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, \ + SRC_PATH=3D$(SRC_PATH) TARGET=3D"$*" clean-guest-tests, \ "RUN", "TCG tests for $*") =20 .PHONY: build-tcg diff --git a/tests/tcg/Makefile.prereqs b/tests/tcg/Makefile.prereqs index 53b01962e1..7494b31b95 100644 --- a/tests/tcg/Makefile.prereqs +++ b/tests/tcg/Makefile.prereqs @@ -7,24 +7,12 @@ # selection of required docker targets before we invoke a sub-make for # 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 - -# Then we load up the target architecture makefiles which tell us -# about the compilers DOCKER_IMAGE:=3D =20 --include $(SRC_PATH)/tests/tcg/$(TARGET_BASE_ARCH)/Makefile.include --include $(SRC_PATH)/tests/tcg/$(TARGET_NAME)/Makefile.include +-include $(BUILD_DIR)/tests/tcg/config-$(PROBE_TARGET).mak =20 -ifndef CROSS_CC_GUEST ifneq ($(DOCKER_IMAGE),) build-tcg-tests-$(PROBE_TARGET): docker-image-$(DOCKER_IMAGE) +$(BUILD_DIR)/tests/tcg/config_$(PROBE_TARGET).mak: config-host.mak +config-host.mak: $(SRC_PATH)/tests/tcg/configure.sh endif -endif - -# Clean-up -# undefine TARGET_NAME -# undefine TARGET_BASE_ARCH -# undefine TARGET_ABI_DIR diff --git a/tests/tcg/Makefile.qemu b/tests/tcg/Makefile.qemu index d3f34372de..c8bec7b6cc 100644 --- a/tests/tcg/Makefile.qemu +++ b/tests/tcg/Makefile.qemu @@ -8,17 +8,22 @@ # to do it for us. # =20 -# The per ARCH makefile, if it exists, holds extra information about +include $(SRC_PATH)/rules.mak + +# The configure script fills in extra information about # useful docker images or alternative compiler flags. =20 -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) +CROSS_CC_GUEST:=3D +DOCKER_IMAGE:=3D +-include $(BUILD_DIR)/tests/tcg/config-$(TARGET).mak =20 GUEST_BUILD=3D TCG_MAKE=3D../Makefile.target + +# We also need the Docker make rules to depend on +SKIP_DOCKER_BUILD=3D1 +include $(SRC_PATH)/tests/docker/Makefile.include + # Support installed Cross Compilers =20 ifdef CROSS_CC_GUEST @@ -26,11 +31,11 @@ ifdef CROSS_CC_GUEST .PHONY: cross-build-guest-tests cross-build-guest-tests: $(call quiet-command, \ - (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)" \ + (mkdir -p tests/tcg/$(TARGET) && cd tests/tcg/$(TARGET) && \ + $(MAKE) -f $(TCG_MAKE) TARGET=3D"$(TARGET)" 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)") + EXTRA_CFLAGS=3D"$(CROSS_CC_GUEST_CFLAGS)"), \ + "BUILD","$(TARGET) guest-tests with $(CROSS_CC_GUEST)") =20 GUEST_BUILD=3Dcross-build-guest-tests =20 @@ -38,30 +43,24 @@ endif =20 # Support building with Docker =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 - DOCKER_COMPILE_CMD=3D"$(DOCKER_SCRIPT) cc --user $(shell id -u) \ - --cc $(DOCKER_CROSS_COMPILER) \ + --cc $(DOCKER_CROSS_CC_GUEST) \ -i qemu:$(DOCKER_IMAGE) \ -s $(SRC_PATH) -- " =20 .PHONY: docker-build-guest-tests docker-build-guest-tests: docker-image-$(DOCKER_IMAGE) $(call quiet-command, \ - (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) \ + (mkdir -p tests/tcg/$(TARGET) && cd tests/tcg/$(TARGET) && \ + $(MAKE) -f $(TCG_MAKE) TARGET=3D"$(TARGET)" CC=3D$(DOCKER_COMPILE_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)") + EXTRA_CFLAGS=3D"$(CROSS_CC_GUEST_CFLAGS)"), \ + "BUILD","$(TARGET) guest-tests with docker qemu:$(DOCKER_IMAGE)") =20 GUEST_BUILD=3Ddocker-build-guest-tests =20 -endif endif =20 # Final targets @@ -75,22 +74,22 @@ guest-tests: $(GUEST_BUILD) =20 run-guest-tests: guest-tests $(call quiet-command, \ - (cd tests/tcg/$(TARGET_DIR) && \ - $(MAKE) -f $(TCG_MAKE) TARGET_DIR=3D"$(TARGET_DIR)" \ + (cd tests/tcg/$(TARGET) && \ + $(MAKE) -f $(TCG_MAKE) TARGET=3D"$(TARGET)" \ 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_DIR) guest-tests SKIPPED") + "$(TARGET) guest-tests SKIPPED") =20 run-guest-tests: $(call quiet-command, /bin/true, "RUN", \ - "tests for $(TARGET_DIR) SKIPPED") + "tests for $(TARGET) SKIPPED") endif =20 # It doesn't matter if these don't exits .PHONY: clean-guest-tests clean-guest-tests: - rm -rf tests/tcg/$(TARGET_DIR) + rm -rf tests/tcg/$(TARGET) diff --git a/tests/tcg/Makefile.target b/tests/tcg/Makefile.target index 8dbcba4474..8808beaf74 100644 --- a/tests/tcg/Makefile.target +++ b/tests/tcg/Makefile.target @@ -31,7 +31,7 @@ =20 all: -include ../../config-host.mak --include ../../../$(TARGET_DIR)/config-target.mak +-include ../config-$(TARGET).mak =20 # for including , in command strings COMMA :=3D , @@ -63,12 +63,6 @@ CFLAGS=3D QEMU_CFLAGS=3D LDFLAGS=3D =20 -# The QEMU for this TARGET -ifdef CONFIG_USER_ONLY -QEMU=3D../../../$(TARGET_DIR)/qemu-$(TARGET_NAME) -else -QEMU=3D../../../$(TARGET_DIR)/qemu-system-$(TARGET_NAME) -endif QEMU_OPTS=3D =20 =20 diff --git a/tests/tcg/aarch64/Makefile.include b/tests/tcg/aarch64/Makefil= e.include deleted file mode 100644 index 5d4e4c6f99..0000000000 --- a/tests/tcg/aarch64/Makefile.include +++ /dev/null @@ -1,8 +0,0 @@ -# Makefile.include for AArch64 targets -# -# We don't have any bigendian build tools so we only use this for AArch64 - -ifeq ($(TARGET_NAME),aarch64) -DOCKER_IMAGE=3Ddebian-buster-arm64-cross -DOCKER_CROSS_COMPILER=3Daarch64-linux-gnu-gcc -endif diff --git a/tests/tcg/alpha/Makefile.include b/tests/tcg/alpha/Makefile.in= clude deleted file mode 100644 index c7dc48eadb..0000000000 --- a/tests/tcg/alpha/Makefile.include +++ /dev/null @@ -1,2 +0,0 @@ -DOCKER_IMAGE=3Ddebian-alpha-cross -DOCKER_CROSS_COMPILER=3Dalpha-linux-gnu-gcc diff --git a/tests/tcg/arm/Makefile.include b/tests/tcg/arm/Makefile.include deleted file mode 100644 index 8e7eac008f..0000000000 --- a/tests/tcg/arm/Makefile.include +++ /dev/null @@ -1,8 +0,0 @@ -# Makefile.include for all ARM targets -# -# We don't have any bigendian build tools so we only use this for armhf - -ifeq ($(TARGET_NAME),arm) -DOCKER_IMAGE=3Ddebian-armhf-cross -DOCKER_CROSS_COMPILER=3Darm-linux-gnueabihf-gcc -endif diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh new file mode 100755 index 0000000000..8e58320b13 --- /dev/null +++ b/tests/tcg/configure.sh @@ -0,0 +1,228 @@ +#! /bin/sh + +if test -z "$source_path"; then + echo Do not invoke this script directly. It is called + echo automatically by configure. + exit 1 +fi + +write_c_skeleton() { + cat > $TMPC </dev/null 2>&1 +} + +do_compiler() { + # Run the compiler, capturing its output to the log. First argument + # is compiler binary to execute. + local compiler=3D"$1" + shift + if test -n "$BASH_VERSION"; then eval ' + echo >>config.log " +funcs: ${FUNCNAME[*]} +lines: ${BASH_LINENO[*]}" + '; fi + echo $compiler "$@" >> config.log + $compiler "$@" >> config.log 2>&1 || return $? +} + + +TMPDIR1=3D"config-temp" +TMPC=3D"${TMPDIR1}/qemu-conf.c" +TMPE=3D"${TMPDIR1}/qemu-conf.exe" + +if has docker; then + docker=3D$($python $source_path/tests/docker/docker.py probe) +fi + +# cross compilers defaults, can be overridden with --cross-cc-ARCH +: ${cross_cc_aarch64=3D"aarch64-linux-gnu-gcc"} +: ${cross_cc_aarch64_be=3D"$cross_cc_aarch64"} +: ${cross_cc_cflags_aarch64_be=3D"-mbig-endian"} +: ${cross_cc_arm=3D"arm-linux-gnueabihf-gcc"} +: ${cross_cc_cflags_armeb=3D"-mbig-endian"} +: ${cross_cc_i386=3D"i386-pc-linux-gnu-gcc"} +: ${cross_cc_cflags_i386=3D"-m32"} +: ${cross_cc_x86_64=3D"x86_64-pc-linux-gnu-gcc"} +: ${cross_cc_cflags_x86_64=3D"-m64"} +: ${cross_cc_ppc=3D"powerpc-linux-gnu-gcc"} +: ${cross_cc_cflags_ppc=3D"-m32"} +: ${cross_cc_ppc64=3D"powerpc-linux-gnu-gcc"} +: ${cross_cc_cflags_ppc64=3D"-m64"} +: ${cross_cc_ppc64le=3D"powerpc64le-linux-gnu-gcc"} +: ${cross_cc_cflags_s390x=3D"-m64"} +: ${cross_cc_cflags_sparc=3D"-m32 -mv8plus -mcpu=3Dultrasparc"} +: ${cross_cc_cflags_sparc64=3D"-m64 -mcpu=3Dultrasparc"} + +for target in $target_list; do + arch=3D${target%%-*} + case $arch in + arm|armeb) + arches=3Darm + ;; + aarch64|aarch64_be) + arches=3D"aarch64 arm" + ;; + mips*) + arches=3Dmips + ;; + ppc*) + arches=3Dppc + ;; + sh4|sh4eb) + arches=3Dsh4 + ;; + x86_64) + arches=3D"x86_64 i386" + ;; + xtensa|xtensaeb) + arches=3Dxtensa + ;; + alpha|cris|hppa|i386|lm32|m68k|openrisc|riscv64|s390x|sh4|sparc64) + arches=3D$target + ;; + *) + continue + ;; + esac + + docker_image=3D + case $target in + aarch64-*) + # We don't have any bigendian build tools so we only use this for AA= rch64 + docker_image=3Ddebian-buster-arm64-cross + docker_cross_cc=3Daarch64-linux-gnu-gcc + ;; + alpha-*) + docker_image=3Ddebian-alpha-cross + docker_cross_cc=3Dalpha-linux-gnu-gcc + ;; + arm-*) + # We don't have any bigendian build tools so we only use this for AA= rch64 + docker_image=3Ddebian-armhf-cross + docker_cross_cc=3Darm-linux-gnueabihf-gcc + ;; + cris-*) + docker_image=3Dfedora-cris-cross + docker_cross_cc=3Dcris-linux-gnu-gcc + ;; + hppa-*) + docker_image=3Ddebian-hppa-cross + docker_cross_cc=3Dhppa-linux-gnu-gcc + ;; + i386-*) + docker_image=3Dfedora-i386-cross + docker_cross_cc=3Dgcc + ;; + m68k-*) + docker_image=3Ddebian-m68k-cross + docker_cross_cc=3Dm68k-linux-gnu-gcc + ;; + mips64el-*) + docker_image=3Ddebian-mips64el-cross + docker_cross_cc=3Dmips64el-linux-gnuabi64-gcc + ;; + mips64-*) + docker_image=3Ddebian-mips64-cross + docker_cross_cc=3Dmips64-linux-gnuabi64-gcc + ;; + mipsel-*) + docker_image=3Ddebian-mipsel-cross + docker_cross_cc=3Dmipsel-linux-gnu-gcc + ;; + mips-*) + docker_image=3Ddebian-mips-cross + docker_cross_cc=3Dmips-linux-gnu-gcc + ;; + ppc-*) + docker_image=3Ddebian-powerpc-cross + docker_cross_cc=3Dpowerpc-linux-gnu-gcc + ;; + ppc64-*) + docker_image=3Ddebian-ppc64-cross + docker_cross_cc=3Dpowerpc64-linux-gnu-gcc + ;; + ppc64le-*) + docker_image=3Ddebian-ppc64el-cross + docker_cross_cc=3Dpowerpc64le-linux-gnu-gcc + ;; + riscv64-*) + docker_image=3Ddebian-riscv64-cross + docker_cross_cc=3Driscv64-linux-gnu-gcc + ;; + s390x-*) + docker_image=3Ddebian-s390x-cross + docker_cross_cc=3Ds390x-linux-gnu-gcc + ;; + sh4-*) + docker_image=3Ddebian-sh4-cross + docker_cross_cc=3Dsh4-linux-gnu-gcc + ;; + sparc64-*) + docker_image=3Ddebian-sparc64-cross + docker_cross_cc=3Dsparc64-linux-gnu-gcc + ;; + xtensa*-softmmu) + docker_image=3Ddebian-xtensa-cross + + # default to the dc232b cpu + docker_cross_cc=3D/opt/2018.02/xtensa-dc232b-elf/bin/xtensa-dc232b-e= lf-gcc + ;; + esac + + config_target_mak=3Dtests/tcg/config-$target.mak + + echo "# Automatically generated by configure - do not modify" > $config_= target_mak + echo "TARGET_NAME=3D$arch" >> $config_target_mak + case $target in + *-linux-user | *-bsd-user) + echo "CONFIG_USER_ONLY=3Dy" >> $config_target_mak + echo "QEMU=3D\$(BUILD_DIR)/$target/qemu-$arch" >> $config_target_mak + ;; + *-softmmu) + echo "CONFIG_SOFTMMU=3Dy" >> $config_target_mak + echo "QEMU=3D\$(BUILD_DIR)/$target/qemu-system-$arch" >> $config_tar= get_mak + ;; + esac + + eval "target_compiler_cflags=3D\${cross_cc_cflags_$arch}" + echo "CROSS_CC_GUEST_CFLAGS=3D$target_compiler_cflags" >> $config_target= _mak + + got_cross_cc=3Dno + for i in $arch $arches; do + if eval test "x\${cross_cc_$i+yes}" !=3D xyes; then + continue + fi + + eval "target_compiler=3D\${cross_cc_$i}" + if ! has $target_compiler; then + continue + fi + write_c_skeleton + if ! do_compiler "$target_compiler" $target_compiler_cflags -o $TMPE $= TMPC -static ; then + # For host systems we might get away with building without -static + if ! do_compiler "$target_compiler" $target_compiler_cflags -o $TMPE= $TMPC ; then + continue + fi + echo "CROSS_CC_GUEST_STATIC=3Dy" >> $config_target_mak + fi + echo "CROSS_CC_GUEST=3D$target_compiler" >> $config_target_mak + enabled_cross_compilers=3D"$enabled_cross_compilers $target_compiler" + got_cross_cc=3Dyes + break + done + + if test $got_cross_cc =3D no && test "$docker" !=3D no && test -n "$dock= er_image"; then + echo "DOCKER_IMAGE=3D$docker_image" >> $config_target_mak + echo "DOCKER_CROSS_CC_GUEST=3D$docker_cross_cc" >> $config_target_mak + fi +done + +if test -n "$enabled_cross_compilers"; then + echo + echo "NOTE: guest cross-compilers enabled:$enabled_cross_compilers" +fi diff --git a/tests/tcg/cris/Makefile.include b/tests/tcg/cris/Makefile.incl= ude deleted file mode 100644 index 1c037824bf..0000000000 --- a/tests/tcg/cris/Makefile.include +++ /dev/null @@ -1,6 +0,0 @@ -# -# Makefile.include for all CRIS targets -# - -DOCKER_IMAGE=3Dfedora-cris-cross -DOCKER_CROSS_COMPILER=3Dcris-linux-gnu-gcc diff --git a/tests/tcg/hppa/Makefile.include b/tests/tcg/hppa/Makefile.incl= ude deleted file mode 100644 index da2353430e..0000000000 --- a/tests/tcg/hppa/Makefile.include +++ /dev/null @@ -1,2 +0,0 @@ -DOCKER_IMAGE=3Ddebian-hppa-cross -DOCKER_CROSS_COMPILER=3Dhppa-linux-gnu-gcc diff --git a/tests/tcg/i386/Makefile.include b/tests/tcg/i386/Makefile.incl= ude deleted file mode 100644 index be1c3008dd..0000000000 --- a/tests/tcg/i386/Makefile.include +++ /dev/null @@ -1,9 +0,0 @@ -# -# Makefile.include for all i386 -# -# There is enough brokeness in x86_64 compilers that we don't default -# to using the x86_64 system compiler for i386 binaries. -# - -DOCKER_IMAGE=3Dfedora-i386-cross -DOCKER_CROSS_COMPILER=3Dgcc diff --git a/tests/tcg/m68k/Makefile.include b/tests/tcg/m68k/Makefile.incl= ude deleted file mode 100644 index cd7c6bf50d..0000000000 --- a/tests/tcg/m68k/Makefile.include +++ /dev/null @@ -1,2 +0,0 @@ -DOCKER_IMAGE=3Ddebian-m68k-cross -DOCKER_CROSS_COMPILER=3Dm68k-linux-gnu-gcc diff --git a/tests/tcg/mips/Makefile.include b/tests/tcg/mips/Makefile.incl= ude deleted file mode 100644 index 4a14fc078d..0000000000 --- a/tests/tcg/mips/Makefile.include +++ /dev/null @@ -1,20 +0,0 @@ -# -# Makefile.include for all MIPs targets -# -# As Debian doesn't support mip64 in big endian mode the only way to -# build BE is to pass a working cross compiler to ./configure -# - -ifeq ($(TARGET_NAME),mips64el) -DOCKER_IMAGE=3Ddebian-mips64el-cross -DOCKER_CROSS_COMPILER=3Dmips64el-linux-gnuabi64-gcc -else ifeq ($(TARGET_NAME),mips64) -DOCKER_IMAGE=3Ddebian-mips64-cross -DOCKER_CROSS_COMPILER=3Dmips64-linux-gnuabi64-gcc -else ifeq ($(TARGET_NAME),mipsel) -DOCKER_IMAGE=3Ddebian-mipsel-cross -DOCKER_CROSS_COMPILER=3Dmipsel-linux-gnu-gcc -else ifeq ($(TARGET_NAME),mips) -DOCKER_IMAGE=3Ddebian-mips-cross -DOCKER_CROSS_COMPILER=3Dmips-linux-gnu-gcc -endif diff --git a/tests/tcg/ppc/Makefile.include b/tests/tcg/ppc/Makefile.include deleted file mode 100644 index ae01fb8fad..0000000000 --- a/tests/tcg/ppc/Makefile.include +++ /dev/null @@ -1,10 +0,0 @@ -ifeq ($(TARGET_NAME),ppc) -DOCKER_IMAGE=3Ddebian-powerpc-cross -DOCKER_CROSS_COMPILER=3Dpowerpc-linux-gnu-gcc -else ifeq ($(TARGET_NAME),ppc64) -DOCKER_IMAGE=3Ddebian-ppc64-cross -DOCKER_CROSS_COMPILER=3Dpowerpc64-linux-gnu-gcc -else ifeq ($(TARGET_NAME),ppc64le) -DOCKER_IMAGE=3Ddebian-ppc64el-cross -DOCKER_CROSS_COMPILER=3Dpowerpc64le-linux-gnu-gcc -endif diff --git a/tests/tcg/riscv/Makefile.include b/tests/tcg/riscv/Makefile.in= clude deleted file mode 100644 index d92ac6c89f..0000000000 --- a/tests/tcg/riscv/Makefile.include +++ /dev/null @@ -1,10 +0,0 @@ -# -# Makefile.include for all RISCV targets -# -# Debian only really cares about 64 bit going forward -# - -ifeq ($(TARGET_NAME),riscv64) -DOCKER_IMAGE=3Ddebian-riscv64-cross -DOCKER_CROSS_COMPILER=3Driscv64-linux-gnu-gcc -endif diff --git a/tests/tcg/s390x/Makefile.include b/tests/tcg/s390x/Makefile.in= clude deleted file mode 100644 index 1f58115d96..0000000000 --- a/tests/tcg/s390x/Makefile.include +++ /dev/null @@ -1,2 +0,0 @@ -DOCKER_IMAGE=3Ddebian-s390x-cross -DOCKER_CROSS_COMPILER=3Ds390x-linux-gnu-gcc diff --git a/tests/tcg/sh4/Makefile.include b/tests/tcg/sh4/Makefile.include deleted file mode 100644 index ad21594d9d..0000000000 --- a/tests/tcg/sh4/Makefile.include +++ /dev/null @@ -1,4 +0,0 @@ -ifneq ($(TARGET_NAME), sh4eb) -DOCKER_IMAGE=3Ddebian-sh4-cross -DOCKER_CROSS_COMPILER=3Dsh4-linux-gnu-gcc -endif diff --git a/tests/tcg/sparc64/Makefile.include b/tests/tcg/sparc64/Makefil= e.include deleted file mode 100644 index 95fc8dee9f..0000000000 --- a/tests/tcg/sparc64/Makefile.include +++ /dev/null @@ -1,2 +0,0 @@ -DOCKER_IMAGE=3Ddebian-sparc64-cross -DOCKER_CROSS_COMPILER=3Dsparc64-linux-gnu-gcc diff --git a/tests/tcg/xtensa/Makefile.include b/tests/tcg/xtensa/Makefile.= include deleted file mode 100644 index 423c00a5d3..0000000000 --- a/tests/tcg/xtensa/Makefile.include +++ /dev/null @@ -1,11 +0,0 @@ -# Makefile.include for xtensa targets -# -# The compilers can only be used for building system tests - -ifeq ($(CONFIG_SOFTMMU),y) -DOCKER_IMAGE=3Ddebian-xtensa-cross - -# default to the dc232b cpu -DOCKER_CROSS_COMPILER=3D/opt/2018.02/xtensa-dc232b-elf/bin/xtensa-dc232b-e= lf-gcc -DOCKER_CROSS_LINKER=3D/opt/2018.02/xtensa-dc232b-elf/bin/xtensa-dc232b-elf= -ld -endif --=20 2.21.0