From nobody Wed Nov 27 00:38:20 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1703179431; cv=none; d=zohomail.com; s=zohoarc; b=CdVnd+KcSZJVnuri+4HsPRp+of6T2pjt2opPZlHdMVCtxmKYs1FSHZOyLIuBqcYPXK07Fsm4fz57SQi8JycDmeR2xvUs/ASOs5DzAeUzJ+lagQTkY3loyVCGP49deVUNhysmQHaEHzJOmhP8BKlXP8F6dFLvXFjayu+GaQfb1aE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1703179431; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=UebyFwaouzTqOLbyUOTcfC30JgB1MQMFJW2XtX7hlHw=; b=BCnUXDgGcTnXhVhTem5EqvlE9wt1XAQLwsI4i7WQsckgOOJhThJyBtu0LOpfkE55d1f/PEDs0sbY2G2V3kxnKHQUStrun4Pudg5pJvIdyKHVB5Eo9rePWSDztx5FT42tDbbWxmOYzby+cFFoQs+QmwydP0VsgoNT/VvFsYvRzpY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1703179431783556.9193373195392; Thu, 21 Dec 2023 09:23:51 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rGMia-0007YT-He; Thu, 21 Dec 2023 12:20:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rGMiY-0007Xh-Ux for qemu-devel@nongnu.org; Thu, 21 Dec 2023 12:20:18 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rGMiW-0004U5-TA for qemu-devel@nongnu.org; Thu, 21 Dec 2023 12:20:18 -0500 Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-434-8hAs3PC_Meq5JgnN1hcXMA-1; Thu, 21 Dec 2023 12:20:14 -0500 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-3368c5eebb4so372797f8f.1 for ; Thu, 21 Dec 2023 09:20:14 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:4783:a68:c1ee:15c5]) by smtp.gmail.com with ESMTPSA id cx1-20020a056000092100b00336598903e9sm2452334wrb.58.2023.12.21.09.20.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 09:20:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1703179216; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UebyFwaouzTqOLbyUOTcfC30JgB1MQMFJW2XtX7hlHw=; b=NA7m0oy1Z+iza1v98aniDz4JRqr5E7gYmjdR/T370B70StlyLzRHxC7I5LGgCn3JcjFtnF zhFYduP+Fx3c/AFwuNhbZP0CsXaa+2ouJGw4sPRTJFfubky6W12/hTEK7Fgieu1yFJYmpp rvnarlQkun7x4PqmDHrBclt59N6MYFM= X-MC-Unique: 8hAs3PC_Meq5JgnN1hcXMA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703179213; x=1703784013; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UebyFwaouzTqOLbyUOTcfC30JgB1MQMFJW2XtX7hlHw=; b=A3b1+uNo/46FC5mbCcqpNFWKFChCO9zzbqQlcR74NKKiz69xHTwJe4gFMRFjAU2ptP H39P2tM/DZwHa8WJuYe6SAMouGOmHVsZMVc/t+VRWg6vC6UM+PIgkegMl6z2ZMhvAxB8 qo7XlGeGZF4KdWLuqFu0mdK7tIEHOTdy9d19Xxc1SKijJ5zMit6Ov7fKzs2HBTiDxg4f SA0IcVS2IGNM6b1OZKHJCtY/mOm4WqnQuqtojZWiexPGDbR/vPuZCBeGopWXCBAV/BI8 JXSLE6ICZZCBCOZjBfB4rrSNH/CKua5FrrC+ji0G1mrRtAvZGmtrNtwK8OSJfPJT3wId h+Cw== X-Gm-Message-State: AOJu0YxqdKo78jHB83ZdoY1ucCteHzRtsJ9tzcRMWoZ/z0U8JcY7bYDF WsoHSaOKgQXzUjaPkfbTge/dGUJI33dHuvFS3dhh7v8zcvxnRgeAu8hTe3Enh7v8pJ1lImwTj6I ZYNn7HcJfiaUcjPbKdwPlJG9jwBwyctwWhaezkygXXPeKIty/ZDusQbIw5BjVAB4exy3aETSo7o qmdjn1B9c= X-Received: by 2002:a5d:6052:0:b0:336:7a45:c134 with SMTP id j18-20020a5d6052000000b003367a45c134mr49479wrt.86.1703179212927; Thu, 21 Dec 2023 09:20:12 -0800 (PST) X-Google-Smtp-Source: AGHT+IFxbuR5UguQSGOqNuDsHctwu45FiOcUY838FBTt00QK2tgWZUYxN6H5792VLrPuJgaBU21hCA== X-Received: by 2002:a5d:6052:0:b0:336:7a45:c134 with SMTP id j18-20020a5d6052000000b003367a45c134mr49471wrt.86.1703179212451; Thu, 21 Dec 2023 09:20:12 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 06/21] configure: unify again the case arms in probe_target_compiler Date: Thu, 21 Dec 2023 18:19:43 +0100 Message-ID: <20231221171958.59350-7-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231221171958.59350-1-pbonzini@redhat.com> References: <20231221171958.59350-1-pbonzini@redhat.com> MIME-Version: 1.0 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=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.061, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1703179432328100005 Content-Type: text/plain; charset="utf-8" Remove assignments that match the default, and group the targets for debian-legacy-test-cross and debian-all-test-cross into a single arm. Signed-off-by: Paolo Bonzini --- configure | 86 +++++++++++++++++-------------------------------------- 1 file changed, 27 insertions(+), 59 deletions(-) diff --git a/configure b/configure index c634948051b..38ca267096f 100755 --- a/configure +++ b/configure @@ -1272,16 +1272,33 @@ probe_target_compiler() { test "$container" !=3D no || continue test "$host" =3D "$cpu" || continue case $target_arch in + # debian-all-test-cross architectures + + hppa|m68k|mips|riscv64|sparc64) + container_image=3Ddebian-all-test-cross + ;; + mips64) + container_image=3Ddebian-all-test-cross + container_cross_prefix=3Dmips64-linux-gnuabi64- + ;; + ppc|ppc64|ppc64le) + container_image=3Ddebian-all-test-cross + container_cross_prefix=3Dpowerpc${target_arch#ppc}-linux-gnu- + ;; + + # debian-legacy-test-cross architectures (need Debian 11) + # - libc6.1-dev-alpha-cross: https://bugs.debian.org/cgi-bin/bugrepo= rt.cgi?bug=3D1054412 + # - sh4-linux-user: binaries don't run with bookworm compiler + + alpha|sh4) + container_image=3Ddebian-legacy-test-cross + ;; + + # architectures with individual containers + aarch64) # We don't have any bigendian build tools so we only use this for = AArch64 container_image=3Ddebian-arm64-cross - container_cross_prefix=3Daarch64-linux-gnu- - container_cross_cc=3D${container_cross_prefix}gcc - ;; - alpha) - container_image=3Ddebian-legacy-test-cross - container_cross_prefix=3Dalpha-linux-gnu- - container_cross_cc=3D${container_cross_prefix}gcc ;; arm) # We don't have any bigendian build tools so we only use this for = ARM @@ -1290,18 +1307,11 @@ probe_target_compiler() { ;; cris) container_image=3Dfedora-cris-cross - container_cross_prefix=3Dcris-linux-gnu- ;; hexagon) - container_image=3Ddebian-hexagon-cross container_cross_prefix=3Dhexagon-unknown-linux-musl- container_cross_cc=3D${container_cross_prefix}clang ;; - hppa) - container_image=3Ddebian-all-test-cross - container_cross_prefix=3Dhppa-linux-gnu- - container_cross_cc=3D${container_cross_prefix}gcc - ;; i386) container_image=3Ddebian-i686-cross container_cross_prefix=3Di686-linux-gnu- @@ -1310,59 +1320,19 @@ probe_target_compiler() { container_image=3Ddebian-loongarch-cross container_cross_prefix=3Dloongarch64-unknown-linux-gnu- ;; - m68k) - container_image=3Ddebian-all-test-cross - container_cross_prefix=3Dm68k-linux-gnu- - container_cross_cc=3D${container_cross_prefix}gcc - ;; microblaze) - container_image=3Ddebian-microblaze-cross container_cross_prefix=3Dmicroblaze-linux-musl- ;; mips64el) container_image=3Ddebian-mips64el-cross container_cross_prefix=3Dmips64el-linux-gnuabi64- ;; - mips64) - container_image=3Ddebian-all-test-cross - container_cross_prefix=3Dmips64-linux-gnuabi64- - ;; - mips) - container_image=3Ddebian-all-test-cross - container_cross_prefix=3Dmips-linux-gnu- - ;; - nios2) - container_image=3Ddebian-nios2-cross - container_cross_prefix=3Dnios2-linux-gnu- - ;; - ppc) - container_image=3Ddebian-all-test-cross - container_cross_prefix=3Dpowerpc-linux-gnu- - container_cross_cc=3D${container_cross_prefix}gcc - ;; - ppc64|ppc64le) - container_image=3Ddebian-all-test-cross - container_cross_prefix=3Dpowerpc${target_arch#ppc}-linux-gnu- - ;; - riscv64) - container_image=3Ddebian-all-test-cross - container_cross_prefix=3Driscv64-linux-gnu- - ;; - sh4) - container_image=3Ddebian-legacy-test-cross - container_cross_prefix=3Dsh4-linux-gnu- - ;; - sparc64) - container_image=3Ddebian-all-test-cross - container_cross_prefix=3Dsparc64-linux-gnu- - ;; tricore) container_image=3Ddebian-tricore-cross container_cross_prefix=3Dtricore- ;; x86_64) container_image=3Ddebian-amd64-cross - container_cross_prefix=3Dx86_64-linux-gnu- ;; xtensa*) container_image=3Ddebian-xtensa-cross @@ -1370,12 +1340,10 @@ probe_target_compiler() { # default to the dc232b cpu container_cross_prefix=3D/opt/2020.07/xtensa-dc232b-elf/bin/xtensa= -dc232b-elf- ;; - *) - # Debian and GNU architecture names usually match - container_image=3Ddebian-$target_arch-cross - container_cross_prefix=3D$target_arch-linux-gnu- - ;; esac + # Debian and GNU architecture names usually match + : ${container_image:=3Ddebian-$target_arch-cross} + : ${container_cross_prefix:=3D$target_arch-linux-gnu-} : ${container_cross_cc:=3D${container_cross_prefix}gcc} : ${container_cross_ar:=3D${container_cross_prefix}ar} : ${container_cross_as:=3D${container_cross_prefix}as} --=20 2.43.0