From patchwork Tue Oct 11 11:34:16 2022 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: 614198 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2624396pvb; Tue, 11 Oct 2022 06:18:45 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6TPWgDybD0PmfhA7EGUlz6giljWHjtx07ZQHnh4eLfQYtSGJD+/PVeYEQkSJ+byMXJ+hdM X-Received: by 2002:a05:622a:409:b0:35d:5a1e:888d with SMTP id n9-20020a05622a040900b0035d5a1e888dmr19265006qtx.561.1665494325163; Tue, 11 Oct 2022 06:18:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665494325; cv=none; d=google.com; s=arc-20160816; b=hiSC7oMjmeMKiFWmqiapEBxLylhmm6qHfeAkfNaeYqoW1G6MT+b772XZduXKactJB/ ASEUX0whEoZBFq0fKyb4CXPG00DRLuHcA3R+tAmez0zpN4rn4K1FMbDaPuMReXv/Bph7 1KD3Md3+Td12aoJYZRuXdj4I5vS+toremyBrEmeRv6OOrS3IuAS46wRlKOx+BD78O+I6 80kOXy4AwAOJwp6M8ZSVPk2PWyI9lu8UkEotcC2NdxezYZqedeTE3QgCxr3ZFWrXRF05 YMcTJoTZzyFIhRBhieoNueankrA1XiQc2rrqtK3R3eU5cRpW0diziNA13x8nX4PGuOwg /1PQ== 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:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=UasiaWMFk+3cRGEOLzC0FA7Gpe5ajlIMpmUzmmfj7sM=; b=ARjCe9B+v0lK6QqW+BfA5K9Yw5OZOXVjXbaHK3P0b5YDOfxnZihcUo6WiWFWTY0ePQ hhZ0Y910yDuL0P6K3AqAcRtR+KpjLtc1s2AnFU6OuItJH6WuaDJysT76GRuP24NiptrO /aG/eNSkK7LWyvqN8RY0nATVg1z/2tFg7J6Dh9wwc2dUSRfxGPqz8OwAT5fX4CHV+Qru o3m0F2i9EQxlrD82ctIX0wt0/7JuVmsm3v1GNebSDftd7OzPGxOwxzbyPjihE9jQZ91B 3aZEeXUPKeJC+8e1tl5kf/fAy9inCDerrFKLb9Bt6J1hN0+Vsu61Q6EDHRNHsSd2UpEN lTuQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Fqii37gG; 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 gc7-20020a05622a59c700b00398d83256e6si4477441qtb.550.2022.10.11.06.18.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 11 Oct 2022 06:18:45 -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=Fqii37gG; 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]:59272 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oiF9c-0006j1-Te for patch@linaro.org; Tue, 11 Oct 2022 09:18:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49862) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oiDWj-0004eO-E6 for qemu-devel@nongnu.org; Tue, 11 Oct 2022 07:34:27 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:42895) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oiDWg-0004LH-II for qemu-devel@nongnu.org; Tue, 11 Oct 2022 07:34:25 -0400 Received: by mail-wm1-x330.google.com with SMTP id o20-20020a05600c4fd400b003b4a516c479so7945395wmq.1 for ; Tue, 11 Oct 2022 04:34:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=UasiaWMFk+3cRGEOLzC0FA7Gpe5ajlIMpmUzmmfj7sM=; b=Fqii37gGrU88v3J8MJDIaQusWxyI0YgTw+ksh4EGtxsBTRVDkJBu3CmF2hVcux1qsu wG002qCYfmxIomKC+p5cBvHNtwG2DK7tVyNZQh8o/RuRZj6GOWC0VFt6RPUq6dmNWJXZ 6MIEKcnPrCAWSaAoaNtL6GFSgj7TZHkMulLM4D7FsrlQMzL47YDVs4YSv2jNKxy5fyhN O+MKJgLsnfe6l4IFSyypNysgnQGQqw8VNjl4bejawbqJXCC4EaTECwF6PmExRssMyVAY dC22rfRqEVo9y5xuXClAVOa+6BRiovOJAk8TBsI7cbU2fjTP7wmiufNES+O9bmiHrED0 CcTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UasiaWMFk+3cRGEOLzC0FA7Gpe5ajlIMpmUzmmfj7sM=; b=rOl4zvswEb7mJpa0aQ82Yhebk3+yB2WgqoLoaudVDCBQTgEDkahT6d4y+yyBJyzymU kuLai8E6Dxjeqv7dE/qt8X9+V9qivS9VFtA8Y7avkFjiVtxoE6s5mhh/jliVdC1aMxxI gORlZWP2jhj5+NznB3BA9g9/gy73YqXELAn1AVhdUgZPYXg+tCM6ugRYrxsn9jIWYkSB 9Hh8BcaVXSfG3lw1UjnyF1tOW4aFQM6Hvp4Rlh5SU7/jZYxC4mcz7x8CQV4kzwXCwIgj 9ZL8b5+bAXNytOK29hXdGibj3NL0pH9szSuKbwUsRqH38g0vV4jLd8hz4WbcfoJFj8J9 3bqg== X-Gm-Message-State: ACrzQf2FIUrSGau0KBcZZx58Czoymz/7X98K5Iz0qio7wuFwq1VOmMj6 f/41NH30p9OG8qkPLlBs74dRDQ== X-Received: by 2002:a05:600c:19ce:b0:3b9:c36f:f9e2 with SMTP id u14-20020a05600c19ce00b003b9c36ff9e2mr16480985wmq.110.1665488060862; Tue, 11 Oct 2022 04:34:20 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id l2-20020a05600c4f0200b003a682354f63sm20250090wmq.11.2022.10.11.04.34.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Oct 2022 04:34:18 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C38121FFBB; Tue, 11 Oct 2022 12:34:17 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH v1 3/4] Revert "configure: build ROMs with container-based cross compilers" Date: Tue, 11 Oct 2022 12:34:16 +0100 Message-Id: <20221011113417.794841-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221011113417.794841-1-alex.bennee@linaro.org> References: <20221011113417.794841-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x330.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.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" This reverts commit 730fe750fba63023e294ff0acf0f874369f1946f. Unconditionally building all the bios for all arches was a little too far too fast. Signed-off-by: Alex Bennée Cc: Paolo Bonzini Reviewed-by: Daniel Henrique Barboza Tested-by: Daniel Henrique Barboza --- configure | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/configure b/configure index baa69189f0..45ee6f4eb3 100755 --- a/configure +++ b/configure @@ -2121,7 +2121,7 @@ probe_target_compiler() { target_ranlib= target_strip= fi - test -n "$target_cc" || test -n "$container_image" + test -n "$target_cc" } write_target_makefile() { @@ -2268,7 +2268,7 @@ if test "$targetos" != "darwin" && test "$targetos" != "sunos" && \ config_mak=pc-bios/optionrom/config.mak echo "# Automatically generated by configure - do not modify" > $config_mak echo "TOPSRC_DIR=$source_path" >> $config_mak - write_target_makefile pc-bios/optionrom/all >> $config_mak + write_target_makefile >> $config_mak fi if test "$softmmu" = yes && probe_target_compiler ppc-softmmu; then @@ -2276,31 +2276,25 @@ if test "$softmmu" = yes && probe_target_compiler ppc-softmmu; then config_mak=pc-bios/vof/config.mak echo "# Automatically generated by configure - do not modify" > $config_mak echo "SRC_DIR=$source_path/pc-bios/vof" >> $config_mak - write_target_makefile pc-bios/vof/all >> $config_mak + write_target_makefile >> $config_mak fi # Only build s390-ccw bios if the compiler has -march=z900 or -march=z10 # (which is the lowest architecture level that Clang supports) if test "$softmmu" = yes && probe_target_compiler s390x-softmmu; then - got_cross_cc=no - if test -n "$target_cc"; then - write_c_skeleton - do_compiler "$target_cc" $target_cc_cflags -march=z900 -o $TMPO -c $TMPC - has_z900=$? - if [ $has_z900 = 0 ] || do_compiler "$target_cc" $target_cc_cflags -march=z10 -msoft-float -Werror -o $TMPO -c $TMPC; then - if [ $has_z900 != 0 ]; then - echo "WARNING: Your compiler does not support the z900!" - echo " The s390-ccw bios will only work with guest CPUs >= z10." - fi - got_cross_cc=yes + write_c_skeleton + do_compiler "$target_cc" $target_cc_cflags -march=z900 -o $TMPO -c $TMPC + has_z900=$? + if [ $has_z900 = 0 ] || do_compiler "$target_cc" $target_cc_cflags -march=z10 -msoft-float -Werror -o $TMPO -c $TMPC; then + if [ $has_z900 != 0 ]; then + echo "WARNING: Your compiler does not support the z900!" + echo " The s390-ccw bios will only work with guest CPUs >= z10." fi - fi - if test "$got_cross_cc" = yes || test -n "$container_image"; then roms="$roms pc-bios/s390-ccw" config_mak=pc-bios/s390-ccw/config-host.mak echo "# Automatically generated by configure - do not modify" > $config_mak echo "SRC_PATH=$source_path/pc-bios/s390-ccw" >> $config_mak - write_target_makefile pc-bios/s390-ccw/all >> $config_mak + write_target_makefile >> $config_mak # SLOF is required for building the s390-ccw firmware on s390x, # since it is using the libnet code from SLOF for network booting. git_submodules="${git_submodules} roms/SLOF" @@ -2488,7 +2482,7 @@ for target in $target_list; do ;; esac - if probe_target_compiler $target; then + if probe_target_compiler $target || test -n "$container_image"; then test -n "$container_image" && build_static=y mkdir -p "tests/tcg/$target" config_target_mak=tests/tcg/$target/config-target.mak