From nobody Tue Feb 10 09:57:15 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.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=1617273174; cv=none; d=zohomail.com; s=zohoarc; b=GgL5h2IeItkU4XvGfPe5jTOSiMZ47y4m2Uo+z9wbY690p53R8E7HVglv/gi9PHexKnI1LFu8v3VPNdB37xuJjfi8QBLQFBv/dvfQvMB0jr1uan3BdZ9rVcYYfePHPRuM9dMdEW3Z2IdEHjcuMjuBAdY9I/UB9RfTk+v9FFt/6BY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617273174; h=Content-Type: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; bh=AYugguvZY758PcKs/PdSeUMvYaWOhfGF5y8PoXI3cIc=; b=fB7imsUustdB9R8v2NPUq2t0DxFbEbV0v8nLj47S9a2dUD1ze9Na/YIE1pFhGjqI8eZvM02YEhpkDV6H52D3sLARLzrnRUSbop+wCCvQpKiO8WmGd8iqS20bi903WkR6tuxKdIUJVYNxh5kYZD2y1umQ4E8Z9fEgZel9VoGNvtY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 1617273174741744.9913219669475; Thu, 1 Apr 2021 03:32:54 -0700 (PDT) Received: from localhost ([::1]:36618 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRudB-0002Cg-K4 for importer@patchew.org; Thu, 01 Apr 2021 06:32:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42028) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRuWc-0002l8-V3 for qemu-devel@nongnu.org; Thu, 01 Apr 2021 06:26:14 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:37525) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lRuWA-0001jj-Nf for qemu-devel@nongnu.org; Thu, 01 Apr 2021 06:25:50 -0400 Received: by mail-wr1-x429.google.com with SMTP id x16so1281844wrn.4 for ; Thu, 01 Apr 2021 03:25:36 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id l15sm9071526wru.38.2021.04.01.03.25.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Apr 2021 03:25:31 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B0CDC1FF8F; Thu, 1 Apr 2021 11:25:30 +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=AYugguvZY758PcKs/PdSeUMvYaWOhfGF5y8PoXI3cIc=; b=idQ0RiOVaSVEc/U9EK5wZ7J8gUpIFM9pfQtXVB7nSJe0s0hIT+nGMf53xbnSNJBV4y fXWIdwg1bVteuYaE7iebTYmGBwyR6nzEJIrNba5ab75mGp8jwEOzWKHMJsrJQ7oP/Ygc fYAQUmaZN54cZA5AL2SmTVND62rugm4yegQzqHKknoDCOagVcvZH6dJQM0iAfeWp1UG0 3ClOEmQBHHGp1+dev6BkG2eKJvsszCOgRknTthC2DN0e2+yIoJnB374rpwhS3bDJXYIs EiESZy4FcZ2IeTo5q8HZQtggYzvm+3ZoGR8QI+7LfzRuBhH0cqok6bceOXsFcyIYh9rK gQYw== 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=AYugguvZY758PcKs/PdSeUMvYaWOhfGF5y8PoXI3cIc=; b=ZrcTE+QLUCuDOpyxfZsVlHjxQrch7yJ/ZyJMnr+j1QBE7AyYg/U+39/sVZ0fogsL/8 QnakJl+V4dZF/hVmzEuE9AZH6jX3kAl09HM100yjGIQaMaJeNQuBwNucCi+UWY+G8BSk IG8FVx2eKXSmcLrBS7TzgeATMgi+s4wgrppW2ye5wOi37JMccySH/rv3QPjNTkFsH4L7 QU1knQt1+9QnhsG0OAbTr7l7WvE50F0mEReTYnUHEVo7yCpUfRcmaHuSzTU+OghYAk68 GkoctubBfYGtQkGS8QebNwoO16UKbdVXU+304x/LZ4HhK3/NQl9ToZHZesV7kcyyOg7Z MweA== X-Gm-Message-State: AOAM532TCr24E+Ly3SPpGl8ZJeA8jnT6PHgHNOh448jqGsT5fnDwRpr1 T6GkgzrwWDKCtsQInF0FO+P5iUECGOVBHQ== X-Google-Smtp-Source: ABdhPJxNN12VNH4+Vk2ZETfOe1df2iG+jcfeLyhZVK16wzhP4TsS9nULK8VTYTDuC0rlyXBpSXAxMg== X-Received: by 2002:a05:6000:2af:: with SMTP id l15mr8959975wry.387.1617272735522; Thu, 01 Apr 2021 03:25:35 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 03/11] tests/tcg: add concept of container_hosts Date: Thu, 1 Apr 2021 11:25:22 +0100 Message-Id: <20210401102530.12030-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210401102530.12030-1-alex.bennee@linaro.org> References: <20210401102530.12030-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x429.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action 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, berrange@redhat.com, f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) While docker is nominally multarch these days it doesn't mean our distros actually package all cross compilers for all architectures. The upcoming Debian bullseye release will improve things further. At least for now we can get things like the 32 bit ARM compiler on it's 64 bit cousin. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Richard Henderson --- configure | 2 +- tests/tcg/configure.sh | 27 +++++++++++++++++++++++++-- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 535e6a9269..7df7750a14 100755 --- a/configure +++ b/configure @@ -6299,7 +6299,7 @@ done (for i in $cross_cc_vars; do export $i done -export target_list source_path use_containers +export target_list source_path use_containers ARCH $source_path/tests/tcg/configure.sh) =20 # temporary config to build submodules diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh index af4aecf14e..87a9f24b20 100755 --- a/tests/tcg/configure.sh +++ b/tests/tcg/configure.sh @@ -108,79 +108,98 @@ for target in $target_list; do case $target in aarch64-*) # We don't have any bigendian build tools so we only use this for AA= rch64 + container_hosts=3D"x86_64 aarch64" container_image=3Ddebian-arm64-test-cross container_cross_cc=3Daarch64-linux-gnu-gcc-10 ;; alpha-*) + container_hosts=3Dx86_64 container_image=3Ddebian-alpha-cross container_cross_cc=3Dalpha-linux-gnu-gcc ;; arm-*) # We don't have any bigendian build tools so we only use this for ARM + container_hosts=3D"x86_64 aarch64" container_image=3Ddebian-armhf-cross container_cross_cc=3Darm-linux-gnueabihf-gcc ;; cris-*) + container_hosts=3Dx86_64 container_image=3Dfedora-cris-cross container_cross_cc=3Dcris-linux-gnu-gcc ;; hppa-*) + container_hosts=3Dx86_64 container_image=3Ddebian-hppa-cross container_cross_cc=3Dhppa-linux-gnu-gcc ;; i386-*) + container_hosts=3Dx86_64 container_image=3Dfedora-i386-cross container_cross_cc=3Dgcc ;; m68k-*) + container_hosts=3Dx86_64 container_image=3Ddebian-m68k-cross container_cross_cc=3Dm68k-linux-gnu-gcc ;; mips64el-*) + container_hosts=3Dx86_64 container_image=3Ddebian-mips64el-cross container_cross_cc=3Dmips64el-linux-gnuabi64-gcc ;; mips64-*) + container_hosts=3Dx86_64 container_image=3Ddebian-mips64-cross container_cross_cc=3Dmips64-linux-gnuabi64-gcc ;; mipsel-*) + container_hosts=3Dx86_64 container_image=3Ddebian-mipsel-cross container_cross_cc=3Dmipsel-linux-gnu-gcc ;; mips-*) + container_hosts=3Dx86_64 container_image=3Ddebian-mips-cross container_cross_cc=3Dmips-linux-gnu-gcc ;; ppc-*|ppc64abi32-*) + container_hosts=3Dx86_64 container_image=3Ddebian-powerpc-cross container_cross_cc=3Dpowerpc-linux-gnu-gcc ;; ppc64-*) + container_hosts=3Dx86_64 container_image=3Ddebian-ppc64-cross container_cross_cc=3Dpowerpc64-linux-gnu-gcc ;; ppc64le-*) + container_hosts=3Dx86_64 container_image=3Ddebian-ppc64el-cross container_cross_cc=3Dpowerpc64le-linux-gnu-gcc ;; riscv64-*) + container_hosts=3Dx86_64 container_image=3Ddebian-riscv64-cross container_cross_cc=3Driscv64-linux-gnu-gcc ;; s390x-*) + container_hosts=3Dx86_64 container_image=3Ddebian-s390x-cross container_cross_cc=3Ds390x-linux-gnu-gcc ;; sh4-*) + container_hosts=3Dx86_64 container_image=3Ddebian-sh4-cross container_cross_cc=3Dsh4-linux-gnu-gcc ;; sparc64-*) + container_hosts=3Dx86_64 container_image=3Ddebian-sparc64-cross container_cross_cc=3Dsparc64-linux-gnu-gcc ;; xtensa*-softmmu) + container_hosts=3Dx86_64 container_image=3Ddebian-xtensa-cross =20 # default to the dc232b cpu @@ -265,7 +284,11 @@ for target in $target_list; do done =20 if test $got_cross_cc =3D no && test "$container" !=3D no && test -n "$c= ontainer_image"; then - echo "DOCKER_IMAGE=3D$container_image" >> $config_target_mak - echo "DOCKER_CROSS_CC_GUEST=3D$container_cross_cc" >> $config_target_m= ak + for host in $container_hosts; do + if test "$host" =3D "$ARCH"; then + echo "DOCKER_IMAGE=3D$container_image" >> $config_target_mak + echo "DOCKER_CROSS_CC_GUEST=3D$container_cross_cc" >> $confi= g_target_mak + fi + done fi done --=20 2.20.1