From nobody Tue Feb 10 06:44:10 2026 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1654107060; cv=none; d=zohomail.com; s=zohoarc; b=XRYRKBX4gtDwH8afr950PVLHHx/jBPu7DiN5Gf5QSfDH/Lyr+/NQhXpbrOQsrRyy8dZdmq0QtPkcMaUrTlmB4qMGd3PN9bDN/wpwMRIzdIBx86GsOhgT6MPPtI02Z9o7Ot0ciZ5TBCxsPNX/FqaoHtX+FhwoprNAigHlJU2bDqo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1654107060; 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=iBL0XOSODfEHetIjDjNAdTd949wca33dTCbjN+2/aeY=; b=FKkbVvbAu+JzbBrLDhGSFNo9ZIC7ppubXdQTwoXcqWlixXasAa3G1ggVnRK+7RYRabGrBfM59isUEDrUUDurbzQNMw3Eli0V7IOMew3MWz+GUj2E/XzRqVHBNbr5RRX673H7hyjkj6VwzNIEKORnggkamHpovZ0OPtiYI8fu8EY= 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 1654107060515693.5307333410309; Wed, 1 Jun 2022 11:11:00 -0700 (PDT) Received: from localhost ([::1]:55150 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nwSo7-0001KR-Bu for importer@patchew.org; Wed, 01 Jun 2022 14:10:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51134) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwSjO-0001Ov-6r for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:06:06 -0400 Received: from mail-ej1-x631.google.com ([2a00:1450:4864:20::631]:36549) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nwSjM-00050z-2B for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:06:05 -0400 Received: by mail-ej1-x631.google.com with SMTP id gi33so5383989ejc.3 for ; Wed, 01 Jun 2022 11:06:02 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id r23-20020a170906365700b006fef51aa566sm960786ejb.2.2022.06.01.11.05.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 11:06:00 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9E5471FFCC; Wed, 1 Jun 2022 19:05:39 +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=iBL0XOSODfEHetIjDjNAdTd949wca33dTCbjN+2/aeY=; b=AQ84CWsb40CljUzLnmy+UvruBgW71tBMKDPl7py9+2sturyAz5QFkuyjkBUOBwj32k 7WVPR1lFS3uO+obSe0A4yA6RQpBUpBlYI3OPIe1HSz2x9N1VSr7O7d084dAhm0430cCo HgrcawUvIPAFAFTpQg+lxEnJnUpVkT26AiQlJv1YkE1n+StuI8ux7iA2ov0B66KtxwLB yWWauqsVika+9+RjyFMH3+POT08u6WHbOKiJRoPMni+gHfcUpfEWUdf9oHoKeXhEDNJR YoakoTvFtlYdnvyyz7FnILz8alyPSbhlC1VrJSUSzwHiBmE94KseUIt+7WOrNrWqm5Gg l98w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=iBL0XOSODfEHetIjDjNAdTd949wca33dTCbjN+2/aeY=; b=sHektZZ3PZoUU3NDl8KFrMXlc4Gz4i68Ksd4GA+OJV2nVKwIrITQbYa/GYeKVbr8Sc hiWyxEddCk4DM1FCD7iD8wIi4jE1uxIVz13Oh+qfo3I6iFXagVofQDroHLVmhXJRQnES VOiYvG/u2nfKxKgWC0YUFxx2Oab3UuhpO5orRSGc5qVstBAGRbqTxBxKx8K8G1Qx29m1 JUnoSi0S7eS2KMnu8lHqcZJV21C7u7DnkFQnHzee5Qwef5qS78blD2lf5nWqXrq0w/ic 24gEMqjRT1LKSVSTEvDhn6PmEDZTDv8QJxy5GIQMFcHmqhjjKVB5ELMqG05dVC9p6jfa HdCw== X-Gm-Message-State: AOAM532M+8QkHtwSRmgt/J4/HSYopEG23C+OSBI9kuL6bB1y/M5Q8pzx Hi+geJXQ7R2zshn/XOEl2L1PpQ== X-Google-Smtp-Source: ABdhPJzgA+zcaoykSwr9uFjhVRDWh+dxgRUPmeh7aBoJ8m9p78LYn+GBO5MtGsG0OnIeEyM2ENnFSg== X-Received: by 2002:a17:907:8a1f:b0:6fe:f4fc:750f with SMTP id sc31-20020a1709078a1f00b006fef4fc750fmr657508ejc.399.1654106761654; Wed, 01 Jun 2022 11:06:01 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PULL 21/33] configure: introduce --cross-prefix-*= Date: Wed, 1 Jun 2022 19:05:25 +0100 Message-Id: <20220601180537.2329566-22-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220601180537.2329566-1-alex.bennee@linaro.org> References: <20220601180537.2329566-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::631; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x631.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, 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" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1654107061761100001 From: Paolo Bonzini Also in preparation for handling more binaries from the cross binutils, support an option --cross-prefix-ARCH. All cross_cc_* defaults are replaced with cross_prefix_*; the cross_cc_* fallbacks are extended to the cross-compilation prefix, but the compiler fallbacks remain as well. This way, for example, --cross-cc-arm=3Darm-linux-gnueabihf-clang also applies to armeb binaries. Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini Message-Id: <20220517092616.1272238-11-pbonzini@redhat.com> Signed-off-by: Alex Benn=C3=A9e Message-Id: <20220527153603.887929-22-alex.bennee@linaro.org> diff --git a/configure b/configure index 217c8b3cac..f55ae82a5d 100755 --- a/configure +++ b/configure @@ -363,6 +363,11 @@ for opt do --cross-cc-*) cc_arch=3D${opt#--cross-cc-}; cc_arch=3D${cc_arch%%=3D*} eval "cross_cc_${cc_arch}=3D\$optarg" ;; + --cross-prefix-*[!a-zA-Z0-9_-]*=3D*) error_exit "Passed bad --cross-pref= ix-FOO option" + ;; + --cross-prefix-*) cc_arch=3D${opt#--cross-prefix-}; cc_arch=3D${cc_arch%= %=3D*} + eval "cross_prefix_${cc_arch}=3D\$optarg" + ;; esac done # OS specific @@ -728,6 +733,8 @@ for opt do ;; --cross-cc-*) ;; + --cross-prefix-*) + ;; --enable-debug-info) meson_option_add -Ddebug=3Dtrue ;; --disable-debug-info) meson_option_add -Ddebug=3Dfalse @@ -1016,6 +1023,7 @@ Advanced options (experts only): --extra-ldflags=3DLDFLAGS append extra linker flags LDFLAGS --cross-cc-ARCH=3DCC use compiler when building ARCH guest test ca= ses --cross-cc-cflags-ARCH=3D use compiler flags when building ARCH guest t= ests + --cross-prefix-ARCH=3DPREFIX cross compiler prefix when building ARCH gu= est test cases --make=3DMAKE use specified make [$make] --python=3DPYTHON use specified python [$python] --meson=3DMESON use specified meson [$meson] @@ -1818,44 +1826,54 @@ if test $use_containers =3D "yes"; then fi =20 # cross compilers defaults, can be overridden with --cross-cc-ARCH -: ${cross_cc_aarch64=3D"aarch64-linux-gnu-gcc"} +: ${cross_prefix_aarch64=3D"aarch64-linux-gnu-"} +: ${cross_prefix_aarch64_be=3D"$cross_prefix_aarch64"} +: ${cross_prefix_alpha=3D"alpha-linux-gnu-"} +: ${cross_prefix_arm=3D"arm-linux-gnueabihf-"} +: ${cross_prefix_armeb=3D"$cross_prefix_arm"} +: ${cross_prefix_hexagon=3D"hexagon-unknown-linux-musl-"} +: ${cross_prefix_hppa=3D"hppa-linux-gnu-"} +: ${cross_prefix_i386=3D"i686-linux-gnu-"} +: ${cross_prefix_m68k=3D"m68k-linux-gnu-"} +: ${cross_prefix_microblaze=3D"microblaze-linux-musl-"} +: ${cross_prefix_mips64el=3D"mips64el-linux-gnuabi64-"} +: ${cross_prefix_mips64=3D"mips64-linux-gnuabi64-"} +: ${cross_prefix_mipsel=3D"mipsel-linux-gnu-"} +: ${cross_prefix_mips=3D"mips-linux-gnu-"} +: ${cross_prefix_nios2=3D"nios2-linux-gnu-"} +: ${cross_prefix_ppc=3D"powerpc-linux-gnu-"} +: ${cross_prefix_ppc64=3D"powerpc64-linux-gnu-"} +: ${cross_prefix_ppc64le=3D"$cross_prefix_ppc64"} +: ${cross_prefix_riscv64=3D"riscv64-linux-gnu-"} +: ${cross_prefix_s390x=3D"s390x-linux-gnu-"} +: ${cross_prefix_sh4=3D"sh4-linux-gnu-"} +: ${cross_prefix_sparc64=3D"sparc64-linux-gnu-"} +: ${cross_prefix_sparc=3D"$cross_prefix_sparc64"} +: ${cross_prefix_x86_64=3D"x86_64-linux-gnu-"} + : ${cross_cc_aarch64_be=3D"$cross_cc_aarch64"} : ${cross_cc_cflags_aarch64_be=3D"-mbig-endian"} -: ${cross_cc_alpha=3D"alpha-linux-gnu-gcc"} -: ${cross_cc_arm=3D"arm-linux-gnueabihf-gcc"} : ${cross_cc_armeb=3D"$cross_cc_arm"} : ${cross_cc_cflags_armeb=3D"-mbig-endian"} : ${cross_cc_hexagon=3D"hexagon-unknown-linux-musl-clang"} : ${cross_cc_cflags_hexagon=3D"-mv67 -O2 -static"} -: ${cross_cc_hppa=3D"hppa-linux-gnu-gcc"} -: ${cross_cc_i386=3D"i686-linux-gnu-gcc"} : ${cross_cc_cflags_i386=3D"-m32"} -: ${cross_cc_m68k=3D"m68k-linux-gnu-gcc"} -: ${cross_cc_microblaze=3D"microblaze-linux-musl-gcc"} -: ${cross_cc_mips64el=3D"mips64el-linux-gnuabi64-gcc"} -: ${cross_cc_mips64=3D"mips64-linux-gnuabi64-gcc"} -: ${cross_cc_mipsel=3D"mipsel-linux-gnu-gcc"} -: ${cross_cc_mips=3D"mips-linux-gnu-gcc"} -: ${cross_cc_nios2=3D"nios2-linux-gnu-gcc"} -: ${cross_cc_ppc=3D"powerpc-linux-gnu-gcc"} : ${cross_cc_cflags_ppc=3D"-m32"} -: ${cross_cc_ppc64=3D"powerpc64-linux-gnu-gcc"} : ${cross_cc_cflags_ppc64=3D"-m64 -mbig-endian"} : ${cross_cc_ppc64le=3D"$cross_cc_ppc64"} : ${cross_cc_cflags_ppc64le=3D"-m64 -mlittle-endian"} -: ${cross_cc_riscv64=3D"riscv64-linux-gnu-gcc"} -: ${cross_cc_s390x=3D"s390x-linux-gnu-gcc"} -: ${cross_cc_sh4=3D"sh4-linux-gnu-gcc"} -: ${cross_cc_sparc64=3D"sparc64-linux-gnu-gcc"} : ${cross_cc_cflags_sparc64=3D"-m64 -mcpu=3Dultrasparc"} : ${cross_cc_sparc=3D"$cross_cc_sparc64"} : ${cross_cc_cflags_sparc=3D"-m32 -mcpu=3Dsupersparc"} -: ${cross_cc_x86_64=3D"x86_64-linux-gnu-gcc"} : ${cross_cc_cflags_x86_64=3D"-m64"} =20 -# tricore is special as it doesn't have a compiler -: ${cross_as_tricore=3D"tricore-as"} -: ${cross_ld_tricore=3D"tricore-ld"} +compute_target_variable() { + if eval test -n "\"\${cross_prefix_$1}\""; then + if eval has "\"\${cross_prefix_$1}\$3\""; then + eval "$2=3D\"\${cross_prefix_$1}\$3\"" + fi + fi +} =20 probe_target_compiler() { # reset all output variables @@ -1901,93 +1919,99 @@ probe_target_compiler() { aarch64) # We don't have any bigendian build tools so we only use this for = AArch64 container_image=3Ddebian-arm64-cross - container_cross_cc=3Daarch64-linux-gnu-gcc-10 + container_cross_prefix=3Daarch64-linux-gnu- + container_cross_cc=3D${container_cross_prefix}gcc-10 ;; alpha) container_image=3Ddebian-alpha-cross - container_cross_cc=3Dalpha-linux-gnu-gcc + container_cross_prefix=3Dalpha-linux-gnu- ;; arm) # We don't have any bigendian build tools so we only use this for = ARM container_image=3Ddebian-armhf-cross - container_cross_cc=3Darm-linux-gnueabihf-gcc + container_cross_prefix=3Darm-linux-gnueabihf- ;; cris) container_image=3Dfedora-cris-cross - container_cross_cc=3Dcris-linux-gnu-gcc + container_cross_prefix=3Dcris-linux-gnu- ;; hexagon) container_image=3Ddebian-hexagon-cross - container_cross_cc=3Dhexagon-unknown-linux-musl-clang + container_cross_prefix=3Dhexagon-unknown-linux-musl- + container_cross_cc=3D${container_cross_prefix}clang ;; hppa) container_image=3Ddebian-hppa-cross - container_cross_cc=3Dhppa-linux-gnu-gcc + container_cross_prefix=3Dhppa-linux-gnu- ;; i386) container_image=3Dfedora-i386-cross - container_cross_cc=3Dgcc + container_cross_prefix=3D ;; m68k) container_image=3Ddebian-m68k-cross - container_cross_cc=3Dm68k-linux-gnu-gcc + container_cross_prefix=3Dm68k-linux-gnu- ;; microblaze) container_image=3Ddebian-microblaze-cross - container_cross_cc=3Dmicroblaze-linux-musl-gcc + container_cross_prefix=3Dmicroblaze-linux-musl- ;; mips64el) container_image=3Ddebian-mips64el-cross - container_cross_cc=3Dmips64el-linux-gnuabi64-gcc + container_cross_prefix=3Dmips64el-linux-gnuabi64- ;; mips64) container_image=3Ddebian-mips64-cross - container_cross_cc=3Dmips64-linux-gnuabi64-gcc + container_cross_prefix=3Dmips64-linux-gnuabi64- ;; mipsel) container_image=3Ddebian-mipsel-cross - container_cross_cc=3Dmipsel-linux-gnu-gcc + container_cross_prefix=3Dmipsel-linux-gnu- ;; mips) container_image=3Ddebian-mips-cross - container_cross_cc=3Dmips-linux-gnu-gcc + container_cross_prefix=3Dmips-linux-gnu- ;; nios2) container_image=3Ddebian-nios2-cross - container_cross_cc=3Dnios2-linux-gnu-gcc + container_cross_prefix=3Dnios2-linux-gnu- ;; ppc) container_image=3Ddebian-powerpc-test-cross - container_cross_cc=3Dpowerpc-linux-gnu-gcc-10 + container_cross_prefix=3Dpowerpc-linux-gnu- + container_cross_cc=3D${container_cross_prefix}gcc-10 ;; ppc64|ppc64le) container_image=3Ddebian-powerpc-test-cross - container_cross_cc=3Dpowerpc${1#ppc}-linux-gnu-gcc-10 + container_cross_prefix=3Dpowerpc${1#ppc}-linux-gnu- + container_cross_cc=3D${container_cross_prefix}gcc-10 ;; riscv64) container_image=3Ddebian-riscv64-test-cross - container_cross_cc=3Driscv64-linux-gnu-gcc + container_cross_prefix=3Driscv64-linux-gnu- ;; s390x) container_image=3Ddebian-s390x-cross - container_cross_cc=3Ds390x-linux-gnu-gcc + container_cross_prefix=3Ds390x-linux-gnu- ;; sh4) container_image=3Ddebian-sh4-cross - container_cross_cc=3Dsh4-linux-gnu-gcc + container_cross_prefix=3Dsh4-linux-gnu- ;; sparc64) container_image=3Ddebian-sparc64-cross - container_cross_cc=3Dsparc64-linux-gnu-gcc + container_cross_prefix=3Dsparc64-linux-gnu- ;; tricore) container_image=3Ddebian-tricore-cross + container_cross_prefix=3Dtricore- container_cross_as=3Dtricore-as container_cross_ld=3Dtricore-ld + break ;; x86_64) container_image=3Ddebian-amd64-cross - container_cross_cc=3Dx86_64-linux-gnu-gcc + container_cross_prefix=3Dx86_64-linux-gnu- ;; xtensa*) # FIXME: xtensa-linux-user? @@ -1995,9 +2019,12 @@ probe_target_compiler() { container_image=3Ddebian-xtensa-cross =20 # default to the dc232b cpu - container_cross_cc=3D/opt/2020.07/xtensa-dc232b-elf/bin/xtensa-dc2= 32b-elf-gcc + container_cross_prefix=3D/opt/2020.07/xtensa-dc232b-elf/bin/xtensa= -dc232b-elf- ;; esac + : ${container_cross_cc:=3D${container_cross_prefix}gcc} + : ${container_cross_as:=3D${container_cross_prefix}as} + : ${container_cross_ld:=3D${container_cross_prefix}ld} done =20 eval "target_cflags=3D\${cross_cc_cflags_$1}" @@ -2005,17 +2032,11 @@ probe_target_compiler() { if eval has "\"\${cross_cc_$1}\""; then eval "target_cc=3D\"\${cross_cc_$1}\"" fi + else + compute_target_variable $1 target_cc gcc fi - if eval test -n "\"\${cross_as_$1}\""; then - if eval has "\"\${cross_as_$1}\""; then - eval "target_as=3D\"\${cross_as_$1}\"" - fi - fi - if eval test -n "\"\${cross_ld_$1}\""; then - if eval has "\"\${cross_ld_$1}\""; then - eval "target_ld=3D\"\${cross_ld_$1}\"" - fi - fi + compute_target_variable $1 target_as as + compute_target_variable $1 target_ld ld if test "$1" =3D $cpu; then : ${target_cc:=3D$cc} : ${target_as:=3D$as} @@ -2048,12 +2069,8 @@ write_container_target_makefile() { if test -n "$container_cross_cc"; then echo "CC=3D\$(DOCKER_SCRIPT) cc --cc $container_cross_cc -i qemu/$cont= ainer_image -s $source_path --" fi - if test -n "$container_cross_as"; then - echo "AS=3D\$(DOCKER_SCRIPT) cc --cc $container_cross_as -i qemu/$cont= ainer_image -s $source_path --" - fi - if test -n "$container_cross_ld"; then - echo "LD=3D\$(DOCKER_SCRIPT) cc --cc $container_cross_ld -i qemu/$cont= ainer_image -s $source_path --" - fi + echo "AS=3D\$(DOCKER_SCRIPT) cc --cc $container_cross_as -i qemu/$contai= ner_image -s $source_path --" + echo "LD=3D\$(DOCKER_SCRIPT) cc --cc $container_cross_ld -i qemu/$contai= ner_image -s $source_path --" } =20 =20 --=20 2.30.2