From patchwork Mon Mar 29 11:03:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 410825 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp3520701jai; Mon, 29 Mar 2021 04:03:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwl/CcRLgnw07DThTFxG2uqDKwCT7Q3yCfYj2oLUCJSvaT3YDkCAiQTU7HEA8GBT1V3PZRX X-Received: by 2002:a67:2f08:: with SMTP id v8mr9926751vsv.46.1617015818316; Mon, 29 Mar 2021 04:03:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617015818; cv=none; d=google.com; s=arc-20160816; b=f3Tc2XXhHwFMsi5NBvG6CF684PVlJmIJlmdTsY4AGNHp00iyK8SCqpG8t/5vHGlVzf m9zeurgp32KdfpSRIzZ/k/4t/wi4pLmfwOCaGVbtFtyngCeScax0yAFvLsf70+fAIMfF wxZSXr2PaT8/aig+WqdNwUMUeDJuQ6Yh5yN5vMbMIs/2W1tvSvCtycdjjtFQtfYcVszN GT33LxCMyJcKvR/ULzQ0R31cldMy6f0ldL89hwANuzZqlz9eOnU+U4gXjE5xKrEA01y2 HqRtlFGEtgZ7pqATy4dduzSo4EKZI9zZTVf1EWdKsopiq92GNaDRDupc8icBAmz96E69 yMJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=AYugguvZY758PcKs/PdSeUMvYaWOhfGF5y8PoXI3cIc=; b=h8+T6k11hyPklnWbI7bVqbf0NPI0PFooedm6X0+3OTslM8R26CcOLdR4oQqmi0SKPR zvHNG0QA/1DEwze/benoxVpTPXX/F5UvpBtWX1IlL6+gm7A0V3XGwRXwatBAkPSDp7Bx 258VhqRNPY6Qzm0jbVYVU5zjA7EANBoKllvgAuvk/5k1FynyVb2le+NqFckqUmk21tfg +f8i1sfKtsfB2/p0PP/9KmY6aXmK1wgNHuV/qu+ZHo6DV1JEXFxaz6y/sLGGXSqixN9b 7FcS0qbetw1bTwNt23EB0wOoJXKJUiYcRjumSo7F6PSN7KN3ZNisTrcuHgtAeM2IHa12 6R+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LBb1HsCu; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id r11si2722023vsn.390.2021.03.29.04.03.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 29 Mar 2021 04:03:38 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LBb1HsCu; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:49974 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lQpgH-00007D-MC for patch@linaro.org; Mon, 29 Mar 2021 07:03:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45226) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lQpfp-00005T-NZ for qemu-devel@nongnu.org; Mon, 29 Mar 2021 07:03:09 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:36622) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lQpfn-0004fQ-V8 for qemu-devel@nongnu.org; Mon, 29 Mar 2021 07:03:09 -0400 Received: by mail-wr1-x42c.google.com with SMTP id k8so12408018wrc.3 for ; Mon, 29 Mar 2021 04:03:06 -0700 (PDT) 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=LBb1HsCuaO5dYU6L2NSursxxGaKkAfOS1DuvjQxqlUd17JMFdZIzh10PCIIP7/cRpZ F7WLxSjDyDU40rfE7QnyzO5VM1jqKcsSkQKQRjSL/pHUItMi9GOFKS8Cd1I9HgTyZ+66 hAo7LkeslsSa7lz3RrmhT+VcfJL3003CkVzqi4VZd5MHIlVgHTpqLXBENlrhxP7qunkh pV2wrrR88G7H/729COfD7rkrfnnJQVkUImPw52d55LuJ6gYUsV/4XT7Ddm6titHoAc3c isRvSotxB09yzz5KRxrlvex1OtJGgOkm0ptKk0UJ6x6RKRlsG6Akd+uWZDSsznMUPSQe kOgA== 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=BBBh7dLdoesiyfoV9Xi2KaqnHtjElY4S8KSCHhWYw5e0k6ZWOw8cXh+esljvuKN5VL AJhJqetPg/4z3b0VRtQpyWSKSDtKjeZ6HkqpX+Q50TlRbMWTiYVwRLgxkLdxvoQA3u+H n11av+BKaVZuQ+LTfSKEDRF7qhHwepW1E3YnZv2q11XMyx0Qzf6M3hERkcKvkZi8SsUE 4/OQBZsuEO+lsur2Y1BC4tDoUrRbZ87PXNm9WvpftytQUxxEFERR3Ge7rXP/7Ap2pBz9 1DBwBbqHRi8gxq66zjV9cdfTqgzb76iN7brOyErJC8dXUPFUuQuYNwddeTPPrw8nu2tK nWCg== X-Gm-Message-State: AOAM533G/XxYUOambcNL6Bui8ri+Qh/D7IWlLxF2BU2LQDmqQFZFZipT cuwmnIljYz8d960o/QJFXicb434fovnhnP4A X-Received: by 2002:a5d:58fc:: with SMTP id f28mr18632423wrd.180.1617015786084; Mon, 29 Mar 2021 04:03:06 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id b15sm28672679wrx.73.2021.03.29.04.03.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Mar 2021 04:03:04 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B42A21FF8F; Mon, 29 Mar 2021 12:03:03 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 3/6] tests/tcg: add concept of container_hosts Date: Mon, 29 Mar 2021 12:03:00 +0100 Message-Id: <20210329110303.15235-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210329110303.15235-1-alex.bennee@linaro.org> References: <20210329110303.15235-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42c.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=ham 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: =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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ée --- configure | 2 +- tests/tcg/configure.sh | 27 +++++++++++++++++++++++++-- 2 files changed, 26 insertions(+), 3 deletions(-) -- 2.20.1 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) # 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 AArch64 + container_hosts="x86_64 aarch64" container_image=debian-arm64-test-cross container_cross_cc=aarch64-linux-gnu-gcc-10 ;; alpha-*) + container_hosts=x86_64 container_image=debian-alpha-cross container_cross_cc=alpha-linux-gnu-gcc ;; arm-*) # We don't have any bigendian build tools so we only use this for ARM + container_hosts="x86_64 aarch64" container_image=debian-armhf-cross container_cross_cc=arm-linux-gnueabihf-gcc ;; cris-*) + container_hosts=x86_64 container_image=fedora-cris-cross container_cross_cc=cris-linux-gnu-gcc ;; hppa-*) + container_hosts=x86_64 container_image=debian-hppa-cross container_cross_cc=hppa-linux-gnu-gcc ;; i386-*) + container_hosts=x86_64 container_image=fedora-i386-cross container_cross_cc=gcc ;; m68k-*) + container_hosts=x86_64 container_image=debian-m68k-cross container_cross_cc=m68k-linux-gnu-gcc ;; mips64el-*) + container_hosts=x86_64 container_image=debian-mips64el-cross container_cross_cc=mips64el-linux-gnuabi64-gcc ;; mips64-*) + container_hosts=x86_64 container_image=debian-mips64-cross container_cross_cc=mips64-linux-gnuabi64-gcc ;; mipsel-*) + container_hosts=x86_64 container_image=debian-mipsel-cross container_cross_cc=mipsel-linux-gnu-gcc ;; mips-*) + container_hosts=x86_64 container_image=debian-mips-cross container_cross_cc=mips-linux-gnu-gcc ;; ppc-*|ppc64abi32-*) + container_hosts=x86_64 container_image=debian-powerpc-cross container_cross_cc=powerpc-linux-gnu-gcc ;; ppc64-*) + container_hosts=x86_64 container_image=debian-ppc64-cross container_cross_cc=powerpc64-linux-gnu-gcc ;; ppc64le-*) + container_hosts=x86_64 container_image=debian-ppc64el-cross container_cross_cc=powerpc64le-linux-gnu-gcc ;; riscv64-*) + container_hosts=x86_64 container_image=debian-riscv64-cross container_cross_cc=riscv64-linux-gnu-gcc ;; s390x-*) + container_hosts=x86_64 container_image=debian-s390x-cross container_cross_cc=s390x-linux-gnu-gcc ;; sh4-*) + container_hosts=x86_64 container_image=debian-sh4-cross container_cross_cc=sh4-linux-gnu-gcc ;; sparc64-*) + container_hosts=x86_64 container_image=debian-sparc64-cross container_cross_cc=sparc64-linux-gnu-gcc ;; xtensa*-softmmu) + container_hosts=x86_64 container_image=debian-xtensa-cross # default to the dc232b cpu @@ -265,7 +284,11 @@ for target in $target_list; do done if test $got_cross_cc = no && test "$container" != no && test -n "$container_image"; then - echo "DOCKER_IMAGE=$container_image" >> $config_target_mak - echo "DOCKER_CROSS_CC_GUEST=$container_cross_cc" >> $config_target_mak + for host in $container_hosts; do + if test "$host" = "$ARCH"; then + echo "DOCKER_IMAGE=$container_image" >> $config_target_mak + echo "DOCKER_CROSS_CC_GUEST=$container_cross_cc" >> $config_target_mak + fi + done fi done