From patchwork Thu Nov 16 17:28:20 2023 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: 744443 Delivered-To: patch@linaro.org Received: by 2002:a5d:5388:0:b0:32d:baff:b0ca with SMTP id d8csp449116wrv; Thu, 16 Nov 2023 09:29:21 -0800 (PST) X-Google-Smtp-Source: AGHT+IEePuK5l3Cy34go3e33N9VCdbmAb7IOKFEVO4A/YLW1wIfEPoQPDoNmIPkkK9Kz9qA107rK X-Received: by 2002:a05:6102:22f2:b0:45d:9224:a89a with SMTP id b18-20020a05610222f200b0045d9224a89amr16014341vsh.10.1700155760985; Thu, 16 Nov 2023 09:29:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700155760; cv=none; d=google.com; s=arc-20160816; b=AdM4uJS210vNFZoHGxn1BqAp+u5QaTLW7OXmUVqtLP42WPT4VybifKGCOME4NedyPE mSnu0kbxHIgrhT4uuneUoVkeNUD+W7wWeW3DpvmwmA6zwOwBpNtKcBy+26AHzVBcr5aR 98cAQ+bI+RrAhghEE5wPtBUvDhvJ6ca2wrvP/mv2xJO0ZsmNHjVyHAsT8BwagzTZm1kv RYI6VgU0r8YixfVduwbXs0SCFLj69ydxDNnEwpKFJngPGAoN4EaJDvP1a8RkOuYKrHx2 Y7B+gM1Y1n9qV+uziTCdQc+UN1W6fge4LEOcSbHwoELrqKdV3Y+Vpl0t01jEtA2f2XId Kpvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:cc:to:from:dkim-signature; bh=TqVK9uOL2ddFONTKxAz6R/c/cKH2txHZFCYADHu1FbQ=; fh=Dz0Qh/UpoeIEiizcnNp9Ig/R6OGoBpw/aNhltryc8Lo=; b=jj4EExRD9MnBo9u4VzmMTZLpdfEadFL0DDaPC3QchUdGdI8G39srdRfmqf+5tGlutV vGBBPq15TbQs4du554JWm8mMmc9vKjZMJfDhwX5K1M1hKI0sIYpRwYH4f/mJfXDiTU12 1zwwuNJIu4ivA8+FBILGdzqRTLEdnwPc/JUTPsoioNzyJfb+6fgkAewlYOBDaKpI35al plh6YYZ78rlo91kR/Mkpfo6/dRcB7nXuB1xguCNnRnF3ltQHOLSlQeFoc/RIBQv1gb+y cg9ue07re/iKSnNVsGcc+aXvKiv9JZvUWbF+2bT/pzqRhEmCSEZBgEAhSsZFbDmDtj9D 0j4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=OYgEHkiH; 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 pe7-20020a056214494700b0067123837efdsi10966356qvb.390.2023.11.16.09.29.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 16 Nov 2023 09:29:20 -0800 (PST) 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=OYgEHkiH; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r3gAJ-0008Hj-3P; Thu, 16 Nov 2023 12:28:31 -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 1r3gAH-0008HU-Dj for qemu-devel@nongnu.org; Thu, 16 Nov 2023 12:28:29 -0500 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r3gAF-0002WV-LC for qemu-devel@nongnu.org; Thu, 16 Nov 2023 12:28:29 -0500 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-4083f61312eso8678225e9.3 for ; Thu, 16 Nov 2023 09:28:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1700155705; x=1700760505; darn=nongnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=TqVK9uOL2ddFONTKxAz6R/c/cKH2txHZFCYADHu1FbQ=; b=OYgEHkiHj+5jb8ITJDik3BtyAqmtRm1ebCMSf2jV9EzSVVz9/DC9wE7KtMOA/ePnQw TF6V4mUu+uW7XZk5xoG6BGa6VEkFP5tDDuFZ3igjS9eP2RaJgeSNIrODiaTpEMzdUpKz 31w2ef0m4l4BfUXmHi+5xhc0PrXUtW68tvQRCM72giGETJA6nUB7lDFfjEqhqIbEacyJ fMstrgf4w8lucDsxj1hgP+KF9ydql/2s7J3xyF8HqJpjKu5zXz1UkRISksFKHl+DIOx0 9ExL7W7y40oIGycmDZ76Uuoq2WJyXOeoWgCyTaECEPbKpVGxABAVHv277iHp+wJfJviT uaAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700155705; x=1700760505; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=TqVK9uOL2ddFONTKxAz6R/c/cKH2txHZFCYADHu1FbQ=; b=Nix7LrDv9pmMg9wZxdiDHps+Jocqk2RxSv2oZtdTj3/QZpM8EJaIKvF7i6xHV6g6uz AIT+r+OvxWBhxrO6geGSP2hpUT+ZYXGUEx0RBN519gG0jNO9MhBn3L0G0e1JHuJ9IG3q I7pumYcWklLtDdexp9rk+9WsVpYANtiwazhw7ji/DXQj7a2fAPJcWCcZ08XexfmiPASH ZThbvbNVBRaxK2PBIrwl3bKqqBrqtSrCqi2k+fwNz4hk5IWKWkSzWGxyS2CvBGuLP23U xiCVxKRtJo47gMZqpsXzODUaiJrbxUJUpcaUhnarB8Q3gzeaQqoAIy28++dpTbmHbknl qs2A== X-Gm-Message-State: AOJu0Yy/fhRDdZY6HdV09wRCp/ZxKmlCTU6cV1+cNDvBFrwD/P13sWxz gIAt7ljz4XXs2AyIiVnSb0DmoA== X-Received: by 2002:a05:600c:4584:b0:409:5a1a:fe16 with SMTP id r4-20020a05600c458400b004095a1afe16mr12475201wmo.28.1700155705080; Thu, 16 Nov 2023 09:28:25 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id f14-20020a056000128e00b003313069be5dsm14241951wrx.46.2023.11.16.09.28.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Nov 2023 09:28:24 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 58F645F7B6; Thu, 16 Nov 2023 17:28:24 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Paolo Bonzini , Thomas Huth Subject: [RFC PATCH] configure: don't try a "native" cross for i386 Date: Thu, 16 Nov 2023 17:28:20 +0000 Message-Id: <20231116172820.2481604-1-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32c.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org As 32 bit x86 become rarer we are starting to run into problems with search paths. Although we switched to a Debian container we still favour the native CC on a Bookworm host. As a result we have a broken cross compile setup which then fails to build with: BUILD i386-linux-user guest-tests In file included from /usr/include/linux/stat.h:5, from /usr/include/bits/statx.h:31, from /usr/include/sys/stat.h:465, from /home/alex/lsrc/qemu.git/tests/tcg/multiarch/linux/linux-test.c:28: /usr/include/linux/types.h:5:10: fatal error: asm/types.h: No such file or directory 5 | #include | ^~~~~~~~~~~~~ compilation terminated. make[1]: *** [Makefile:119: linux-test] Error 1 make: *** [/home/alex/lsrc/qemu.git/tests/Makefile.include:50: build-tcg-tests-i386-linux-user] Error 2 So lets stop trying to be cute and honour cross_prefix_i386 when searching locally. We also need to ensure we are using the correct prefix if we do end up using the container version. We can also drop the extra CFLAGS while we are at it. Fixes: 791e6fedc5 (tests/docker: replace fedora-i386 with debian-i686) Signed-off-by: Alex Bennée Reviewed-by: Daniel P. Berrangé --- configure | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/configure b/configure index 5e7b76e3a1..2343d629ec 100755 --- a/configure +++ b/configure @@ -1190,7 +1190,6 @@ fi : ${cross_cc_cflags_armeb="-mbig-endian"} : ${cross_cc_hexagon="hexagon-unknown-linux-musl-clang"} : ${cross_cc_cflags_hexagon="-mv73 -O2 -static"} -: ${cross_cc_cflags_i386="-m32"} : ${cross_cc_cflags_ppc="-m32 -mbig-endian"} : ${cross_cc_cflags_ppc64="-m64 -mbig-endian"} : ${cross_cc_ppc64le="$cross_cc_ppc64"} @@ -1308,7 +1307,7 @@ probe_target_compiler() { ;; i386) container_image=debian-i686-cross - container_cross_prefix= + container_cross_prefix=i686-linux-gnu- ;; loongarch64) container_image=debian-loongarch-cross @@ -1394,7 +1393,6 @@ probe_target_compiler() { case "$target_arch:$cpu" in aarch64_be:aarch64 | \ armeb:arm | \ - i386:x86_64 | \ mips*:mips64 | \ ppc*:ppc64 | \ sparc:sparc64 | \