From patchwork Tue Oct 11 19:28:58 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: 614201 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2855236pvb; Tue, 11 Oct 2022 12:39:14 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5tF8NDkuH90PpDHvzMT+LljdCk0UbSf0Pjnu+/cMptCe/ApWH2Q3sGvYxEvu/e93BiqqOs X-Received: by 2002:a05:6214:1c4d:b0:4b1:7a21:e26f with SMTP id if13-20020a0562141c4d00b004b17a21e26fmr20577287qvb.81.1665517154224; Tue, 11 Oct 2022 12:39:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665517154; cv=none; d=google.com; s=arc-20160816; b=PFaBpd+scYPtmFIdmPBKNbL2S6mQuRwlOLFpqDHZpw2hrIIsTPlek2GAOKp3U1he3n WaGQ3Z+t/JJoAOll+hp8XPzGZiNylbw3rYQxU2F/ELHcI6iKmng5PlUYz7cEp/pjbst2 FXu6MrHfRrH/kO/GNTj8TWv8GCrC7zh7FYwi4eEPa2U0rUXdkN+U1aiyc68tfhWv4LbY TRbxcdWvAEXiSkRoU3pdaDgxMLnJmS+FaCu7AOFXXg6HURrzObjcLGmrF7TgBMSej1lw 7uic/F6xhXZ49vH/O+OgsogSxhAacBZIWTW1pOa0ImTALzwrMHcW6C0OnPXnnglM7Mab 7TkA== 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=ezs1Hyh0hWlLcWIDvOtpOQ/n9iXUQ7qwXkJ2IKy8wIM=; b=XxxwGb3e/ku2Vg6IdnSGM/ob9qcc80yCThnaoJmU5fcqi2SKdkJZd106JCYh9F0tIq siLsdpdkmvBD0xeZPepB3CeO/GYn9/UhiZvXXWa/h2ncJuHGrEyyFVLb0/hucmPVI0bE LMM2ilk+ac19R4ubNo/RZSg/4jffWN8Mk0bFKUiJ0DwhM0JzRQ6apQn4PJBIAW1liBhb 0PIkysZ5Ydq58Guuds/zHoQq57Zdm70z/iaCdcCnyxalCYMDnXXp7CQqTZQ/xtq6mRJC yUnY9ietFHtGNaxeJodA3R1+zIghGPha8zDbHhIUfoH1i3KHfNzzi9YU88jlwqP4E0VE lDZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hhoxbrkF; 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 q1-20020a056214194100b004b3dd79cc94si6663410qvk.532.2022.10.11.12.39.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 11 Oct 2022 12:39:14 -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=hhoxbrkF; 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]:38554 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oiL5t-0005WB-MX for patch@linaro.org; Tue, 11 Oct 2022 15:39:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53150) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oiKw3-0000b9-4a for qemu-devel@nongnu.org; Tue, 11 Oct 2022 15:29:03 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:43744) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oiKw1-0005tW-Ab for qemu-devel@nongnu.org; Tue, 11 Oct 2022 15:29:02 -0400 Received: by mail-wr1-x431.google.com with SMTP id n12so23100429wrp.10 for ; Tue, 11 Oct 2022 12:29:00 -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=ezs1Hyh0hWlLcWIDvOtpOQ/n9iXUQ7qwXkJ2IKy8wIM=; b=hhoxbrkFlVly7zWmrGDRvRUK/2ku/mF5vw9BgyleEqp+5LlpnzfPaaHQQZWWJ4tSaM 5IV47R+vTDEOXPiV0IYKaHYxDseGCw5YzYcDLzuEGUrTBk8vo60aMCX78R/15JqqxPIF 9/Pgi8e4nfsDyUhIRa5b4IhtJDuG4taz+VQs9cVfTn7wdpHU6od/bzSuts0sGXYgKJeo 0iUWarTMzlINXdj0iEjXqgpwzv2DCgr3CJtnJ8qnqigAQ0RWZUNb0jMLtgGzDauWkSrZ YBU/LI66p4hY2ZQwW8Rv2ElGcRBejBVEzNwXIboCQlV56khntysubvNmzv406WZC82aq v8EQ== 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=ezs1Hyh0hWlLcWIDvOtpOQ/n9iXUQ7qwXkJ2IKy8wIM=; b=xi0ApB6Fu+RbdMJUBLqpcnrRFDLVd2dRbU94yUSBGSdJjlqMxBqFzYT2JGTOtqVLQL 6fKEnELMdmry3JwjlZPB+IbWoCKnXSHFiVGXqmxtd6tURGKTYmbQwGWE6AvX0FbBsyE+ hmZAZzh0YCtVSPLF9Vd8i/rSUiGh8q8I7ku5Sg5kFEqe/6oUeh2rhFPrJClkQ/Q/rZsZ 4ks9aibbbFP+KmjlX9e1Rm2uomvlojBw5FDxK9O7JBVJhlp1JAj+MRI8IQV529VStIgw GzgYUpEgEkBQ79eBQJjo0df3F7FbjbfSGXcFnFUMrqOpviOMChDtfuob9ZqURfzsCbby 98yg== X-Gm-Message-State: ACrzQf2Lb2egK8m4JvpiLpUGn/5bu97YnSZNSG2nGXw8LjA3gb3iRU5l Tvl2DWRxLIoG40sc3wt5mIxjRQ== X-Received: by 2002:a5d:6d86:0:b0:22e:4049:441f with SMTP id l6-20020a5d6d86000000b0022e4049441fmr16560361wrs.198.1665516539743; Tue, 11 Oct 2022 12:28:59 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id m11-20020adffa0b000000b00230b3a0f461sm4999284wrr.33.2022.10.11.12.28.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Oct 2022 12:28:58 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7F0161FFB8; Tue, 11 Oct 2022 20:28:58 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Paolo Bonzini , Daniel Henrique Barboza Subject: [PULL 1/1] Revert "configure: build ROMs with container-based cross compilers" Date: Tue, 11 Oct 2022 20:28:58 +0100 Message-Id: <20221011192858.956078-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221011192858.956078-1-alex.bennee@linaro.org> References: <20221011192858.956078-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x431.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 Message-Id: <20221011113417.794841-4-alex.bennee@linaro.org> 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