From nobody Sun Apr 28 21:22:02 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=1652779769; cv=none; d=zohomail.com; s=zohoarc; b=GNjsqGCpwrOUEm8OfqovD/9AcF35vh57kx11NhsJYnIYIlhJdROehwOPW43XLYWvySPQd+Fdqw6+q//okUqMNiZtpww1Vxn9fbiZKXHiL77cva+JzK70xHwjIcPst4VrDtUWyMQVj5sUhaecN1gubgXWjy9lqT3rv1PCXIulsp8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652779769; 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=uoPUcf+gWzkzUbBnPNYFnx3ClJ6pvlzZxwCJ6+UrUr0=; b=j28X2lX0UdmpTe119IBtI60KA0GpDtP6PYLjj3OD+dfX6Rjhbf6/AIgLNTDteaWvqDL3cD7Lbcu/ptjSWQKYWDBYGQcL+2ZdiopuOwTsqgRk/Cf5zr5iYv13l48u/WYFGOusGEg9vke3LzKRjDEHu+smetFTlT6XT4AV4pvROAk= 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 1652779769477635.790538034576; Tue, 17 May 2022 02:29:29 -0700 (PDT) Received: from localhost ([::1]:54138 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqtWB-0002PL-Qb for importer@patchew.org; Tue, 17 May 2022 05:29:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37304) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqtTJ-00080M-FQ for qemu-devel@nongnu.org; Tue, 17 May 2022 05:26:29 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:44524) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqtTF-0003XD-Ua for qemu-devel@nongnu.org; Tue, 17 May 2022 05:26:27 -0400 Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-622-s6JVDbg3P86wqD0Jhzj1ZQ-1; Tue, 17 May 2022 05:26:24 -0400 Received: by mail-ej1-f72.google.com with SMTP id qw30-20020a1709066a1e00b006f45e7f44b0so7064549ejc.5 for ; Tue, 17 May 2022 02:26:23 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id my35-20020a1709065a6300b006f3ef214de2sm806007ejc.72.2022.05.17.02.26.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 May 2022 02:26:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652779585; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uoPUcf+gWzkzUbBnPNYFnx3ClJ6pvlzZxwCJ6+UrUr0=; b=Hacl8WNC5sz0nLtg4KQThkwlj/vSRpE/uDR3zF8HCTmVj/r8WsZmIXS9N8QSuBEhITfkXU 0IUrsGWz8MK4/lP47xTA8c33fDhmiSJfcENLDtRlj/xP0mihyvKnkTKjoVqzsd3nfC6lZq 3/0DIRp0hsVlP1N4YtwxS5G1Mlq7eA0= X-MC-Unique: s6JVDbg3P86wqD0Jhzj1ZQ-1 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=uoPUcf+gWzkzUbBnPNYFnx3ClJ6pvlzZxwCJ6+UrUr0=; b=E9AOMjUy3lcu1Q1+L/10aRKfL+WiaNdiKzU0XL444fOmoyxZ6C2109MTKRE9vEsBKO HRV0N+7udQRop0U8Qpgp22g+efTeiCLgIeylIYz6FGAhaAgFWUZ9LcUaBWBEtzqjc/7M 1yn8r1Ln2WfR2xfkXbhv3JVhxfKIx5n9mv2suxfhFS+yP2ke7GAKNWS3d43T/oFxcJvY FgN9QSRPj392+SK9oKXKJveoBi/uK68Keyr0+s7ATie7e6W5cHDyadATXhcckz7HkvWk 5Zv8/BUkHP9YaIncnW3XaZAnXmPRSVo08sRd+cHiCrQSAbMuEUvQBS4Qa1QE+U8kqfHm YP4w== X-Gm-Message-State: AOAM530zsJkdCn1JRJx9rgdG/k5HmjXY9PsPk/h3GBNsEsFapgvuN8+k us70JelqUNW4S/DTR4M0b0q082Ny/lIBTjD18f5rA2hTsGEg+ZT99s7XheyUDFFwyWQ+8B+gClG pBsazWlTKgKebQVnyxqiMSDzxsAtxpyyAsuPklc82KQ4BTmvCYoT73EPzidSNjOfnHjQ= X-Received: by 2002:a17:907:1c87:b0:6f0:29ea:cc01 with SMTP id nb7-20020a1709071c8700b006f029eacc01mr18876273ejc.671.1652779582425; Tue, 17 May 2022 02:26:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwCSejIFfgSZIIKBQFXi7zn6Pg2RPG4tjQ9v9pPzmZlVJ4J3g+S7X2Pbxbz13h98u59jZf3Kw== X-Received: by 2002:a17:907:1c87:b0:6f0:29ea:cc01 with SMTP id nb7-20020a1709071c8700b006f029eacc01mr18876256ejc.671.1652779582190; Tue, 17 May 2022 02:26:22 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, richard.henderson@linaro.org Subject: [PATCH 01/16] configure: do not define or use the CPP variable Date: Tue, 17 May 2022 11:26:01 +0200 Message-Id: <20220517092616.1272238-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220517092616.1272238-1-pbonzini@redhat.com> References: <20220517092616.1272238-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: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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 @redhat.com) X-ZM-MESSAGEID: 1652779771784100003 Content-Type: text/plain; charset="utf-8" Just hardcode $(CC) -E, it should be enough. Signed-off-by: Paolo Bonzini Reviewed-by: Richard Henderson --- configure | 3 --- pc-bios/optionrom/Makefile | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/configure b/configure index 0cc8c876f7..4c8954feea 100755 --- a/configure +++ b/configure @@ -378,7 +378,6 @@ fi ar=3D"${AR-${cross_prefix}ar}" as=3D"${AS-${cross_prefix}as}" ccas=3D"${CCAS-$cc}" -cpp=3D"${CPP-$cc -E}" objcopy=3D"${OBJCOPY-${cross_prefix}objcopy}" ld=3D"${LD-${cross_prefix}ld}" ranlib=3D"${RANLIB-${cross_prefix}ranlib}" @@ -2030,7 +2029,6 @@ echo "CC=3D$cc" >> $config_host_mak echo "AR=3D$ar" >> $config_host_mak echo "AS=3D$as" >> $config_host_mak echo "CCAS=3D$ccas" >> $config_host_mak -echo "CPP=3D$cpp" >> $config_host_mak echo "OBJCOPY=3D$objcopy" >> $config_host_mak echo "LD=3D$ld" >> $config_host_mak echo "QEMU_CFLAGS=3D$QEMU_CFLAGS" >> $config_host_mak @@ -2273,7 +2271,6 @@ preserve_env() { preserve_env AR preserve_env AS preserve_env CC -preserve_env CPP preserve_env CFLAGS preserve_env CXX preserve_env CXXFLAGS diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile index 2494ad9c25..17ccc76241 100644 --- a/pc-bios/optionrom/Makefile +++ b/pc-bios/optionrom/Makefile @@ -50,7 +50,7 @@ override LDFLAGS =3D -m $(LD_I386_EMULATION) -T $(SRC_DIR= )/flat.lds pvh.img: pvh.o pvh_main.o =20 %.o: %.S - $(call quiet-command,$(CPP) $(CPPFLAGS) -c -o - $< | $(AS) $(ASFLAGS) -o = $@,"AS","$@") + $(call quiet-command,$(CC) $(CPPFLAGS) -E -o - $< | $(AS) $(ASFLAGS) -o $= @,"AS","$@") =20 %.o: %.c $(call quiet-command,$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@,"CC","$@") --=20 2.36.0 From nobody Sun Apr 28 21:22:02 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=1652779770; cv=none; d=zohomail.com; s=zohoarc; b=aqVRbIPX5YHvx/tVAAJaFikEdG5riy6YBS+/VAh+z2fr8Q8bnasM6Kojz5ik9UIQoypE7P02H4865OXvtdimqdNV0HPnJrFFUQ/WdUwQ9lNyPK+W41ZWaCP0Pz62Cmny/9wMbHKN4DTZY2SSx3EehOLMkg0mD4+uZpDy6eU8d+I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652779770; 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=Ntfkbmefi/h16+5K9PpeVr2uI+6+dLOQnH86jaPDoIQ=; b=knXO/UGr3RwB7PCr2FmdE5GmaxQNMR8fU3YHnNr7bpqf+M0CtITYSGNUJcC76BNhsmnqshiUHDMaJqkVmmunyM6KJ7q/RuyO/Vk6XDERivcJ+lQxzPuJR3FqYo27p/Pl4iGx50cCqVhtqWbxLwzqLryFTrGOHBd3bvy0yisA5PE= 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 1652779770227611.7984234418325; Tue, 17 May 2022 02:29:30 -0700 (PDT) Received: from localhost ([::1]:54292 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqtWD-0002VV-2p for importer@patchew.org; Tue, 17 May 2022 05:29:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37332) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqtTK-00080h-TD for qemu-devel@nongnu.org; Tue, 17 May 2022 05:26:31 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:26800) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqtTJ-0003Xe-E5 for qemu-devel@nongnu.org; Tue, 17 May 2022 05:26:30 -0400 Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-22-VaUXEqFQMOi-J-2p-YqG7g-1; Tue, 17 May 2022 05:26:27 -0400 Received: by mail-ed1-f70.google.com with SMTP id p13-20020aa7c4cd000000b0042ab847aba8so2824657edr.0 for ; Tue, 17 May 2022 02:26:27 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id d4-20020a170907272400b006f3ef214e5bsm796424ejl.193.2022.05.17.02.26.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 May 2022 02:26:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652779588; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ntfkbmefi/h16+5K9PpeVr2uI+6+dLOQnH86jaPDoIQ=; b=H8IdZfXoriSXQqN2gf/X81EUACnkT7r/Y8jTjQ/pktRSwkOO4JxFiSr+WTHADfGQ5488p+ WHor447utP9vixUnNpVPAXUHDYCNljskRyCoQzyJcXTDI1ag3+bKYUZzIJmxfw+RuZ5q3a WJ0SF7WtnEhUzvBAQ5yhiWSkIpyzMII= X-MC-Unique: VaUXEqFQMOi-J-2p-YqG7g-1 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=Ntfkbmefi/h16+5K9PpeVr2uI+6+dLOQnH86jaPDoIQ=; b=38CxOXe/QTEl+5SdYP/CgInnpz0fr5V4PF6G+L1i82Oy0z6u42cq5yDO3YWmRvvGfe MzvCINWpqxNAUIzPNho91+imaooR9hZ3Ulzu2U08Y8lLsdreOrkgsoxLUm3QEUs+bkh2 RlVlpmvw+MNt15+ubDmXVxSrNWswFZrQfezeuoigbGe5StIw6h7uFm5Ik/80N2oJNDXj 5r2kXpg2qSN0VMRuNTLzWCaZdlwLWY31qdAnWFlfFWimhR3iweDzvV0ROnA0iLFwBS2a IBhK5FdSWC3Q9GvSPLTbd5tseO8U/A79JNqZaHP8GXFcdapMyxBuchmcr7icyK8Sh0Ar wRoQ== X-Gm-Message-State: AOAM530/FpxBH6THjEyE5FKJU15fQjB/zh+nK9wKA3GXDt5nsYs3s5kx EumMREgR6H3xjVi40vMjcSZUbuMIDoq0eN8K2XfyCeBTF54oApqCO/uUvEdtgw5J+sMVc43/N1x gnt64JU1QAUgglbdHsOVh42AaVwuP6yxuuXOsUOLA8xz/RBLKEojxS7cQEZAtf/mXFCQ= X-Received: by 2002:a17:907:110d:b0:6f5:64f4:9202 with SMTP id qu13-20020a170907110d00b006f564f49202mr18670010ejb.111.1652779585653; Tue, 17 May 2022 02:26:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx/shp8WchQJ/z68LK6v3oCGuka5pOg7OyDyB5Z6LAKM3SHQwMnDAUUK76Nv6PyMJLFgHjs0Q== X-Received: by 2002:a17:907:110d:b0:6f5:64f4:9202 with SMTP id qu13-20020a170907110d00b006f564f49202mr18669994ejb.111.1652779585307; Tue, 17 May 2022 02:26:25 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, richard.henderson@linaro.org Subject: [PATCH 02/16] build: clean up ninja invocation Date: Tue, 17 May 2022 11:26:02 +0200 Message-Id: <20220517092616.1272238-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220517092616.1272238-1-pbonzini@redhat.com> References: <20220517092616.1272238-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: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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 @redhat.com) X-ZM-MESSAGEID: 1652779771780100002 Content-Type: text/plain; charset="utf-8" Fix an incorrect "@@:" and move "-d keepdepfile" to the NINJAFLAGS variable. Signed-off-by: Paolo Bonzini Reviewed-by: Richard Henderson --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index b842dbccdb..fad312040f 100644 --- a/Makefile +++ b/Makefile @@ -143,7 +143,7 @@ MAKE.q =3D $(findstring q,$(firstword $(filter-out --%,= $(MAKEFLAGS)))) MAKE.nq =3D $(if $(word 2, $(MAKE.n) $(MAKE.q)),nq) NINJAFLAGS =3D $(if $V,-v) $(if $(MAKE.n), -n) $(if $(MAKE.k), -k0) \ $(filter-out -j, $(lastword -j1 $(filter -l% -j%, $(MAKEFLAGS)))) \ - + -d keepdepfile ninja-cmd-goals =3D $(or $(MAKECMDGOALS), all) ninja-cmd-goals +=3D $(foreach t, $(.check.build-suites), $(.check-$t.deps= )) ninja-cmd-goals +=3D $(foreach t, $(.bench.build-suites), $(.bench-$t.deps= )) @@ -160,8 +160,8 @@ $(ninja-targets): run-ninja # --output-sync line. run-ninja: config-host.mak ifneq ($(filter $(ninja-targets), $(ninja-cmd-goals)),) - +$(quiet-@)$(if $(MAKE.nq),@:, $(NINJA) -d keepdepfile \ - $(NINJAFLAGS) $(sort $(filter $(ninja-targets), $(ninja-cmd-goals))) |= cat) + +$(if $(MAKE.nq),@:,$(quiet-@)$(NINJA) $(NINJAFLAGS) \ + $(sort $(filter $(ninja-targets), $(ninja-cmd-goals))) | cat) endif endif =20 --=20 2.36.0 From nobody Sun Apr 28 21:22:02 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=1652779771; cv=none; d=zohomail.com; s=zohoarc; b=O++vafezOoTcDvH96kfDjcHiboU/nQ7k5/gKuyQoei0uaB1LXPf6JHGVDjORWyUA9lYz6jlvmzz3fioQEtCkoCWwIw6WfbQqGG/rmdm3OCauVf8FQ8QWkst3YjbTMFzMngUrX1RsD+yritnxt8SBDhbhPGZuCbm1d39aIlr+aN8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652779771; 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=XkNQvBwBHUr1EnwLPLPazbVgqhiFsZYY8y+g5y7TLyk=; b=eedWVXRfFWozSWZPKfc5/1YX4p89JvPsyPjjE4hyYZ2MU3NFNhJHfkt2cV+z5Co/xh4rzNhgUDLTkBN59w3M7RdP4nVmjdrwyZwDBy2VfUJSApnXHcU4+8UBn5aJPy8SUNsDY0CZsiAvVpDEZ3m+UuFQWhR+TfR+pkNhbTZ7LSE= 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 1652779771170634.8645522407926; Tue, 17 May 2022 02:29:31 -0700 (PDT) Received: from localhost ([::1]:54330 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqtWE-0002Wh-35 for importer@patchew.org; Tue, 17 May 2022 05:29:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37350) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqtTM-00081d-Cb for qemu-devel@nongnu.org; Tue, 17 May 2022 05:26:32 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:36105) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqtTK-0003Xu-RD for qemu-devel@nongnu.org; Tue, 17 May 2022 05:26:32 -0400 Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-663-0sOOP9G7O5W7ho0mGoj5cg-1; Tue, 17 May 2022 05:26:29 -0400 Received: by mail-ed1-f71.google.com with SMTP id w5-20020a056402128500b0042aa2647eb6so5016972edv.12 for ; Tue, 17 May 2022 02:26:28 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id b16-20020a170906729000b006fe50668941sm794346ejl.158.2022.05.17.02.26.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 May 2022 02:26:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652779590; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XkNQvBwBHUr1EnwLPLPazbVgqhiFsZYY8y+g5y7TLyk=; b=WwpDUZ77t0MRhgjuoOxwYdkMJWUIUNJw4ySswnh21RcGQ7EMt8ti40bb87gNJNLYEhMejg my7L/Pmw6z/G0Iml4lmAf/fMe649xKJ7e1likl98RJbLIPE1ED6p6jdtKm6YMpHcqY+pA1 /oewmQvM6UzWL7J7ziFj5N4mcR3CDgY= X-MC-Unique: 0sOOP9G7O5W7ho0mGoj5cg-1 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=XkNQvBwBHUr1EnwLPLPazbVgqhiFsZYY8y+g5y7TLyk=; b=zwhWjZoKDf1YDFURbmU6T15ZidzQFwSNDGZRY5XTOkVayAqvRYLsoccV73SQPyUvgY UXpx/+KRgx15UaRs+PP9iYKjz0Uo8W3anWt4KwkG/IhKewKVAxM7XbpCaEX63vg1VyA7 lk9lHnhfqLk6aWDNp+OR50mCnhSyP6jf+7mt7hImuHYBY1pUZI1JaxOpCqA2BuMpaL1r XMgsTRjxfvGZZE43IBrJcc8bZwOXJz4cfN9Re+lThvAYnwe2uSp9y+ROWLOrRY8RtlB9 ft0i6UEIejVN4orOKLLxe+iB6xb/rVja49lgmKDF20H2+Knt/gy3HedR/79n41C5WfNx 2UeA== X-Gm-Message-State: AOAM530ltWKEk1dAwl6xfj64gGsxqR+6U9RlnfyflVdYGTh2wt/c65dq 1953x3Mt3EGXcXdono0gPB8ZKHRnnsfTFxZTelkeZDfvuNwmIEHhaDKmioe1S/S1inh+TadyZoA CW3ku12DA6Z+ykdsbsxyav26y0DRNeEVSTKLqbtePkFt31DKN7fcypIxVhuwtWHOtyj4= X-Received: by 2002:a17:907:1c24:b0:6f4:ff62:a393 with SMTP id nc36-20020a1709071c2400b006f4ff62a393mr18987707ejc.154.1652779587533; Tue, 17 May 2022 02:26:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwhrqNQtPRom/x9hXFGIV6FpI3iS9M6NvBWOsrLhSVUBelHonjmhenMMcyZws0WPnAvU1pBxA== X-Received: by 2002:a17:907:1c24:b0:6f4:ff62:a393 with SMTP id nc36-20020a1709071c2400b006f4ff62a393mr18987680ejc.154.1652779587257; Tue, 17 May 2022 02:26:27 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, richard.henderson@linaro.org Subject: [PATCH 03/16] build: add a more generic way to specify make->ninja dependencies Date: Tue, 17 May 2022 11:26:03 +0200 Message-Id: <20220517092616.1272238-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220517092616.1272238-1-pbonzini@redhat.com> References: <20220517092616.1272238-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.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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 @redhat.com) X-ZM-MESSAGEID: 1652779771777100001 Content-Type: text/plain; charset="utf-8" Let any make target specify ninja goals that needs to be built for it (though selecting the goals is _not_ recursive on depending targets) instead of having a custom mechanism only for "make check" and "make bench". Signed-off-by: Paolo Bonzini --- Makefile | 3 +-- scripts/mtest2make.py | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index fad312040f..3c0d89057e 100644 --- a/Makefile +++ b/Makefile @@ -145,8 +145,7 @@ NINJAFLAGS =3D $(if $V,-v) $(if $(MAKE.n), -n) $(if $(M= AKE.k), -k0) \ $(filter-out -j, $(lastword -j1 $(filter -l% -j%, $(MAKEFLAGS)))) \ -d keepdepfile ninja-cmd-goals =3D $(or $(MAKECMDGOALS), all) -ninja-cmd-goals +=3D $(foreach t, $(.check.build-suites), $(.check-$t.deps= )) -ninja-cmd-goals +=3D $(foreach t, $(.bench.build-suites), $(.bench-$t.deps= )) +ninja-cmd-goals +=3D $(foreach g, $(MAKECMDGOALS), $(.ninja-goals.$g)))) =20 makefile-targets :=3D build.ninja ctags TAGS cscope dist clean uninstall # "ninja -t targets" also lists all prerequisites. If build system diff --git a/scripts/mtest2make.py b/scripts/mtest2make.py index 304634b71e..0fe81efbbc 100644 --- a/scripts/mtest2make.py +++ b/scripts/mtest2make.py @@ -81,12 +81,12 @@ def emit_prolog(suites, prefix): =20 def emit_suite_deps(name, suite, prefix): deps =3D ' '.join(suite.deps) - targets =3D f'{prefix}-{name} {prefix}-report-{name}.junit.xml {prefix= } {prefix}-report.junit.xml' + targets =3D [f'{prefix}-{name}', f'{prefix}-report-{name}.junit.xml', = f'{prefix}', f'{prefix}-report.junit.xml', + f'{prefix}-build'] print() print(f'.{prefix}-{name}.deps =3D {deps}') - print(f'ifneq ($(filter {prefix}-build {targets}, $(MAKECMDGOALS)),)') - print(f'.{prefix}.build-suites +=3D {name}') - print(f'endif') + for t in targets: + print(f'.ninja-goals.{t} +=3D $(.{prefix}-{name}.deps)') =20 def emit_suite(name, suite, prefix): emit_suite_deps(name, suite, prefix) --=20 2.36.0 From nobody Sun Apr 28 21:22:02 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=1652779772; cv=none; d=zohomail.com; s=zohoarc; b=groGECeBQawOY3zXTuBAOcrtBO+mmZbwFuYOBVagB052H8FbFBtQw7LefAFh5xuErgJnIX8/gltfv8JCh9LgUNQ0ltu6HI+4e6Zm9FaZi4hGdtdIGOlfWFWhNTzMk2Wz90Dg4uJh77WMWd96fVMcmqc1W2YNIxP96Hxuo0qHw9A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652779772; 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=fUl5xTZ9es8RBRkqDIjM6uhwl5Ow3wDrJVQ71mw8bsY=; b=SGd70dBxhw5w9/30nnZtXBm11oDUrln+lTUi1zEPpHI2u4Zv/N8gcI1R4MjWi6mFlJn1Lk3KeVu8lsHFHuwt8xBMBi0/YPE4iZR6Kl3ST2XXXQsaj8OuBs8B0F5TD4XsIuYTdLGQQzBwolxVRqyt4iCp0Zoood/hQxV8+Slucgg= 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 1652779772938981.659737569142; Tue, 17 May 2022 02:29:32 -0700 (PDT) Received: from localhost ([::1]:54400 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqtWF-0002ZU-0v for importer@patchew.org; Tue, 17 May 2022 05:29:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37366) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqtTP-00083L-DE for qemu-devel@nongnu.org; Tue, 17 May 2022 05:26:36 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:51403) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqtTM-0003YD-ND for qemu-devel@nongnu.org; Tue, 17 May 2022 05:26:33 -0400 Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-621-qp1vRBjQMbeQZQxSJjcXjA-1; Tue, 17 May 2022 05:26:30 -0400 Received: by mail-ej1-f70.google.com with SMTP id p7-20020a170906614700b006f87f866117so7036287ejl.21 for ; Tue, 17 May 2022 02:26:30 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id t10-20020a170906268a00b006f3ef214dc3sm811775ejc.41.2022.05.17.02.26.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 May 2022 02:26:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652779591; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fUl5xTZ9es8RBRkqDIjM6uhwl5Ow3wDrJVQ71mw8bsY=; b=JRbfYR376CUIC4udYU8uEZfivtQMzq4Zs495usn07k01ADtY7InQil0A6HGcq2dDLJnW+P 4hYY2FxgW5kWvbhdzrEcg4v41iorf0Ez6GgrzTAMmN2lsmSad1iBwxyzaXS8QYPWJANVdO JIj4N5j3VvTmjU7ICla+95pyuuHtWCA= X-MC-Unique: qp1vRBjQMbeQZQxSJjcXjA-1 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=fUl5xTZ9es8RBRkqDIjM6uhwl5Ow3wDrJVQ71mw8bsY=; b=k+ObL4MT8kW/AqGNOqjbEAILfIjV/F+iT86SiE8B+i1mp7NoVf0TxgeS/dgYz92s9+ Vgrsb/shlJxOExdpf/wK3cpGgimFZrXMVbrLnW66BPsYJ/ZUHURBl6foKlveJQyPl3fU taeOPJZJsn7ojU/HGlUAJysar6VnyuIer9uS/Sf4ex+DL5xClHTxOTJO8sKTDO6ptyps lj/dVVYIRGoSwgxPn8mvg6M8nY/Doi18Zdd3eqtr35OIPWuQsToROqY7tzl2ZP0+8RKh PXwX/AtY5RCm2V7zSPMOTTLqfsIruoRHgYqTck5vdeKsJIXAJbXCAj+BRwr+kZAnrsSa dWEg== X-Gm-Message-State: AOAM531/AnjyVIcE5/SA5BjZrfhdMuYlUjtEJxH917RGU8MEUbMlSQQz hpqwJ1XTbUfscS+n6q8WQE6AaQWR8uhCqTkXSybGyUgtS8IAZGjRtsnZV5PhJJZT+GR/caq9t2D +l89vWm/gG8rFa1Y2pz5PNHELz9f0ded8SFuEelLhol7TC7hYU0y3JEThNFU1Lgd5Moo= X-Received: by 2002:a17:906:c14b:b0:6f8:e6bb:f8d5 with SMTP id dp11-20020a170906c14b00b006f8e6bbf8d5mr18723560ejc.4.1652779589421; Tue, 17 May 2022 02:26:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJya6UjKcSk4r8Lkp6dTrBTGH4gqvbYFOElt/6JTzW+xF8NoqM03jUv+3ynJZyjyIsa++15ZYw== X-Received: by 2002:a17:906:c14b:b0:6f8:e6bb:f8d5 with SMTP id dp11-20020a170906c14b00b006f8e6bbf8d5mr18723540ejc.4.1652779589131; Tue, 17 May 2022 02:26:29 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, richard.henderson@linaro.org Subject: [PATCH 04/16] build: do a full build before running TCG tests Date: Tue, 17 May 2022 11:26:04 +0200 Message-Id: <20220517092616.1272238-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220517092616.1272238-1-pbonzini@redhat.com> References: <20220517092616.1272238-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.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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 @redhat.com) X-ZM-MESSAGEID: 1652779773773100007 Content-Type: text/plain; charset="utf-8" TCG tests need both QEMU and firmware to be built, so do "ninja all" before trying to run them. Signed-off-by: Paolo Bonzini Reviewed-by: Richard Henderson --- tests/Makefile.include | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index ec84b2ebc0..72ce0561f4 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -57,7 +57,7 @@ $(TCG_TESTS_TARGETS:%=3Dbuild-tcg-tests-%): build-tcg-tes= ts-%: $(BUILD_DIR)/tests/ "BUILD","$* guest-tests") =20 .PHONY: $(TCG_TESTS_TARGETS:%=3Drun-tcg-tests-%) -$(TCG_TESTS_TARGETS:%=3Drun-tcg-tests-%): run-tcg-tests-%: build-tcg-tests= -% $(if $(CONFIG_PLUGIN),test-plugins) +$(TCG_TESTS_TARGETS:%=3Drun-tcg-tests-%): run-tcg-tests-%: build-tcg-tests= -% $(call quiet-command, \ $(MAKE) -C tests/tcg/$* -f ../Makefile.target $(SUBDIR_MAKEFLAG= S) \ TARGET=3D"$*" SRC_PATH=3D"$(SRC_PATH)" SPEED=3D$(S= PEED) run, \ @@ -74,6 +74,7 @@ $(TCG_TESTS_TARGETS:%=3Dclean-tcg-tests-%): clean-tcg-tes= ts-%: build-tcg: $(BUILD_TCG_TARGET_RULES) =20 .PHONY: check-tcg +.ninja-goals.check-tcg =3D all $(if $(CONFIG_PLUGIN),test-plugins) check-tcg: $(RUN_TCG_TARGET_RULES) =20 .PHONY: clean-tcg --=20 2.36.0 From nobody Sun Apr 28 21:22:02 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=1652780371; cv=none; d=zohomail.com; s=zohoarc; b=IX4jA9agnwJNJXxnejT3Jqq8+4+fHLUW5VQhInMmb+Vs9NKjKGWuoKMXXdznbq6mqfQXln0fDbgv5ZSpO2H2lgMRC9npbbUI47vMffn147wi7U0wyqOCxTR4O/sHijT+rDsz3xUA3fJqhkPS1d8Rmk029urFJbCZW+bu96xztUM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652780371; 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=gvcZMn5z0pl093XdtM8Z4Dmk4AG8hlklHqSILBtef6c=; b=n1uJJH5kdR5hyoLEGvG2oUQOzF/yADu9J+fzluRnEJBSPLevHMjOx9cdC91TeY9+GNAyFdzmEykSY9XRxHVRDBiogB3qEPXAJmtW056JEGNqeDezo62rSXZf6grRdqnsm2t+UJoqS4wRxFG+QCjQiYNX1/20rzK7QjPC0e214to= 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 1652780371914617.6571047956975; Tue, 17 May 2022 02:39:31 -0700 (PDT) Received: from localhost ([::1]:34900 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqtfu-0000ZU-1j for importer@patchew.org; Tue, 17 May 2022 05:39:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37394) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqtTS-000871-1j for qemu-devel@nongnu.org; Tue, 17 May 2022 05:26:38 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:40375) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqtTQ-0003Yn-3H for qemu-devel@nongnu.org; Tue, 17 May 2022 05:26:37 -0400 Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-240-Bt1upC9CMPiVzaJfvG2Mdw-1; Tue, 17 May 2022 05:26:32 -0400 Received: by mail-ed1-f70.google.com with SMTP id n9-20020aa7d049000000b0042aab725949so4367882edo.23 for ; Tue, 17 May 2022 02:26:32 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id if20-20020a170906df5400b006f3ef214dc7sm798680ejc.45.2022.05.17.02.26.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 May 2022 02:26:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652779595; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gvcZMn5z0pl093XdtM8Z4Dmk4AG8hlklHqSILBtef6c=; b=Xt6QyBXbvMWIAdITedSKqa1OuoLICVs6Ll+wmK4F3Lj8U1usaC5qe1pF9fOaYvBzbX4HBW AbszR0WMxYPUYQ4XhKNYLq2G5YiCP/LYSR1j1q+BQGM1NCE1jNaihEw2hBwRmimoi/Xk8B 0ItRXbltTRVTWvDIyLzpbpZgxlqCeKQ= X-MC-Unique: Bt1upC9CMPiVzaJfvG2Mdw-1 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=gvcZMn5z0pl093XdtM8Z4Dmk4AG8hlklHqSILBtef6c=; b=iXNSespXZMd+orhgYASWySeiFH8gHMbjPivbHNfsurThSwlfSvoKMWtnNt71CYD0UL Pbr/NVKyqCfzH/ULM3Ssn0B3ig95RJqhR3qC/cvwtfSdh+OdTU+qNrscENyTw4PAojfI IkKzsWwyYe0BqlsHHqRUv3bGa05vw34qzytHrl+fRYRZK/GthfisC0bpCNDfnvKc2QQX 6obuMyxfToT46G90PL5AleaFJstScNdhIBolL/G6XEe9zuiZVRpyleLWzhbyLjowqMjo f2pmFbMDeCby5/paal8YTTbmN8xxWtN0BN9eVhlO3hBLPXr7RjM7tE6BoYPGoVK1DcO5 /vng== X-Gm-Message-State: AOAM533gq4eyIp/4SAGKov6KjDTnB0b4Uo0ujZqLda6VTJzFp1wJ7h98 wckf/m+y/nNeDsVeKo2Q2uA7JllZuYciB+R11HlQMWzicFXf5aE/jyl5rQ9pgEdnq2cp3+7Z51y +xU0q5erlEoIYCmU0l0IgURxU+QYV1cwc8gH5o8TBjKgu1owXC90KR1thtPlBymjSLBo= X-Received: by 2002:a17:907:2cc4:b0:6fe:1c72:7888 with SMTP id hg4-20020a1709072cc400b006fe1c727888mr13068464ejc.373.1652779590873; Tue, 17 May 2022 02:26:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwSn7TMugjc+ECsWZRDzFsaTswti2Hpdq4rzLhgZluU2PRtDsra+C2zvrSE7rQmes3ZygPQHw== X-Received: by 2002:a17:907:2cc4:b0:6fe:1c72:7888 with SMTP id hg4-20020a1709072cc400b006fe1c727888mr13068447ejc.373.1652779590604; Tue, 17 May 2022 02:26:30 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, richard.henderson@linaro.org Subject: [PATCH 05/16] configure, meson: move symlinking of ROMs to meson Date: Tue, 17 May 2022 11:26:05 +0200 Message-Id: <20220517092616.1272238-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220517092616.1272238-1-pbonzini@redhat.com> References: <20220517092616.1272238-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: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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 @redhat.com) X-ZM-MESSAGEID: 1652780373274100001 Content-Type: text/plain; charset="utf-8" This is useful because pc-bios/meson.build already has a list of all ROM files, and thus does not need to use wildcards. The problems with wildcards are mentioned above the definition of the LINKS variable, but then the recommendation is disattended. Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini --- configure | 15 --------------- pc-bios/meson.build | 18 +++++++++++++----- 2 files changed, 13 insertions(+), 20 deletions(-) diff --git a/configure b/configure index 4c8954feea..d87b110aa2 100755 --- a/configure +++ b/configure @@ -2115,21 +2115,6 @@ LINKS=3D"$LINKS tests/avocado tests/data" LINKS=3D"$LINKS tests/qemu-iotests/check" LINKS=3D"$LINKS python" LINKS=3D"$LINKS contrib/plugins/Makefile " -for bios_file in \ - $source_path/pc-bios/*.bin \ - $source_path/pc-bios/*.elf \ - $source_path/pc-bios/*.lid \ - $source_path/pc-bios/*.rom \ - $source_path/pc-bios/*.dtb \ - $source_path/pc-bios/*.img \ - $source_path/pc-bios/openbios-* \ - $source_path/pc-bios/u-boot.* \ - $source_path/pc-bios/palcode-* \ - $source_path/pc-bios/qemu_vga.ndrv - -do - LINKS=3D"$LINKS pc-bios/$(basename $bios_file)" -done for f in $LINKS ; do if [ -e "$source_path/$f" ]; then mkdir -p `dirname ./$f` diff --git a/pc-bios/meson.build b/pc-bios/meson.build index c86dedf7df..8ba81f5518 100644 --- a/pc-bios/meson.build +++ b/pc-bios/meson.build @@ -23,7 +23,7 @@ if unpack_edk2_blobs endforeach endif =20 -blobs =3D files( +blobs =3D [ 'bios.bin', 'bios-256k.bin', 'bios-microvm.bin', @@ -83,11 +83,18 @@ blobs =3D files( 'npcm7xx_bootrom.bin', 'vof.bin', 'vof-nvram.bin', -) +] =20 -if get_option('install_blobs') - install_data(blobs, install_dir: qemu_datadir) -endif +ln_s =3D [find_program('ln', required: true), '-sf'] +foreach f : blobs + roms +=3D custom_target(f, + build_by_default: have_system, + output: f, + input: files('meson.build'), # dummy input + install: get_option('install_blobs'), + install_dir: qemu_datadir, + command: [ ln_s, meson.project_source_root() / 'pc-bios' /= f, '@OUTPUT@' ]) +endforeach =20 subdir('descriptors') subdir('keymaps') --=20 2.36.0 From nobody Sun Apr 28 21:22:02 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=1652780680; cv=none; d=zohomail.com; s=zohoarc; b=dlMq1i0y6/RhNS3ArEc1mA31cD9xK/B01fgjX/M7uFvfwDaYXR12f0/Vj7YwLDTMX8XDc8odJzlyy6bsYABHkgryDX+sxMCLo22e0istZ/IVk3WmP17lWSxSG08arlGgDfeQJxzXflYwgE+6+wJ0V83Y+GMhDs9xwpmLdDdCVGk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652780680; 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=nN7r0beIl23EOwo34aiCMtclrAAwX19cFP3sQ4Uv6ZI=; b=bsXQZxiVs7+QoI1oRzgyQUeT0TVw4DEJoh75WarHs2KDtifKHsZBVa0xlEkJVayf4zxEfKWHR+7uY2kqiKtfN27Ra8uy9ZHWTiV2R6w1kdC/DtX3EniSv4uOtZzSqWx3i6vDDeqgMAKt0THa4oNLorXGLEJQBQRBT+iqR/KOW9Q= 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 1652780680442309.3674430355753; Tue, 17 May 2022 02:44:40 -0700 (PDT) Received: from localhost ([::1]:43198 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqtkt-0006j1-35 for importer@patchew.org; Tue, 17 May 2022 05:44:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37392) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqtTR-00086O-BN for qemu-devel@nongnu.org; Tue, 17 May 2022 05:26:37 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:52973) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqtTP-0003Yb-Ov for qemu-devel@nongnu.org; Tue, 17 May 2022 05:26:37 -0400 Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-29-xMOi9-dhNYKJ-gb-MOq6Ag-1; Tue, 17 May 2022 05:26:33 -0400 Received: by mail-ed1-f71.google.com with SMTP id h11-20020aa7c60b000000b0042ab2287015so3456338edq.3 for ; Tue, 17 May 2022 02:26:33 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id p7-20020a170907910700b006f3ef214dabsm816755ejq.17.2022.05.17.02.26.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 May 2022 02:26:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652779595; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nN7r0beIl23EOwo34aiCMtclrAAwX19cFP3sQ4Uv6ZI=; b=MjeAHkANJAoRz5WfeVGcV8d3jwsjSnPjSiPqaXQ+Lxz/ptka927zTibhDrDTpwLzOp19WN EsQUx1VSXSplloIK1e0QwKM2jdqatOMxHu8M9BlAFY1o4zxFE67i+kTFCmkHmuuct1Q/cK F+A7FB/F9+xK/RfohBmlWrJg2EuZa58= X-MC-Unique: xMOi9-dhNYKJ-gb-MOq6Ag-1 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=nN7r0beIl23EOwo34aiCMtclrAAwX19cFP3sQ4Uv6ZI=; b=UpFha58xXVHx/1yUEEEGRXreD12EJzFddZxfgEjMZLB2r8vFBsHBY3u802guHV6vFT PfyaFLPAO1iVAlz9dgI6prRv2Y0wceE2nnW0eEQdjn0mKbM/6q4NTtYkBKjmgA1r+cIJ gBaMJ/2JmrWqWZCFjIcMYWwwGpHLc2KgKmMNaDt+n93G3W6Y+hcuSWbAIHZV5L6Kvtqb b5X2dZIOTDWDQi9mDd6W5+c9RC/N2+mj8ey0N9zW36/oTmOjazTILv9rjw6llsk94cej BYv91A/GTuO5PfC43mE5htUpWYf1epxil4TTD/eXsCU/A2ED3tU49G0TXZy3Prx6ruVY SNtw== X-Gm-Message-State: AOAM532jp6yJ2rRZ3ZRViOaEarYOOerxSb5m+XCfS6d8GubDzlJQmfWD ZEgCmOrWeaZOcxkb7OqD4AhCdjhJr887CLlBHkGMReoshZJ3ECipXGZozSH+OS+UBQ7w1gd37PH 7XTnZ9ijQ5IMAU+FifFlKZ4r5NgNlCfCwRsZWxOw76y86U8SoB7mqqKdMFKRjRXyRKYM= X-Received: by 2002:a17:907:7b92:b0:6db:71f1:fc20 with SMTP id ne18-20020a1709077b9200b006db71f1fc20mr18308609ejc.343.1652779592407; Tue, 17 May 2022 02:26:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxUnwe+aPpRggwNeE0I86tw9YeC7bxXQuv/xPOiVNYOqk2SBtC89sz8hIxyeeLbrWOg8Df73A== X-Received: by 2002:a17:907:7b92:b0:6db:71f1:fc20 with SMTP id ne18-20020a1709077b9200b006db71f1fc20mr18308588ejc.343.1652779592134; Tue, 17 May 2022 02:26:32 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, richard.henderson@linaro.org Subject: [PATCH 06/16] tests/tcg: correct target CPU for sparc32 Date: Tue, 17 May 2022 11:26:06 +0200 Message-Id: <20220517092616.1272238-7-pbonzini@redhat.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220517092616.1272238-1-pbonzini@redhat.com> References: <20220517092616.1272238-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.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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 @redhat.com) X-ZM-MESSAGEID: 1652780682082100001 Content-Type: text/plain; charset="utf-8" We do not want v8plus for pure sparc32, as the difference with the V8 ABI are only meaningful on 64-bit CPUs suh as ultrasparc; supersparc is the best CPU to use for 32-bit. Signed-off-by: Paolo Bonzini Reviewed-by: Richard Henderson --- tests/tcg/configure.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh index 691d90abac..59f2403d1a 100755 --- a/tests/tcg/configure.sh +++ b/tests/tcg/configure.sh @@ -70,7 +70,7 @@ fi : ${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_cflags_sparc=3D"-m32 -mv8plus -mcpu=3Dultrasparc"} +: ${cross_cc_cflags_sparc=3D"-m32 -mcpu=3Dsupersparc"} : ${cross_cc_sparc64=3D"sparc64-linux-gnu-gcc"} : ${cross_cc_cflags_sparc64=3D"-m64 -mcpu=3Dultrasparc"} : ${cross_cc_x86_64=3D"x86_64-linux-gnu-gcc"} --=20 2.36.0 From nobody Sun Apr 28 21:22:02 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=1652780536; cv=none; d=zohomail.com; s=zohoarc; b=XNMQN3uM+L5sRIHCEN05ItrbO6wRGWy5BSDLqvbcVW3IgFyVBPpGcTG0GhZkgT7Rxkt8EndjMAEW7jUWiL5nTG7QGhpEUYc3qT+rwSESvEpnhbbCkh6mAqBZs7M26JXZXOXz0qHz9CXKLv+OoKTYQ4ehl5sgS3VCZ7G+3ae6bLw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652780536; 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=ffhh38B2tb7vK2Zh7JFfKJix5HCaxkSNlSaHzRCa9RI=; b=in434/cqN3NRR95XKsnDnewkTrKeJNHlLpwr0n75QZV6MnOW+WngPwmGZCn9xP+wf3VvXkL9tHw9XFQGWWYZMBBgx7xDutQyWUZ2Dq89Pd76Z4ICOOUJJtKeazJH2vUlsbfKhD4gtYo+tH/WIqtIYz8f7P+s2mBf+1UEzQn8uo4= 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 1652780536192471.9665184062046; Tue, 17 May 2022 02:42:16 -0700 (PDT) Received: from localhost ([::1]:37934 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqtiZ-0002xq-0v for importer@patchew.org; Tue, 17 May 2022 05:42:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37412) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqtTY-0008Q6-UE for qemu-devel@nongnu.org; Tue, 17 May 2022 05:26:44 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:49458) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqtTV-0003Zc-Mm for qemu-devel@nongnu.org; Tue, 17 May 2022 05:26:44 -0400 Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-45-DURdUWayPaupT9S_B2jlQA-1; Tue, 17 May 2022 05:26:39 -0400 Received: by mail-ej1-f69.google.com with SMTP id sc20-20020a1709078a1400b006f4a358c817so7043962ejc.16 for ; Tue, 17 May 2022 02:26:39 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id eb7-20020a170907280700b006f3ef214e53sm792620ejc.185.2022.05.17.02.26.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 May 2022 02:26:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652779601; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ffhh38B2tb7vK2Zh7JFfKJix5HCaxkSNlSaHzRCa9RI=; b=FyH6FFBBWGAeJyG6Dz/3/gyanAJwKG60h3HcqvKlOzCzox4y+eF2qDzlEARX589ZgiQ0Hd z0vM+BYNokt9WMAZ+wFPF5iQDIg1o3iPP2vkoGr3DRKXVdMRe3aEEHn0f1PCr5hUVNjSqZ T7zuA6qRQ4lsu7eesJ7hg42J6iq3tk8= X-MC-Unique: DURdUWayPaupT9S_B2jlQA-1 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=ffhh38B2tb7vK2Zh7JFfKJix5HCaxkSNlSaHzRCa9RI=; b=3LxcQ/AqLYz17h4ohEWL908Yb2Q+LmSl0j0p3YILXHrDtqTQZTfrEFSU+y9myH44u5 5kfUMesWNKH7s2S8bCSswNwHAZ1kd+MNilYVSwGzuVPOXyzJ5mgMQnU4VGEYQ8AVj39X Htj89VtADRO9kPxwQlaBke5R+DQDuoyBsVa88CeaEQfEwkk7LnH9zpwG284HOXR5/zAN OPoQV+01K9roOwc+ObLrr3NjevzIX8fdd+YqzROTSrTX4UCMRYoD2psSyDbirFXdDo3K DOqKFhz6pQrFIbBKFpNwhlOJajzuVPctUHK/tXK/JBuQQKdeCl0eeCVhrLw8QOj3N23v dIFw== X-Gm-Message-State: AOAM530xKS8zmO2tHzogDecXZ/pgoWMF97B360YEdXoIoMposp0ahz+R n2XxfULqzYvFfFZcAwcEXdQpY9AaFcExXkYm5YwSLDsaH1h57RDacFRcJvQa+63TgXsbVgpLknS 185a6eOOwpiL1bNdDhVexDnmAMZDVS081lyPtpAhNFelbwtqsDx3Ck4blkkRyZYYbkFY= X-Received: by 2002:a17:907:1ca2:b0:6f7:f64:2788 with SMTP id nb34-20020a1709071ca200b006f70f642788mr18654176ejc.97.1652779598035; Tue, 17 May 2022 02:26:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz5p3Ta0yDY7uE2o2bwBPi4HXJtmVWXxJRN0/zTzfhYOhUy1jooP5lw2E0HhmBKClHp7hxF6A== X-Received: by 2002:a17:907:1ca2:b0:6f7:f64:2788 with SMTP id nb34-20020a1709071ca200b006f70f642788mr18654132ejc.97.1652779597228; Tue, 17 May 2022 02:26:37 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, richard.henderson@linaro.org Subject: [PATCH 07/16] tests/tcg: merge configure.sh back into main configure script Date: Tue, 17 May 2022 11:26:07 +0200 Message-Id: <20220517092616.1272238-8-pbonzini@redhat.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220517092616.1272238-1-pbonzini@redhat.com> References: <20220517092616.1272238-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.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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 @redhat.com) X-ZM-MESSAGEID: 1652780537157100001 Content-Type: text/plain; charset="utf-8" tests/tcg/configure.sh has a complicated story. In the beginning its code ran as part of the creation of config-target.mak files, and that is where it placed the information on the target compiler. However, probing for the buildability of TCG tests required multiple inclusions of config-target.mak in the _main_ Makefile (not in Makefile.target, which took care of building the QEMU executables in the pre-Meson era), which polluted the namespace. Thus, it was moved to a separate directory. It created small config-*.mak files in $(BUILD_DIR)/tests/tcg. Those were also included multiple times, but at least they were small and manageable; this was also an important step in disentangling the TCG tests from Makefile.target. Since then, Meson has allowed the configure script to go on a diet. A few compilation tests survive (mostly for sanitizers) but these days it mostly takes care of command line parsing, looking for tools, and setting up the environment for Meson to do its stuff. It's time to extend configure with the capability to build for more than just one target: not just tests, but also firmware. As a first step, integrate all the logic to find cross compilers in the configure script, and move tests/tcg/configure.sh back there (though as a separate loop, not integrated in the one that generates target configurations for Meson). tests/tcg is actually very close to being buildable as a standalone project, so I actually expect the compiler tests to move back to tests/tcg, as a "configure" script of sorts which would run at Make time after the docker images are built. The GCC tree has a similar idea of doing only bare-bones tree-wide configuration and leaving the rest for Make time. Signed-off-by: Paolo Bonzini Acked-by: Richard Henderson --- configure | 398 +++++++++++++++++++++++++++++++++++++++-- tests/Makefile.include | 1 - tests/tcg/configure.sh | 376 -------------------------------------- 3 files changed, 388 insertions(+), 387 deletions(-) delete mode 100755 tests/tcg/configure.sh diff --git a/configure b/configure index d87b110aa2..90cb477c90 100755 --- a/configure +++ b/configure @@ -109,6 +109,20 @@ error_exit() { } =20 do_compiler() { + # Run the compiler, capturing its output to the log. First argument + # is compiler binary to execute. + local compiler=3D"$1" + shift + if test -n "$BASH_VERSION"; then eval ' + echo >>config.log " +funcs: ${FUNCNAME[*]} +lines: ${BASH_LINENO[*]}" + '; fi + echo $compiler "$@" >> config.log + $compiler "$@" >> config.log 2>&1 || return $? +} + +do_compiler_werror() { # Run the compiler, capturing its output to the log. First argument # is compiler binary to execute. compiler=3D"$1" @@ -142,15 +156,15 @@ lines: ${BASH_LINENO[*]}" } =20 do_cc() { - do_compiler "$cc" $CPU_CFLAGS "$@" + do_compiler_werror "$cc" $CPU_CFLAGS "$@" } =20 do_cxx() { - do_compiler "$cxx" $CPU_CFLAGS "$@" + do_compiler_werror "$cxx" $CPU_CFLAGS "$@" } =20 do_objc() { - do_compiler "$objcc" $CPU_CFLAGS "$@" + do_compiler_werror "$objcc" $CPU_CFLAGS "$@" } =20 # Append $2 to the variable named $1, with space separation @@ -347,11 +361,9 @@ for opt do ;; --cross-cc-cflags-*) cc_arch=3D${opt#--cross-cc-cflags-}; cc_arch=3D${cc= _arch%%=3D*} eval "cross_cc_cflags_${cc_arch}=3D\$optarg" - cross_cc_vars=3D"$cross_cc_vars cross_cc_cflags_${cc= _arch}" ;; --cross-cc-*) cc_arch=3D${opt#--cross-cc-}; cc_arch=3D${cc_arch%%=3D*} eval "cross_cc_${cc_arch}=3D\$optarg" - cross_cc_vars=3D"$cross_cc_vars cross_cc_${cc_arch}" ;; esac done @@ -954,7 +966,6 @@ esac =20 if eval test -z "\${cross_cc_$cpu}"; then eval "cross_cc_${cpu}=3D\$cc" - cross_cc_vars=3D"$cross_cc_vars cross_cc_${cpu}" fi =20 default_target_list=3D"" @@ -1813,6 +1824,248 @@ case "$slirp" in ;; esac =20 +########################################## +# functions to probe cross compilers + +container=3D"no" +if test $use_containers =3D "yes"; then + if has "docker" || has "podman"; then + container=3D$($python $source_path/tests/docker/docker.py probe) + fi +fi + +# cross compilers defaults, can be overridden with --cross-cc-ARCH +: ${cross_cc_aarch64=3D"aarch64-linux-gnu-gcc"} +: ${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_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_cflags_sparc=3D"-m32 -mcpu=3Dsupersparc"} +: ${cross_cc_sparc64=3D"sparc64-linux-gnu-gcc"} +: ${cross_cc_cflags_sparc64=3D"-m64 -mcpu=3Dultrasparc"} +: ${cross_cc_x86_64=3D"x86_64-linux-gnu-gcc"} +: ${cross_cc_cflags_x86_64=3D"-m64"} + +# tricore is special as it doesn't have a compiler +: ${cross_as_tricore=3D"tricore-as"} +: ${cross_ld_tricore=3D"tricore-ld"} + +probe_target_compiler() { + # reset all output variables + container_image=3D + container_hosts=3D + container_cross_cc=3D + container_cross_as=3D + container_cross_ld=3D + target_cc=3D + target_as=3D + target_ld=3D + + case $1 in + aarch64) container_hosts=3D"x86_64 aarch64" ;; + alpha) container_hosts=3Dx86_64 ;; + arm) container_hosts=3D"x86_64 aarch64" ;; + cris) container_hosts=3Dx86_64 ;; + hexagon) container_hosts=3Dx86_64 ;; + hppa) container_hosts=3Dx86_64 ;; + i386) container_hosts=3Dx86_64 ;; + m68k) container_hosts=3Dx86_64 ;; + microblaze) container_hosts=3Dx86_64 ;; + mips64el) container_hosts=3Dx86_64 ;; + mips64) container_hosts=3Dx86_64 ;; + mipsel) container_hosts=3Dx86_64 ;; + mips) container_hosts=3Dx86_64 ;; + nios2) container_hosts=3Dx86_64 ;; + ppc) container_hosts=3Dx86_64 ;; + ppc64|ppc64le) container_hosts=3Dx86_64 ;; + riscv64) container_hosts=3Dx86_64 ;; + s390x) container_hosts=3Dx86_64 ;; + sh4) container_hosts=3Dx86_64 ;; + sparc64) container_hosts=3Dx86_64 ;; + tricore) container_hosts=3Dx86_64 ;; + x86_64) container_hosts=3D"aarch64 ppc64el x86_64" ;; + xtensa*) container_hosts=3Dx86_64 ;; + esac + + for host in $container_hosts; do + test "$container" !=3D no || continue + test "$host" =3D "$cpu" || continue + case $1 in + 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 + ;; + alpha) + container_image=3Ddebian-alpha-cross + container_cross_cc=3Dalpha-linux-gnu-gcc + ;; + 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 + ;; + cris) + container_image=3Dfedora-cris-cross + container_cross_cc=3Dcris-linux-gnu-gcc + ;; + hexagon) + container_image=3Ddebian-hexagon-cross + container_cross_cc=3Dhexagon-unknown-linux-musl-clang + ;; + hppa) + container_image=3Ddebian-hppa-cross + container_cross_cc=3Dhppa-linux-gnu-gcc + ;; + i386) + container_image=3Dfedora-i386-cross + container_cross_cc=3Dgcc + ;; + m68k) + container_image=3Ddebian-m68k-cross + container_cross_cc=3Dm68k-linux-gnu-gcc + ;; + microblaze) + container_image=3Ddebian-microblaze-cross + container_cross_cc=3Dmicroblaze-linux-musl-gcc + ;; + mips64el) + container_image=3Ddebian-mips64el-cross + container_cross_cc=3Dmips64el-linux-gnuabi64-gcc + ;; + mips64) + container_image=3Ddebian-mips64-cross + container_cross_cc=3Dmips64-linux-gnuabi64-gcc + ;; + mipsel) + container_image=3Ddebian-mipsel-cross + container_cross_cc=3Dmipsel-linux-gnu-gcc + ;; + mips) + container_image=3Ddebian-mips-cross + container_cross_cc=3Dmips-linux-gnu-gcc + ;; + nios2) + container_image=3Ddebian-nios2-cross + container_cross_cc=3Dnios2-linux-gnu-gcc + ;; + ppc) + container_image=3Ddebian-powerpc-test-cross + container_cross_cc=3Dpowerpc-linux-gnu-gcc-10 + ;; + ppc64|ppc64le) + container_image=3Ddebian-powerpc-test-cross + container_cross_cc=3Dpowerpc${1#ppc}-linux-gnu-gcc-10 + ;; + riscv64) + container_image=3Ddebian-riscv64-test-cross + container_cross_cc=3Driscv64-linux-gnu-gcc + ;; + s390x) + container_image=3Ddebian-s390x-cross + container_cross_cc=3Ds390x-linux-gnu-gcc + ;; + sh4) + container_image=3Ddebian-sh4-cross + container_cross_cc=3Dsh4-linux-gnu-gcc + ;; + sparc64) + container_image=3Ddebian-sparc64-cross + container_cross_cc=3Dsparc64-linux-gnu-gcc + ;; + tricore) + container_image=3Ddebian-tricore-cross + container_cross_as=3Dtricore-as + container_cross_ld=3Dtricore-ld + ;; + x86_64) + container_image=3Ddebian-amd64-cross + container_cross_cc=3Dx86_64-linux-gnu-gcc + ;; + xtensa*) + # FIXME: xtensa-linux-user? + container_hosts=3Dx86_64 + container_image=3Ddebian-xtensa-cross + + # default to the dc232b cpu + container_cross_cc=3D/opt/2020.07/xtensa-dc232b-elf/bin/xtensa-dc2= 32b-elf-gcc + ;; + esac + done + + eval "target_cflags=3D\${cross_cc_cflags_$1}" + if eval test -n "\"\${cross_cc_$1}\""; then + if eval has "\"\${cross_cc_$1}\""; then + eval "target_cc=3D\"\${cross_cc_$1}\"" + case $1 in + i386|x86_64) + if $target_cc --version | grep -qi "clang"; then + unset target_cc + fi + ;; + esac + fi + 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 +} + +write_target_makefile() { + if test -n "$target_cc"; then + echo "CC=3D$target_cc" + fi + if test -n "$target_as"; then + echo "AS=3D$target_as" + fi + if test -n "$target_ld"; then + echo "LD=3D$target_ld" + fi +} + +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 +} + + + ########################################## # End of CC checks # After here, no more $cc or $ld runs @@ -2122,11 +2375,136 @@ for f in $LINKS ; do fi done =20 -(for i in $cross_cc_vars; do - export $i +# tests/tcg configuration +(makefile=3Dtests/tcg/Makefile.prereqs +echo "# Automatically generated by configure - do not modify" > $makefile + +config_host_mak=3Dtests/tcg/config-host.mak +echo "# Automatically generated by configure - do not modify" > $config_ho= st_mak +echo "SRC_PATH=3D$source_path" >> $config_host_mak +echo "HOST_CC=3D$host_cc" >> $config_host_mak + +tcg_tests_targets=3D +for target in $target_list; do + arch=3D${target%%-*} + + probe_target_compiler ${arch} + config_target_mak=3Dtests/tcg/config-$target.mak + + echo "# Automatically generated by configure - do not modify" > $config_= target_mak + echo "TARGET_NAME=3D$arch" >> $config_target_mak + case $target in + *-softmmu) + test -f $source_path/tests/tcg/$arch/Makefile.softmmu-target || cont= inue + qemu=3D"qemu-system-$arch" + ;; + *-linux-user|*-bsd-user) + qemu=3D"qemu-$arch" + ;; + esac + + got_cross_cc=3Dno + unset build_static + + if test -n "$target_cc"; then + write_c_skeleton + if ! do_compiler "$target_cc" $target_cflags \ + -o $TMPE $TMPC -static ; then + # For host systems we might get away with building without -stat= ic + if do_compiler "$target_cc" $target_cflags \ + -o $TMPE $TMPC ; then + got_cross_cc=3Dyes + fi + else + got_cross_cc=3Dyes + build_static=3Dy + fi + elif test -n "$target_as" && test -n "$target_ld"; then + # Special handling for assembler only tests + case $target in + tricore-softmmu) got_cross_cc=3Dyes ;; + esac + fi + + if test $got_cross_cc =3D yes; then + # Test for compiler features for optional tests. We only do this + # for cross compilers because ensuring the docker containers based + # compilers is a requirememt for adding a new test that needs a + # compiler feature. + + echo "BUILD_STATIC=3D$build_static" >> $config_target_mak + write_target_makefile >> $config_target_mak + case $target in + aarch64-*) + if do_compiler "$target_cc" $target_cflags \ + -march=3Darmv8.1-a+sve -o $TMPE $TMPC; then + echo "CROSS_CC_HAS_SVE=3Dy" >> $config_target_mak + fi + if do_compiler "$target_cc" $target_cflags \ + -march=3Darmv8.1-a+sve2 -o $TMPE $TMPC; then + echo "CROSS_CC_HAS_SVE2=3Dy" >> $config_target_mak + fi + if do_compiler "$target_cc" $target_cflags \ + -march=3Darmv8.3-a -o $TMPE $TMPC; then + echo "CROSS_CC_HAS_ARMV8_3=3Dy" >> $config_target_mak + fi + if do_compiler "$target_cc" $target_cflags \ + -mbranch-protection=3Dstandard -o $TMPE $TMPC= ; then + echo "CROSS_CC_HAS_ARMV8_BTI=3Dy" >> $config_target_mak + fi + if do_compiler "$target_cc" $target_cflags \ + -march=3Darmv8.5-a+memtag -o $TMPE $TMPC; then + echo "CROSS_CC_HAS_ARMV8_MTE=3Dy" >> $config_target_mak + fi + ;; + ppc*) + if do_compiler "$target_cc" $target_cflags \ + -mpower8-vector -o $TMPE $TMPC; then + echo "CROSS_CC_HAS_POWER8_VECTOR=3Dy" >> $config_target_= mak + fi + if do_compiler "$target_cc" $target_cflags \ + -mpower10 -o $TMPE $TMPC; then + echo "CROSS_CC_HAS_POWER10=3Dy" >> $config_target_mak + fi + ;; + i386-linux-user) + if do_compiler "$target_cc" $target_cflags \ + -Werror -fno-pie -o $TMPE $TMPC; then + echo "CROSS_CC_HAS_I386_NOPIE=3Dy" >> $config_target_mak + fi + ;; + esac + elif test -n "$container_image"; then + echo "build-tcg-tests-$target: docker-image-$container_image" >> $ma= kefile + echo "BUILD_STATIC=3Dy" >> $config_target_mak + write_container_target_makefile >> $config_target_mak + case $target in + aarch64-*) + echo "CROSS_CC_HAS_SVE=3Dy" >> $config_target_mak + echo "CROSS_CC_HAS_SVE2=3Dy" >> $config_target_mak + echo "CROSS_CC_HAS_ARMV8_3=3Dy" >> $config_target_mak + echo "CROSS_CC_HAS_ARMV8_BTI=3Dy" >> $config_target_mak + echo "CROSS_CC_HAS_ARMV8_MTE=3Dy" >> $config_target_mak + ;; + ppc*) + echo "CROSS_CC_HAS_POWER8_VECTOR=3Dy" >> $config_target_mak + echo "CROSS_CC_HAS_POWER10=3Dy" >> $config_target_mak + ;; + i386-linux-user) + echo "CROSS_CC_HAS_I386_NOPIE=3Dy" >> $config_target_mak + ;; + esac + got_cross_cc=3Dyes + fi + if test $got_cross_cc =3D yes; then + mkdir -p tests/tcg/$target + echo "QEMU=3D$PWD/$qemu" >> $config_target_mak + echo "EXTRA_CFLAGS=3D$target_cflags" >> $config_target_mak + echo "run-tcg-tests-$target: $qemu\$(EXESUF)" >> $makefile + tcg_tests_targets=3D"$tcg_tests_targets $target" + fi done -export target_list source_path use_containers cpu host_cc -$source_path/tests/tcg/configure.sh) +echo "TCG_TESTS_TARGETS=3D$tcg_tests_targets" >> $makefile) =20 config_mak=3Dpc-bios/optionrom/config.mak echo "# Automatically generated by configure - do not modify" > $config_mak diff --git a/tests/Makefile.include b/tests/Makefile.include index 72ce0561f4..6a1688e33e 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -37,7 +37,6 @@ export SRC_PATH SPEED =3D quick =20 -include tests/tcg/Makefile.prereqs -config-host.mak: $(SRC_PATH)/tests/tcg/configure.sh tests/tcg/Makefile.prereqs: config-host.mak =20 # Per guest TCG tests diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh deleted file mode 100755 index 59f2403d1a..0000000000 --- a/tests/tcg/configure.sh +++ /dev/null @@ -1,376 +0,0 @@ -#! /bin/sh - -if test -z "$source_path"; then - echo Do not invoke this script directly. It is called - echo automatically by configure. - exit 1 -fi - -write_c_skeleton() { - cat > $TMPC </dev/null 2>&1 -} - -do_compiler() { - # Run the compiler, capturing its output to the log. First argument - # is compiler binary to execute. - local compiler=3D"$1" - shift - if test -n "$BASH_VERSION"; then eval ' - echo >>config.log " -funcs: ${FUNCNAME[*]} -lines: ${BASH_LINENO[*]}" - '; fi - echo $compiler "$@" >> config.log - $compiler "$@" >> config.log 2>&1 || return $? -} - - -TMPDIR1=3D"config-temp" -TMPC=3D"${TMPDIR1}/qemu-conf.c" -TMPE=3D"${TMPDIR1}/qemu-conf.exe" - -container=3D"no" -if test $use_containers =3D "yes"; then - if has "docker" || has "podman"; then - container=3D$($python $source_path/tests/docker/docker.py probe) - fi -fi - -# cross compilers defaults, can be overridden with --cross-cc-ARCH -: ${cross_cc_aarch64=3D"aarch64-linux-gnu-gcc"} -: ${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_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_cflags_sparc=3D"-m32 -mcpu=3Dsupersparc"} -: ${cross_cc_sparc64=3D"sparc64-linux-gnu-gcc"} -: ${cross_cc_cflags_sparc64=3D"-m64 -mcpu=3Dultrasparc"} -: ${cross_cc_x86_64=3D"x86_64-linux-gnu-gcc"} -: ${cross_cc_cflags_x86_64=3D"-m64"} - -# tricore is special as it doesn't have a compiler -: ${cross_as_tricore=3D"tricore-as"} -: ${cross_ld_tricore=3D"tricore-ld"} - -makefile=3Dtests/tcg/Makefile.prereqs -echo "# Automatically generated by configure - do not modify" > $makefile - -config_host_mak=3Dtests/tcg/config-host.mak -echo "# Automatically generated by configure - do not modify" > $config_ho= st_mak -echo "SRC_PATH=3D$source_path" >> $config_host_mak -echo "HOST_CC=3D$host_cc" >> $config_host_mak - -tcg_tests_targets=3D -for target in $target_list; do - arch=3D${target%%-*} - - # reset all container fields - container_image=3D - container_hosts=3D - container_cross_cc=3D - container_cross_as=3D - container_cross_ld=3D - - # suppress clang - supress_clang=3D - - case $target in - aarch64-*) - # We don't have any bigendian build tools so we only use this for AA= rch64 - container_hosts=3D"x86_64 aarch64" - container_image=3Ddebian-arm64-cross - container_cross_cc=3Daarch64-linux-gnu-gcc-10 - ;; - alpha-*) - container_hosts=3Dx86_64 - container_image=3Ddebian-alpha-cross - container_cross_cc=3Dalpha-linux-gnu-gcc - ;; - arm-*) - # We don't have any bigendian build tools so we only use this for ARM - container_hosts=3D"x86_64 aarch64" - container_image=3Ddebian-armhf-cross - container_cross_cc=3Darm-linux-gnueabihf-gcc - ;; - cris-*) - container_hosts=3Dx86_64 - container_image=3Dfedora-cris-cross - container_cross_cc=3Dcris-linux-gnu-gcc - ;; - hexagon-*) - container_hosts=3Dx86_64 - container_image=3Ddebian-hexagon-cross - container_cross_cc=3Dhexagon-unknown-linux-musl-clang - ;; - hppa-*) - container_hosts=3Dx86_64 - container_image=3Ddebian-hppa-cross - container_cross_cc=3Dhppa-linux-gnu-gcc - ;; - i386-*) - container_hosts=3Dx86_64 - container_image=3Dfedora-i386-cross - container_cross_cc=3Dgcc - supress_clang=3Dyes - ;; - m68k-*) - container_hosts=3Dx86_64 - container_image=3Ddebian-m68k-cross - container_cross_cc=3Dm68k-linux-gnu-gcc - ;; - microblaze-*) - container_hosts=3Dx86_64 - container_image=3Ddebian-microblaze-cross - container_cross_cc=3Dmicroblaze-linux-musl-gcc - ;; - mips64el-*) - container_hosts=3Dx86_64 - container_image=3Ddebian-mips64el-cross - container_cross_cc=3Dmips64el-linux-gnuabi64-gcc - ;; - mips64-*) - container_hosts=3Dx86_64 - container_image=3Ddebian-mips64-cross - container_cross_cc=3Dmips64-linux-gnuabi64-gcc - ;; - mipsel-*) - container_hosts=3Dx86_64 - container_image=3Ddebian-mipsel-cross - container_cross_cc=3Dmipsel-linux-gnu-gcc - ;; - mips-*) - container_hosts=3Dx86_64 - container_image=3Ddebian-mips-cross - container_cross_cc=3Dmips-linux-gnu-gcc - ;; - nios2-*) - container_hosts=3Dx86_64 - container_image=3Ddebian-nios2-cross - container_cross_cc=3Dnios2-linux-gnu-gcc - ;; - ppc-*) - container_hosts=3Dx86_64 - container_image=3Ddebian-powerpc-test-cross - container_cross_cc=3Dpowerpc-linux-gnu-gcc-10 - ;; - ppc64-*|ppc64le-*) - container_hosts=3Dx86_64 - container_image=3Ddebian-powerpc-test-cross - container_cross_cc=3D${target%%-*}-linux-gnu-gcc-10 - container_cross_cc=3Dpowerpc${container_cross_cc#ppc} - ;; - riscv64-*) - container_hosts=3Dx86_64 - container_image=3Ddebian-riscv64-test-cross - container_cross_cc=3Driscv64-linux-gnu-gcc - ;; - s390x-*) - container_hosts=3Dx86_64 - container_image=3Ddebian-s390x-cross - container_cross_cc=3Ds390x-linux-gnu-gcc - ;; - sh4-*) - container_hosts=3Dx86_64 - container_image=3Ddebian-sh4-cross - container_cross_cc=3Dsh4-linux-gnu-gcc - ;; - sparc64-*) - container_hosts=3Dx86_64 - container_image=3Ddebian-sparc64-cross - container_cross_cc=3Dsparc64-linux-gnu-gcc - ;; - tricore-softmmu) - container_hosts=3Dx86_64 - container_image=3Ddebian-tricore-cross - container_cross_as=3Dtricore-as - container_cross_ld=3Dtricore-ld - ;; - x86_64-*) - container_hosts=3D"aarch64 ppc64el x86_64" - container_image=3Ddebian-amd64-cross - container_cross_cc=3Dx86_64-linux-gnu-gcc - supress_clang=3Dyes - ;; - xtensa*-softmmu) - container_hosts=3Dx86_64 - container_image=3Ddebian-xtensa-cross - - # default to the dc232b cpu - container_cross_cc=3D/opt/2020.07/xtensa-dc232b-elf/bin/xtensa-dc232= b-elf-gcc - ;; - esac - - config_target_mak=3Dtests/tcg/config-$target.mak - - echo "# Automatically generated by configure - do not modify" > $config_= target_mak - echo "TARGET_NAME=3D$arch" >> $config_target_mak - case $target in - *-softmmu) - test -f $source_path/tests/tcg/$arch/Makefile.softmmu-target || cont= inue - qemu=3D"qemu-system-$arch" - ;; - *-linux-user|*-bsd-user) - qemu=3D"qemu-$arch" - ;; - esac - - eval "target_compiler_cflags=3D\${cross_cc_cflags_$arch}" - - got_cross_cc=3Dno - - if eval test "x\"\${cross_cc_$arch}\"" !=3D xyes; then - eval "target_compiler=3D\"\${cross_cc_$arch}\"" - - if has $target_compiler; then - if test "$supress_clang" =3D yes && - $target_compiler --version | grep -qi "clang"; then - got_cross_cc=3Dno - else - write_c_skeleton - if ! do_compiler "$target_compiler" $target_compiler_cflags \ - -o $TMPE $TMPC -static ; then - # For host systems we might get away with building witho= ut -static - if do_compiler "$target_compiler" $target_compiler_cflag= s \ - -o $TMPE $TMPC ; then - got_cross_cc=3Dyes - echo "CC=3D$target_compiler" >> $config_target_mak - fi - else - got_cross_cc=3Dyes - echo "BUILD_STATIC=3Dy" >> $config_target_mak - echo "CC=3D$target_compiler" >> $config_target_mak - fi - fi - fi - - # Special handling for assembler only tests - eval "target_as=3D\"\${cross_as_$arch}\"" - eval "target_ld=3D\"\${cross_ld_$arch}\"" - if has $target_as && has $target_ld; then - case $target in - tricore-softmmu) - echo "AS=3D$target_as" >> $config_target_mak - echo "LD=3D$target_ld" >> $config_target_mak - got_cross_cc=3Dyes - ;; - esac - fi - fi - - if test $got_cross_cc =3D yes; then - # Test for compiler features for optional tests. We only do this - # for cross compilers because ensuring the docker containers based - # compilers is a requirememt for adding a new test that needs a - # compiler feature. - - case $target in - aarch64-*) - if do_compiler "$target_compiler" $target_compiler_cflags \ - -march=3Darmv8.1-a+sve -o $TMPE $TMPC; then - echo "CROSS_CC_HAS_SVE=3Dy" >> $config_target_mak - fi - if do_compiler "$target_compiler" $target_compiler_cflags \ - -march=3Darmv8.1-a+sve2 -o $TMPE $TMPC; then - echo "CROSS_CC_HAS_SVE2=3Dy" >> $config_target_mak - fi - if do_compiler "$target_compiler" $target_compiler_cflags \ - -march=3Darmv8.3-a -o $TMPE $TMPC; then - echo "CROSS_CC_HAS_ARMV8_3=3Dy" >> $config_target_mak - fi - if do_compiler "$target_compiler" $target_compiler_cflags \ - -mbranch-protection=3Dstandard -o $TMPE $TMPC= ; then - echo "CROSS_CC_HAS_ARMV8_BTI=3Dy" >> $config_target_mak - fi - if do_compiler "$target_compiler" $target_compiler_cflags \ - -march=3Darmv8.5-a+memtag -o $TMPE $TMPC; then - echo "CROSS_CC_HAS_ARMV8_MTE=3Dy" >> $config_target_mak - fi - ;; - ppc*) - if do_compiler "$target_compiler" $target_compiler_cflags \ - -mpower8-vector -o $TMPE $TMPC; then - echo "CROSS_CC_HAS_POWER8_VECTOR=3Dy" >> $config_target_= mak - fi - if do_compiler "$target_compiler" $target_compiler_cflags \ - -mpower10 -o $TMPE $TMPC; then - echo "CROSS_CC_HAS_POWER10=3Dy" >> $config_target_mak - fi - ;; - i386-linux-user) - if do_compiler "$target_compiler" $target_compiler_cflags \ - -Werror -fno-pie -o $TMPE $TMPC; then - echo "CROSS_CC_HAS_I386_NOPIE=3Dy" >> $config_target_mak - fi - ;; - esac - elif test $got_cross_cc =3D no && test "$container" !=3D no && \ - test -n "$container_image"; then - for host in $container_hosts; do - if test "$host" =3D "$cpu"; then - echo "build-tcg-tests-$target: docker-image-$container_image= " >> $makefile - echo "BUILD_STATIC=3Dy" >> $config_target_mak - echo "CC=3D\$(DOCKER_SCRIPT) cc --cc $container_cross_cc -i = qemu/$container_image -s $source_path --" >> $config_target_mak - if test -n "$container_cross_as"; then - echo "AS=3D\$(DOCKER_SCRIPT) cc --cc $container_cross_as= -i qemu/$container_image -s $source_path --" >> $config_target_mak - fi - if test -n "$container_cross_ld"; then - echo "LD=3D\$(DOCKER_SCRIPT) cc --cc $container_cross_ld= -i qemu/$container_image -s $source_path --" >> $config_target_mak - fi - case $target in - aarch64-*) - echo "CROSS_CC_HAS_SVE=3Dy" >> $config_target_mak - echo "CROSS_CC_HAS_SVE2=3Dy" >> $config_target_mak - echo "CROSS_CC_HAS_ARMV8_3=3Dy" >> $config_target_mak - echo "CROSS_CC_HAS_ARMV8_BTI=3Dy" >> $config_target_= mak - echo "CROSS_CC_HAS_ARMV8_MTE=3Dy" >> $config_target_= mak - ;; - ppc*) - echo "CROSS_CC_HAS_POWER8_VECTOR=3Dy" >> $config_tar= get_mak - echo "CROSS_CC_HAS_POWER10=3Dy" >> $config_target_mak - ;; - i386-linux-user) - echo "CROSS_CC_HAS_I386_NOPIE=3Dy" >> $config_target= _mak - ;; - esac - got_cross_cc=3Dyes - break - fi - done - fi - if test $got_cross_cc =3D yes; then - mkdir -p tests/tcg/$target - echo "QEMU=3D$PWD/$qemu" >> $config_target_mak - echo "EXTRA_CFLAGS=3D$target_compiler_cflags" >> $config_target_mak - echo "run-tcg-tests-$target: $qemu\$(EXESUF)" >> $makefile - tcg_tests_targets=3D"$tcg_tests_targets $target" - fi -done -echo "TCG_TESTS_TARGETS=3D$tcg_tests_targets" >> $makefile --=20 2.36.0 From nobody Sun Apr 28 21:22:02 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=1652781237; cv=none; d=zohomail.com; s=zohoarc; b=dfq6nLANpNaLsbYKjVb7gxehSIXOK5ACM3M3A4qSq/Su6AQtcaqqpHb6+sVIgDZ0nOuMJWVssrcOodASUMEb6I9RwmMfM5chMXm56vM7KIcXDiiGF5U5FTgeHxBi71OQZUbWXK8Fpq0/y2J51dW/uDhKoNusxr8WSgV8LFs/izM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652781237; 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=Hshat3Eo9CmcRJ8QLwild97BK5cAhoxPxYvBPFkFfJ4=; b=kotBMbfhW+5QwxEssfct8shYQ1oZcn+mBRML0ENtVM3bYat6m/EHjZ6cVErDnWwiDuvEy0a+bsSZBpn6tfvwph6Lzznz0JJTZ88Oeb0B77CKObh2+09mtxhHAiTJ65k+Cke2GD0RFSYdQm4x7453wjJ0A9n7W99aEthdntF40Q8= 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 1652781237081625.255184567107; Tue, 17 May 2022 02:53:57 -0700 (PDT) Received: from localhost ([::1]:59046 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqtts-0000xK-22 for importer@patchew.org; Tue, 17 May 2022 05:53:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37492) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqtTq-0000Ep-Ee for qemu-devel@nongnu.org; Tue, 17 May 2022 05:27:02 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:50194) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqtTe-0003er-VR for qemu-devel@nongnu.org; Tue, 17 May 2022 05:26:52 -0400 Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-675-TEfnwveiOzC3hS2Y_bAqSQ-1; Tue, 17 May 2022 05:26:41 -0400 Received: by mail-ed1-f72.google.com with SMTP id n7-20020a05640206c700b0042aaeb9d702so3882862edy.19 for ; Tue, 17 May 2022 02:26:41 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id h9-20020a50cdc9000000b0042617ba63d5sm6699153edj.95.2022.05.17.02.26.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 May 2022 02:26:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652779610; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Hshat3Eo9CmcRJ8QLwild97BK5cAhoxPxYvBPFkFfJ4=; b=G1giEzwaPB107lKG1Da/dn0pgzEy7jcQUu9xtsM0niGROlcCmuk3SuFfGVUy0YQ2rG9vnU iUu6MAvFzRpeb7rs5litb7C+nYVn4upT032wfhYe1vax9xJ9w37tnr0hdsiz4OXrz7lK+m tTYTaW7lan1jZxRakr1Uk7vcze/ZaAI= X-MC-Unique: TEfnwveiOzC3hS2Y_bAqSQ-1 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=Hshat3Eo9CmcRJ8QLwild97BK5cAhoxPxYvBPFkFfJ4=; b=hPl5sAeMwkImL8ZCX3p3nYnIGb2phK1XxvWNn99DqxcLcRrUcOIqNfod1AdRHc0ZGS SgiHQ4vUwCOiWoK5bXPF+z1I97ANbWM06zUJ27hOYdqWNVBXycBieueByn621hdXM6b3 3o5EVhWIVPDOikkn2JQbG5rumTFAJVyprMwVkzPhDbdP3khQHToCMYS4jWAMDdF+qOCI qPwuF1vV3cYpyrYKc1meJ0Pm3l3ZDualswg5hdbgHsnVbgCpX1vUMMeKnVAF7QpYR7Pe m8eycWHLslJizVUjrl+w28WOuVTG4RwoYxeNNK1xjVUD9ATnrKPsJekS9ed6Zhp5FC6D f2hg== X-Gm-Message-State: AOAM533GtzrW4cP6RX5XEoitQrZeQNIb58HO98x8rUbT76Igh8KrJFjn 57aEQP0GWu932FNr4MtaICC9NhapBPyYzN8zm0Ksww3SZY7P1T1OLVgmzk/fPfvsEj+/JHnGro7 7sUFCA3+8sXozdzmteWiRuOBVRY9GAWLrfqJ3IHgf3qTBIt/QYJW77ificVlakWQ1/oE= X-Received: by 2002:a05:6402:741:b0:42a:8fad:8f67 with SMTP id p1-20020a056402074100b0042a8fad8f67mr15682005edy.285.1652779600010; Tue, 17 May 2022 02:26:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxTVMdKCV1Wq0+RGk3kdgnjotTKsbG1wDs8bw+xGhk6pK2gAVn8pFb1CPbCz/OkR0Ep4GwJRw== X-Received: by 2002:a05:6402:741:b0:42a:8fad:8f67 with SMTP id p1-20020a056402074100b0042a8fad8f67mr15681981edy.285.1652779599738; Tue, 17 May 2022 02:26:39 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, richard.henderson@linaro.org Subject: [PATCH 08/16] configure: add missing cross compiler fallbacks Date: Tue, 17 May 2022 11:26:08 +0200 Message-Id: <20220517092616.1272238-9-pbonzini@redhat.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220517092616.1272238-1-pbonzini@redhat.com> References: <20220517092616.1272238-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.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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 @redhat.com) X-ZM-MESSAGEID: 1652781239172100001 Content-Type: text/plain; charset="utf-8" The arm compiler can be used for armeb, and the sparc64 compiler can be used for sparc. Signed-off-by: Paolo Bonzini Reviewed-by: Richard Henderson --- configure | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 90cb477c90..1d9d60185c 100755 --- a/configure +++ b/configure @@ -1840,6 +1840,7 @@ fi : ${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"} @@ -1862,9 +1863,10 @@ fi : ${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_cflags_sparc=3D"-m32 -mcpu=3Dsupersparc"} : ${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 --=20 2.36.0 From nobody Sun Apr 28 21:22:02 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=1652780972; cv=none; d=zohomail.com; s=zohoarc; b=fZFM58I1fNHeVzKfX22m4NZXoENMuz6W/2uPWl8XJA0lNPgwkECwvLtyBFc7cmtqKWA8wZ7NWIdN/5xSpn5345gD9Kj+2x/s8d5fghXH90l8U/vzLq91iQd/hqpp6RPhKF9hjzey2+Np1OK3Tg75sDRbAl7TYZm1Umj7gvQH6Hw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652780972; 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=xrNzp6VGsRlwSzSjxZKBmcUnUnmc5346uqDi9fT1Kgw=; b=XMGntrVx8eM8GpabHuNH+duSxD4Ji2EM8T9SZaJT45xxCw50cYTYIpwvtOQ88kOueubMRiT69MUasKOWMj1nfa/Po1ycDByDWzjTNywKKlEkUFEoh1fPGdlRhoBz87npDhgKunAfx+3Bb475HAbuMKUW3VBSbVu6ja8xeP58xco= 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 1652780972794944.7472688686809; Tue, 17 May 2022 02:49:32 -0700 (PDT) Received: from localhost ([::1]:51304 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqtpb-0003xR-2l for importer@patchew.org; Tue, 17 May 2022 05:49:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37422) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqtTa-0008UN-8M for qemu-devel@nongnu.org; Tue, 17 May 2022 05:26:47 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:54772) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqtTY-0003bI-Kl for qemu-devel@nongnu.org; Tue, 17 May 2022 05:26:45 -0400 Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-191-vFcAyu-iM_GJD0uWQMcx5A-1; Tue, 17 May 2022 05:26:42 -0400 Received: by mail-ej1-f69.google.com with SMTP id go17-20020a1709070d9100b006f46e53a2a9so7054830ejc.10 for ; Tue, 17 May 2022 02:26:42 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id 9-20020a170906020900b006f3ef214e62sm809895ejd.200.2022.05.17.02.26.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 May 2022 02:26:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652779604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xrNzp6VGsRlwSzSjxZKBmcUnUnmc5346uqDi9fT1Kgw=; b=NDSqm0T7o+Ag+DVoIB2M3ElqaQZE/PvSuyygR3AaCdoiloXRCn9OiaG7XlUiUhSDgrAhBo UYplcJJHSDWSKblul0wc6PueixgPkmGiy7moiyMBUekrIDEjO7W3yD7QIrMP9QNrscvxby jBCzglLeJrPh10R3eg6gBWm682eKyKQ= X-MC-Unique: vFcAyu-iM_GJD0uWQMcx5A-1 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=xrNzp6VGsRlwSzSjxZKBmcUnUnmc5346uqDi9fT1Kgw=; b=OvwiRC2YSG5MvqyLK7VRqZUB1FEqTpJ5jFUOIKQMqjKYfT1cRdfC7gYA6RhK63Ytt8 iLVIJgG0PMFI902+w+Q3DkDTlr4UooFbYZw6mEyy4ce5PQxfs4gklc8SDn4YMvBjo7tT s3HBq6LDMCW6JPQyWiX+DLx8YDSX3xpnmKVOZEDqFJ7g6njngsoiVxpuwxg1p0jX36TL hT2XUyqFJDTEjfIrRndXaa4f06WNEU1DCap3vwsjtIpqUKODhASMkp6lPKn8feoluoqe rjfOO43ZC+sOofo8SoBdnv75UKUmOJ8VRJHV3zFGqimBU6NizU91bgfh+ae99LEKsalI JRcA== X-Gm-Message-State: AOAM533x04bHquPxoA3qDZVElayuzlCUUPobYjXj8/5Xzh1fRLzfVPN0 RnFLgdKsvqogOFE8zyeFihE6RtYVQl8QyHBmldZy1QtY33uAk3kqt/DZTW8A6SgqtWjRhSMYuZm HqOtor5TU70wuK2xYgHGJkb203Guc4Tk5i/rWFYhDLHXpQfscdt/TMn97PI7lCM/axS8= X-Received: by 2002:a50:cd08:0:b0:426:1d9b:4b13 with SMTP id z8-20020a50cd08000000b004261d9b4b13mr17691633edi.360.1652779601490; Tue, 17 May 2022 02:26:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx7t62+IckN42XQlZhIO7xu3h97z8cpA7gPQm0/hLGWXVqWZe3L5rS+DYe4oCaVDSBza5poug== X-Received: by 2002:a50:cd08:0:b0:426:1d9b:4b13 with SMTP id z8-20020a50cd08000000b004261d9b4b13mr17691617edi.360.1652779601291; Tue, 17 May 2022 02:26:41 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, richard.henderson@linaro.org Subject: [PATCH 09/16] configure: handle host compiler in probe_target_compiler Date: Tue, 17 May 2022 11:26:09 +0200 Message-Id: <20220517092616.1272238-10-pbonzini@redhat.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220517092616.1272238-1-pbonzini@redhat.com> References: <20220517092616.1272238-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.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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 @redhat.com) X-ZM-MESSAGEID: 1652780973707100001 Content-Type: text/plain; charset="utf-8" In preparation for handling more binaries than just cc, handle the case of "probe_target_compiler $cpu" directly in the function, setting the target_* variables based on the ones that are used to build QEMU. The clang check also needs to be moved after this fallback. Signed-off-by: Paolo Bonzini Reviewed-by: Richard Henderson --- configure | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/configure b/configure index 1d9d60185c..016df3fa6e 100755 --- a/configure +++ b/configure @@ -964,10 +964,6 @@ case $git_submodules_action in ;; esac =20 -if eval test -z "\${cross_cc_$cpu}"; then - eval "cross_cc_${cpu}=3D\$cc" -fi - default_target_list=3D"" mak_wilds=3D"" =20 @@ -2021,13 +2017,6 @@ probe_target_compiler() { if eval test -n "\"\${cross_cc_$1}\""; then if eval has "\"\${cross_cc_$1}\""; then eval "target_cc=3D\"\${cross_cc_$1}\"" - case $1 in - i386|x86_64) - if $target_cc --version | grep -qi "clang"; then - unset target_cc - fi - ;; - esac fi fi if eval test -n "\"\${cross_as_$1}\""; then @@ -2040,6 +2029,20 @@ probe_target_compiler() { eval "target_ld=3D\"\${cross_ld_$1}\"" fi fi + if test "$1" =3D $cpu; then + : ${target_cc:=3D$cc} + : ${target_as:=3D$as} + : ${target_ld:=3D$ld} + fi + if test -n "$target_cc"; then + case $1 in + i386|x86_64) + if $target_cc --version | grep -qi "clang"; then + unset target_cc + fi + ;; + esac + fi } =20 write_target_makefile() { --=20 2.36.0 From nobody Sun Apr 28 21:22:02 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=1652780687; cv=none; d=zohomail.com; s=zohoarc; b=Ii/Wby54Sq1P7ubpG04A3YnQ23l+3InbijkoBZ/GDvkTE1j9UDD+E3FSjNUVxFrEMJl72JKmUu4yxUhU7cErHq3plN9XHOEAob7duDY0qDdDEHCVNcatAOjYY5ZzCcaG0PMYHZBf6AJ3Nq/aoITQRiNQV+wYXhnk4T8OK9BldhA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652780687; 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=VRIv/sD9m9Wh+4mN4HqaTQ3ASdMZGgWBoT8WPCbxu/o=; b=IJzbGEwlPbHyS9MShnoit5Deo1l+50GPFjj7e1bCvhW235mO1LcEVxlidDD22tsiO+0JLF9KEfLtymkFf5QK2FD1qQzn81EFcbslhL8/a4VgwTzrEumONniqfkx4ga6+NV/PxPk8OC1eHjFeK66i6xDHhyF3McijEnZO8m8UwxM= 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 1652780687225361.3764316587399; Tue, 17 May 2022 02:44:47 -0700 (PDT) Received: from localhost ([::1]:43620 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqtkz-00070l-Tl for importer@patchew.org; Tue, 17 May 2022 05:44:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37448) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqtTe-00005p-Vo for qemu-devel@nongnu.org; Tue, 17 May 2022 05:26:51 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:21440) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqtTc-0003dw-Tt for qemu-devel@nongnu.org; Tue, 17 May 2022 05:26:50 -0400 Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-35-NE9_w6WtPza3qYseaeCDow-1; Tue, 17 May 2022 05:26:45 -0400 Received: by mail-ej1-f69.google.com with SMTP id oz9-20020a1709077d8900b006f3d9488090so7062282ejc.6 for ; Tue, 17 May 2022 02:26:45 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id y21-20020a056402171500b0042617ba639esm6530534edu.40.2022.05.17.02.26.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 May 2022 02:26:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652779608; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VRIv/sD9m9Wh+4mN4HqaTQ3ASdMZGgWBoT8WPCbxu/o=; b=LSEUa5W3Y6JDBm0hzZzFNj9rpLIqEfQZK3SdPdUSIKZ8Zvoabdr2DlNCj0ZAYTlWfUQR71 hf+cv+eZnl2BnGkkBDNlcaEFDDO6bPYAKSpF6jHavmKpL9MvSXr7oor7oiorqy9fFENRdE RMTcyxAPNMC36waLNSPAycnCKb6qWas= X-MC-Unique: NE9_w6WtPza3qYseaeCDow-1 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=VRIv/sD9m9Wh+4mN4HqaTQ3ASdMZGgWBoT8WPCbxu/o=; b=VS/5tZPJRPvrIsGBCZt0fBPS9NHO9Y2ZA3y+MwsXMaFDTZ7Y7oMTdvSi+zikbtRVlN uYt+xtNEnAbcm5q67dso4AX7mysL7y+zqs931TWV4Gjhj+meUYkqd4xuRHYlFIaGRGPR xcNplZhtBECNP2vAE2is5I13VKPHEnSsZrJjwVE0J70awY6CkUSfXV8dwN1DnK+0Zifj aCQbq9n6iHHVNaiwUXlXhr/Ld5Ts7+AcKCHSue87HQz0hltghmNMW3DUm7vrlhRX0Xwq qnSD5lDmWY6xdhVz/BWXdCW4YxpA/hdkjL4uncfjCl28XJB2ER4nBexUw3JmGHrGuQ/L j53Q== X-Gm-Message-State: AOAM532brfWYbda1FWxtBURxjjD7c7TcdTnekLXYlI3111HA4LwZwJep TRHwcZG85D33RcWGF8naQXpdmqhSGIXDLMBfPRpbhuhlkwOWQhQoCxIzU8A6cqwkRhVCEfh9Kf1 ocTE5byJur2WChBOABVo63ulLSLETlM7JmVw+sNmVW88+ncQgManUceDA6NYcDWJW6Ns= X-Received: by 2002:a17:906:dc8a:b0:6f9:13e9:4c87 with SMTP id cs10-20020a170906dc8a00b006f913e94c87mr18539334ejc.729.1652779603657; Tue, 17 May 2022 02:26:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwNewSSzTR8NvKKvRQ463TmgkNACCC7wE1648FoJ3LPKXgIsboXz+aTutu1gPslW4dkygZl+A== X-Received: by 2002:a17:906:dc8a:b0:6f9:13e9:4c87 with SMTP id cs10-20020a170906dc8a00b006f913e94c87mr18539310ejc.729.1652779603313; Tue, 17 May 2022 02:26:43 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, richard.henderson@linaro.org Subject: [PATCH 10/16] configure: introduce --cross-prefix-*= Date: Tue, 17 May 2022 11:26:10 +0200 Message-Id: <20220517092616.1272238-11-pbonzini@redhat.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220517092616.1272238-1-pbonzini@redhat.com> References: <20220517092616.1272238-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.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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 @redhat.com) X-ZM-MESSAGEID: 1652780687790100001 Content-Type: text/plain; charset="utf-8" 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 --- configure | 137 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 77 insertions(+), 60 deletions(-) diff --git a/configure b/configure index 016df3fa6e..ee4fcdacfe 100755 --- a/configure +++ b/configure @@ -365,6 +365,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 @@ -730,6 +735,8 @@ for opt do ;; --cross-cc-*) ;; + --cross-prefix-*) + ;; --enable-debug-info) meson_option_add -Ddebug=3Dtrue ;; --disable-debug-info) meson_option_add -Ddebug=3Dfalse @@ -1026,6 +1033,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] @@ -1831,44 +1839,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 @@ -1914,93 +1932,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? @@ -2008,9 +2032,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}" @@ -2018,17 +2045,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} @@ -2061,12 +2082,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.36.0 From nobody Sun Apr 28 21:22:02 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=1652780988; cv=none; d=zohomail.com; s=zohoarc; b=gdNP7Gv8sqzVUd2d0uYnmB4BFK5xIIPUPyXyhlgRSdyreAsa8dTGvs7VUkwz2TyUbAh0vd3piijhVD4+dF1/qRZg4Rv0chs6wml6EXLR/ydF0KICyWbu/XXeaFQVIkRVbthg3bOQWb6zkNzgIdRfRUPLdyqebxcUB6UG9tjfZm0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652780988; 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=M2ulbuc2KaZH0veRnZxBkz6cgsAU+5K3oYUwI58WvS8=; b=FZRfQxbGGiKlu6qLVDJZ3zn/l+I7WG9MrATfkbOZgctf9nlHft4gXlGJHymxRggdyGjvgD8yl9PNYXaauXv/ZtN4UkNlKCnwBcJGyl9i5NbhRY3n1fVt5thImiWm6/k8bRUZIt0sswgpb/VGngqZI3JCfRXC+bhNoLSQGbuiD9U= 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 1652780988501442.54443645793333; Tue, 17 May 2022 02:49:48 -0700 (PDT) Received: from localhost ([::1]:51660 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqtpq-0004Bf-T5 for importer@patchew.org; Tue, 17 May 2022 05:49:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37462) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqtTf-00006F-QU for qemu-devel@nongnu.org; Tue, 17 May 2022 05:26:51 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:48874) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqtTe-0003eC-1S for qemu-devel@nongnu.org; Tue, 17 May 2022 05:26:51 -0400 Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-578-Vs-1HRweNQ6lvrcii6U3ng-1; Tue, 17 May 2022 05:26:48 -0400 Received: by mail-ej1-f71.google.com with SMTP id jx8-20020a170906ca4800b006f88b28f2f6so7058185ejb.11 for ; Tue, 17 May 2022 02:26:48 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id k14-20020aa7c04e000000b0042a5a39ba7esm5739348edo.25.2022.05.17.02.26.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 May 2022 02:26:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652779609; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=M2ulbuc2KaZH0veRnZxBkz6cgsAU+5K3oYUwI58WvS8=; b=Gm0Rm03AIY/HnB9h95oX3TkT7ygvidrgkGCgkvN9NO3sKi20lp64MqrGHnvs4KheOW28tU kGkvpOrVLe8hQjlOj94CUDM3HwoN/EyzRNCJFMMtSHcsRg6zdY7Zp7A/7jjY0+QAPF2UjW DS/nQM7pvS72t5hRC+K+PM9RIOUz0a8= X-MC-Unique: Vs-1HRweNQ6lvrcii6U3ng-1 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=M2ulbuc2KaZH0veRnZxBkz6cgsAU+5K3oYUwI58WvS8=; b=WqEl1djO9AgjXOJkfxQSUcgmp1M/ztrOA4vctLlWPT0re1YBLXbdfk5sH8Z1mTZte3 iosON9zknrxpZ06iG/zgtPD8Kysxh5OgO2PX/8Ma/sjmYp4dIK3S3psQx6fYSxDmgUsb LxVQEH54dE92aW656vHj7FXK0+5nj/TH51i0VkGL7qPSq8UnIlAH8M8238ayN0fL8ggT 3Upoo7Os8PyXT6CcrsFgn8mJhl431Mg6ShVQHbgAmlIk8n6tTvS6NKGcv6FfTZS3jIxL kONQjTlybR8MUCen3nukBTqM5jifH2jhxEJ+hH/IBXxdZQhuGtMvD+Jw6qZAZU12qJKH 9aZA== X-Gm-Message-State: AOAM533NnHrBsvrCC9IisgjMgQ/nDCHRsEqAaR1Oe6E9eo72VmpLgPa4 AwdQ0OuEXQ0xxCpoPEUMBcjiXNn8qqGQ8zvANKQkZLiuPHwL7lq+iNgZ+KVbirgxU+YhXpwEqcx 1pi8zX3EH4PbyCNx8BEHI9YAwMymCoX3bJIlNKG5no5CBlItorb/8vTeA0C82ThoN7tE= X-Received: by 2002:a05:6402:5298:b0:42a:cb63:5d10 with SMTP id en24-20020a056402529800b0042acb635d10mr1255340edb.415.1652779606835; Tue, 17 May 2022 02:26:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxRjCcQpH30/i7HLm8cNKaF4CXCCbY++6yhfDCibFnZWZPhQ/yDk+QHwWjkzL0zInBEdqEpjA== X-Received: by 2002:a05:6402:5298:b0:42a:cb63:5d10 with SMTP id en24-20020a056402529800b0042acb635d10mr1255321edb.415.1652779606616; Tue, 17 May 2022 02:26:46 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, richard.henderson@linaro.org Subject: [PATCH 11/16] configure: include more binutils in tests/tcg makefile Date: Tue, 17 May 2022 11:26:11 +0200 Message-Id: <20220517092616.1272238-12-pbonzini@redhat.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220517092616.1272238-1-pbonzini@redhat.com> References: <20220517092616.1272238-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: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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 @redhat.com) X-ZM-MESSAGEID: 1652780989699100002 Content-Type: text/plain; charset="utf-8" Firmware builds require paths to all the binutils; it is not enough to use only cc, or even as/ld as in the case of tests/tcg/tricore. Adjust the cross-compiler configurator to detect also ar, nm, objcopy, ranlib and strip. Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini --- configure | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/configure b/configure index ee4fcdacfe..5db0082ddc 100755 --- a/configure +++ b/configure @@ -1893,11 +1893,21 @@ probe_target_compiler() { container_image=3D container_hosts=3D container_cross_cc=3D + container_cross_ar=3D container_cross_as=3D container_cross_ld=3D + container_cross_nm=3D + container_cross_objcopy=3D + container_cross_ranlib=3D + container_cross_strip=3D target_cc=3D + target_ar=3D target_as=3D target_ld=3D + target_nm=3D + target_objcopy=3D + target_ranlib=3D + target_strip=3D =20 case $1 in aarch64) container_hosts=3D"x86_64 aarch64" ;; @@ -2036,8 +2046,13 @@ probe_target_compiler() { ;; esac : ${container_cross_cc:=3D${container_cross_prefix}gcc} + : ${container_cross_ar:=3D${container_cross_prefix}ar} : ${container_cross_as:=3D${container_cross_prefix}as} : ${container_cross_ld:=3D${container_cross_prefix}ld} + : ${container_cross_nm:=3D${container_cross_prefix}nm} + : ${container_cross_objcopy:=3D${container_cross_prefix}objcopy} + : ${container_cross_ranlib:=3D${container_cross_prefix}ranlib} + : ${container_cross_strip:=3D${container_cross_prefix}strip} done =20 eval "target_cflags=3D\${cross_cc_cflags_$1}" @@ -2048,12 +2063,26 @@ probe_target_compiler() { else compute_target_variable $1 target_cc gcc fi + target_ccas=3D$target_cc + compute_target_variable $1 target_ar ar compute_target_variable $1 target_as as compute_target_variable $1 target_ld ld + compute_target_variable $1 target_nm nm + compute_target_variable $1 target_objcopy objcopy + compute_target_variable $1 target_ranlib ranlib + compute_target_variable $1 target_strip strip if test "$1" =3D $cpu; then : ${target_cc:=3D$cc} + : ${target_ccas:=3D$ccas} : ${target_as:=3D$as} : ${target_ld:=3D$ld} + : ${target_ar:=3D$ar} + : ${target_as:=3D$as} + : ${target_ld:=3D$ld} + : ${target_nm:=3D$nm} + : ${target_objcopy:=3D$objcopy} + : ${target_ranlib:=3D$ranlib} + : ${target_strip:=3D$strip} fi if test -n "$target_cc"; then case $1 in @@ -2069,6 +2098,10 @@ probe_target_compiler() { write_target_makefile() { if test -n "$target_cc"; then echo "CC=3D$target_cc" + echo "CCAS=3D$target_ccas" + fi + if test -n "$target_ar"; then + echo "AR=3D$target_ar" fi if test -n "$target_as"; then echo "AS=3D$target_as" @@ -2076,14 +2109,32 @@ write_target_makefile() { if test -n "$target_ld"; then echo "LD=3D$target_ld" fi + if test -n "$target_nm"; then + echo "NM=3D$target_nm" + fi + if test -n "$target_objcopy"; then + echo "OBJCOPY=3D$target_objcopy" + fi + if test -n "$target_ranlib"; then + echo "RANLIB=3D$target_ranlib" + fi + if test -n "$target_strip"; then + echo "STRIP=3D$target_strip" + fi } =20 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 --" + echo "CCAS=3D\$(DOCKER_SCRIPT) cc --cc $container_cross_cc -i qemu/$co= ntainer_image -s $source_path --" fi + echo "AR=3D\$(DOCKER_SCRIPT) cc --cc $container_cross_ar -i qemu/$contai= ner_image -s $source_path --" 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 --" + echo "NM=3D\$(DOCKER_SCRIPT) cc --cc $container_cross_nm -i qemu/$contai= ner_image -s $source_path --" + echo "OBJCOPY=3D\$(DOCKER_SCRIPT) cc --cc $container_cross_objcopy -i qe= mu/$container_image -s $source_path --" + echo "RANLIB=3D\$(DOCKER_SCRIPT) cc --cc $container_cross_ranlib -i qemu= /$container_image -s $source_path --" + echo "STRIP=3D\$(DOCKER_SCRIPT) cc --cc $container_cross_strip -i qemu/$= container_image -s $source_path --" } =20 =20 --=20 2.36.0 From nobody Sun Apr 28 21:22:02 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=1652780840; cv=none; d=zohomail.com; s=zohoarc; b=SVNMVtXSknSkp1ynfleSlp3jTBrpD7dcBL6ET0YBXTTxX1IW+rdqlC5SchjQ1BRG8rKhVcBPQWBxFXEE0nXuK3KcXmw9NQMI8TWZ6N+wqe6b2BQVIZ1+MOoYT7iV5qvP5GgsIqneqZ+GaqlSpP88kmEKxby111xqWNVX/sZOvQ8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652780840; 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=SFQ1xQgSmcMha81R6gI1HzNhrYejEQ7lol5HB06VvyU=; b=M9pZsJ02YjP5Lir9Ye5CS/rzofwm26aHfF9jW3bv70I+viSHrIH0A8OgPnluEXDJmyg7zzv3EsAka28R3PmH85FsPReFkJgcpOPv/5cPZRMVZZHC1Eizof7a7V2l85/BWWT1zM8e3PKOntqNOBvTwWVqYZg4ULi8RfU1OA6lINY= 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 165278084023290.63807702620466; Tue, 17 May 2022 02:47:20 -0700 (PDT) Received: from localhost ([::1]:46670 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqtnT-0000eV-2z for importer@patchew.org; Tue, 17 May 2022 05:47:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37526) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqtTr-0000LA-Sn for qemu-devel@nongnu.org; Tue, 17 May 2022 05:27:03 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:37172) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqtTl-0003gP-Fg for qemu-devel@nongnu.org; Tue, 17 May 2022 05:27:03 -0400 Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-640-lLFVq0mHMZqyUc6tqwHJOg-1; Tue, 17 May 2022 05:26:50 -0400 Received: by mail-ej1-f69.google.com with SMTP id v13-20020a170906b00d00b006f51e289f7cso6983767ejy.19 for ; Tue, 17 May 2022 02:26:50 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id zp8-20020a17090684e800b006f3ef214e2csm819817ejb.146.2022.05.17.02.26.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 May 2022 02:26:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652779611; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SFQ1xQgSmcMha81R6gI1HzNhrYejEQ7lol5HB06VvyU=; b=dowJfjxp+AhKVUhaHUX+gH4GNjsPInKsD7OmWTAKdwy5VZz9U1mGx0nrtyZj5Ecqk4teAO sN2KCVmXwCfBeH7aqr2QCCtU+1I5MpeZA5P2iufaot5Uc1teO90Ftj3SOXenFaRGXUQ0s5 eXPHgUn3gzfRQEarS+VYFVDx1xokPMI= X-MC-Unique: lLFVq0mHMZqyUc6tqwHJOg-1 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=SFQ1xQgSmcMha81R6gI1HzNhrYejEQ7lol5HB06VvyU=; b=A4UtvDl+RgCqcGFwwSqUJrGcGFBZNOlWh8RjxVuGVgTRTYWmurB5Pdyc13l5qayAfs yD8tOX58fJ5tYZdR79t3RIqEY67lkHKsh9V5X0n5xavrnWReVs0tt4+B9QItY4ww6056 wWy/8+TCyCA8OITGQp8hH++onVVqDQWZ0BFTp710SyPUYeraJcHDOUi8k7UJ/xiYe8F2 ydvTEAxeO4xDBt6OoRIZvsBbY6Jevk58S4HES1xIm/DjUoOV4x+aQV4c3TSBEjk2DWOM /u4g6QhG0lphk09wkr7KKfOrE81mpS37RlLwuJ5PxVC0MJOvKXK90B8CnMWS/2/qsupd /oiQ== X-Gm-Message-State: AOAM532NBPLPAk1hNPj4pmOJIG1dTyldU8W6Sn9Y4QQE77xHc5d3rQtK x5VikNzYtfgBULNK+D0EDHb0x25eIjs0Gs1XtJ0cbVtzqGMj2q1wL/tmxVu/xb/E5nZkBXzHDI4 O50m5IZoov4F+2cm4/nPALEhYYmJg95UaH2ZHT1TEEarCJm8evcpNZubk1tIKJyGJ6hc= X-Received: by 2002:a05:6402:5202:b0:427:f1a2:305c with SMTP id s2-20020a056402520200b00427f1a2305cmr17548171edd.39.1652779608936; Tue, 17 May 2022 02:26:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzlTbq6iwVy3Ym/I1wCYpBn1NBeHAaqLiyo/kHX4lri6Xkw8++wADi5IZ/MYo8KUXUKmA3MHA== X-Received: by 2002:a05:6402:5202:b0:427:f1a2:305c with SMTP id s2-20020a056402520200b00427f1a2305cmr17548144edd.39.1652779608601; Tue, 17 May 2022 02:26:48 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, richard.henderson@linaro.org Subject: [PATCH 12/16] configure: move symlink configuration earlier Date: Tue, 17 May 2022 11:26:12 +0200 Message-Id: <20220517092616.1272238-13-pbonzini@redhat.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220517092616.1272238-1-pbonzini@redhat.com> References: <20220517092616.1272238-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: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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 @redhat.com) X-ZM-MESSAGEID: 1652780841228100001 Content-Type: text/plain; charset="utf-8" Ensure that the pc-bios/optionrom and pc-bios/s390-ccw directory exist at the time when we'll write out the compiler configuration for them. Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini --- configure | 49 ++++++++++++++++++++++++------------------------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/configure b/configure index 5db0082ddc..cf439e2deb 100755 --- a/configure +++ b/configure @@ -2205,6 +2205,30 @@ fi =20 QEMU_GA_MSI_MINGW_BIN_PATH=3D"$($pkg_config --variable=3Dprefix glib-2.0)/= bin" =20 +# Set up build tree symlinks that point back into the source tree +# (these can be both files and directories). +# Caution: avoid adding files or directories here using wildcards. This +# will result in problems later if a new file matching the wildcard is +# added to the source tree -- nothing will cause configure to be rerun +# so the build tree will be missing the link back to the new file, and +# tests might fail. Prefer to keep the relevant files in their own +# directory and symlink the directory instead. +LINKS=3D"Makefile" +LINKS=3D"$LINKS tests/tcg/Makefile.target" +LINKS=3D"$LINKS pc-bios/optionrom/Makefile" +LINKS=3D"$LINKS pc-bios/s390-ccw/Makefile" +LINKS=3D"$LINKS .gdbinit scripts" # scripts needed by relative path in .gd= binit +LINKS=3D"$LINKS tests/avocado tests/data" +LINKS=3D"$LINKS tests/qemu-iotests/check" +LINKS=3D"$LINKS python" +LINKS=3D"$LINKS contrib/plugins/Makefile " +for f in $LINKS ; do + if [ -e "$source_path/$f" ]; then + mkdir -p `dirname ./$f` + symlink "$source_path/$f" "$f" + fi +done + # Mac OS X ships with a broken assembler roms=3D if { test "$cpu" =3D "i386" || test "$cpu" =3D "x86_64"; } && \ @@ -2423,31 +2447,6 @@ if test "$safe_stack" =3D "yes"; then echo "CONFIG_SAFESTACK=3Dy" >> $config_host_mak fi =20 -# If we're using a separate build tree, set it up now. -# LINKS are things to symlink back into the source tree -# (these can be both files and directories). -# Caution: do not add files or directories here using wildcards. This -# will result in problems later if a new file matching the wildcard is -# added to the source tree -- nothing will cause configure to be rerun -# so the build tree will be missing the link back to the new file, and -# tests might fail. Prefer to keep the relevant files in their own -# directory and symlink the directory instead. -LINKS=3D"Makefile" -LINKS=3D"$LINKS tests/tcg/Makefile.target" -LINKS=3D"$LINKS pc-bios/optionrom/Makefile" -LINKS=3D"$LINKS pc-bios/s390-ccw/Makefile" -LINKS=3D"$LINKS .gdbinit scripts" # scripts needed by relative path in .gd= binit -LINKS=3D"$LINKS tests/avocado tests/data" -LINKS=3D"$LINKS tests/qemu-iotests/check" -LINKS=3D"$LINKS python" -LINKS=3D"$LINKS contrib/plugins/Makefile " -for f in $LINKS ; do - if [ -e "$source_path/$f" ]; then - mkdir -p `dirname ./$f` - symlink "$source_path/$f" "$f" - fi -done - # tests/tcg configuration (makefile=3Dtests/tcg/Makefile.prereqs echo "# Automatically generated by configure - do not modify" > $makefile --=20 2.36.0 From nobody Sun Apr 28 21:22:02 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=1652781243; cv=none; d=zohomail.com; s=zohoarc; b=ep+WdrspTqG56ylUJuk43geWiq+U6Ba06NwSU9UFjeY6fsBbK/IdZN6Crf3Nvp0ripGJ7148AhocE0EPhZpSGnEsVMSI8L3H9G8AmAYa7uZzMACy9o60vIUh/ybQ5WCsWF8g0dKUJx/XJHDXXLywFFa+DT3TxEVuv6I/fzNvrxU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652781243; 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=FgcjfDJM39quLGJ4/mRxrdvE7hDFvh1glndkGEbyKjc=; b=Duo3CJLqIeo71G/dGwc+fW6ccSQ68gfNNGd1cijkKaTCb4wlf2CJF+N85rjtIR1CieYjQ9ey1skCzVJ5Dk151IAbLvepfk46TOnhz+QyFeQtgwNsCIT8mlOJpEm3dXfDTrFZDOfdEsNs4fF+3n1Gl8CUoaM5orirZ5Bws1++XUw= 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 1652781243062977.5554107826027; Tue, 17 May 2022 02:54:03 -0700 (PDT) Received: from localhost ([::1]:59546 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqttx-0001Jr-Q4 for importer@patchew.org; Tue, 17 May 2022 05:54:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37568) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqtTt-0000QB-Jh for qemu-devel@nongnu.org; Tue, 17 May 2022 05:27:05 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:33383) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqtTq-0003gV-54 for qemu-devel@nongnu.org; Tue, 17 May 2022 05:27:05 -0400 Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-446-OzsaDwJgOJS4h3FyNcVBLw-1; Tue, 17 May 2022 05:26:52 -0400 Received: by mail-ej1-f71.google.com with SMTP id qb36-20020a1709077ea400b006f45e182187so7034073ejc.14 for ; Tue, 17 May 2022 02:26:52 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id e11-20020a170906748b00b006f3ef214de8sm807775ejl.78.2022.05.17.02.26.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 May 2022 02:26:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652779614; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FgcjfDJM39quLGJ4/mRxrdvE7hDFvh1glndkGEbyKjc=; b=iGHRpGv/oDKOTlpAQLP9ZEh2woTCeDBvnr1sx/JxN27Dszu+AImbSpcS1jCvL8HxfwYq0+ Nj+lytXNwj+BLjJxuDyTnnphDLtYuHySfJZNxFhFAow8xtX3ZkepCnRqhvf32WJ5Y/4W2f hFw4ylgw2bRgSl7EMTmUxKWgc5/D9NY= X-MC-Unique: OzsaDwJgOJS4h3FyNcVBLw-1 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=FgcjfDJM39quLGJ4/mRxrdvE7hDFvh1glndkGEbyKjc=; b=HxRvt3Xm5zrUa0gqcw6fH7FvubUanIWKyUVvbCzQDkh9OcERQFFhlcu+AL6PuLZu72 N//J6pKYvqjGUrDHSHfvOS5jkUahIxYiEVCjcquczvZz/Y3pFQoOm2/4oCTd5TZHTfo0 G4pDQncGDVk+bOAQRyYGiHPnut8q9zs/SGj7Jn2wVYqlEfWHpS27H1++Y0YP9Ufhx+mP tJW6vzGIqv2owxFeUXRVNd8mWBDsUnt4Ga6T4epHbQ2/00jMCtII5VCWMq4OMCRabYGc h1hM9MkqSouboNgia4fI7720vTARiA76vPEcqjullwrCi18XABHYAWtPwtlRioSIibX9 3VJA== X-Gm-Message-State: AOAM532gwP+t/xNCOlPVV8xvzwSS4hznno6gY0HeTpfnbonf3qRBXd30 Xr/RCoOPKcuM/2SXg7UadbB2rGX65MT+K9eOyTNdzLIHjlWd9fY4P1OBWCJhrcfPiWuYsl9l0DL Oohm5MhpKjhr1tZbaL83WRMZI3LFF2maPlsh6lz+sJ5Hvq8NDNzYS70HFNOmqPzj3xlw= X-Received: by 2002:a17:907:6294:b0:6e1:ea4:74a3 with SMTP id nd20-20020a170907629400b006e10ea474a3mr18551483ejc.168.1652779610803; Tue, 17 May 2022 02:26:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzja5r+fhBT5oi3fC3no/FTQN0u/gNkEdwVJYyJnNG5syL8NZtEqA1K3RRHzAcUQnVNB9Xv8g== X-Received: by 2002:a17:907:6294:b0:6e1:ea4:74a3 with SMTP id nd20-20020a170907629400b006e10ea474a3mr18551466ejc.168.1652779610502; Tue, 17 May 2022 02:26:50 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, richard.henderson@linaro.org Subject: [PATCH 13/16] configure: enable cross-compilation of s390-ccw Date: Tue, 17 May 2022 11:26:13 +0200 Message-Id: <20220517092616.1272238-14-pbonzini@redhat.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220517092616.1272238-1-pbonzini@redhat.com> References: <20220517092616.1272238-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: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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 @redhat.com) X-ZM-MESSAGEID: 1652781245246100001 Content-Type: text/plain; charset="utf-8" While container-based cross compilers are not supported, this already makes it possible to build s390-ccw on any machine that has s390x GCC and binutils installed. Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini --- configure | 18 +++++++++++++----- pc-bios/s390-ccw/Makefile | 9 +++++---- pc-bios/s390-ccw/netboot.mak | 2 +- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/configure b/configure index cf439e2deb..e977d8e958 100755 --- a/configure +++ b/configure @@ -2246,24 +2246,32 @@ if { test "$cpu" =3D "i386" || test "$cpu" =3D "x86= _64"; } && \ done fi =20 -# Only build s390-ccw bios if we're on s390x and the compiler has -march= =3Dz900 -# or -march=3Dz10 (which is the lowest architecture level that Clang suppo= rts) -if test "$cpu" =3D "s390x" ; then +# Only build s390-ccw bios if the compiler has -march=3Dz900 or -march=3Dz= 10 +# (which is the lowest architecture level that Clang supports) +probe_target_compiler s390x +if test -n "$target_cc" && test "$softmmu" =3D yes; then write_c_skeleton - compile_prog "-march=3Dz900" "" + do_compiler "$target_cc" $target_cc_cflags -march=3Dz900 -o $TMPO -c $TM= PC has_z900=3D$? - if [ $has_z900 =3D 0 ] || compile_object "-march=3Dz10 -msoft-float -Wer= ror"; then + if [ $has_z900 =3D 0 ] || do_compiler "$target_cc" $target_cc_cflags -ma= rch=3Dz10 -msoft-float -Werror -o $TMPO -c $TMPC; then if [ $has_z900 !=3D 0 ]; then echo "WARNING: Your compiler does not support the z900!" echo " The s390-ccw bios will only work with guest CPUs >=3D= z10." fi roms=3D"$roms s390-ccw" + config_mak=3Dpc-bios/s390-ccw/config-host.mak + echo "# Automatically generated by configure - do not modify" > $confi= g_mak + echo "SRC_PATH=3D$source_path/pc-bios/s390-ccw" >> $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=3D"${git_submodules} roms/SLOF" fi fi =20 +####################################### +# generate config-host.mak + # Check that the C++ compiler exists and works with the C compiler. # All the QEMU_CXXFLAGS are based on QEMU_CFLAGS. Keep this at the end to = don't miss any other that could be added. if has $cxx; then diff --git a/pc-bios/s390-ccw/Makefile b/pc-bios/s390-ccw/Makefile index 0eb68efc7b..6eb713bf37 100644 --- a/pc-bios/s390-ccw/Makefile +++ b/pc-bios/s390-ccw/Makefile @@ -2,8 +2,9 @@ all: build-all # Dummy command so that make thinks it has done something @true =20 -include ../../config-host.mak +include config-host.mak CFLAGS =3D -O2 -g +MAKEFLAGS +=3D -rR =20 quiet-command =3D $(if $(V),$1,$(if $(2),@printf " %-7s %s\n" $2 $3 && $1= , @$1)) cc-option =3D $(if $(shell $(CC) $1 $2 -S -o /dev/null -xc /dev/null \ @@ -11,7 +12,7 @@ cc-option =3D $(if $(shell $(CC) $1 $2 -S -o /dev/null -x= c /dev/null \ =20 VPATH_SUFFIXES =3D %.c %.h %.S %.m %.mak %.sh %.rc Kconfig% %.json.in set-vpath =3D $(if $1,$(foreach PATTERN,$(VPATH_SUFFIXES),$(eval vpath $(P= ATTERN) $1))) -$(call set-vpath, $(SRC_PATH)/pc-bios/s390-ccw) +$(call set-vpath, $(SRC_PATH)) =20 # Flags for dependency generation QEMU_DGFLAGS =3D -MMD -MP -MT $@ -MF $(@D)/$(*F).d @@ -49,8 +50,8 @@ s390-ccw.img: s390-ccw.elf =20 $(OBJECTS): Makefile =20 -ifneq ($(wildcard $(SRC_PATH)/roms/SLOF/lib/libnet),) -include $(SRC_PATH)/pc-bios/s390-ccw/netboot.mak +ifneq ($(wildcard $(SRC_PATH)/../../roms/SLOF/lib/libnet),) +include $(SRC_PATH)/netboot.mak else s390-netboot.img: @echo "s390-netboot.img not built since roms/SLOF/ is not available." diff --git a/pc-bios/s390-ccw/netboot.mak b/pc-bios/s390-ccw/netboot.mak index 68b4d7edcb..1a06befa4b 100644 --- a/pc-bios/s390-ccw/netboot.mak +++ b/pc-bios/s390-ccw/netboot.mak @@ -1,5 +1,5 @@ =20 -SLOF_DIR :=3D $(SRC_PATH)/roms/SLOF +SLOF_DIR :=3D $(SRC_PATH)/../../roms/SLOF =20 NETOBJS :=3D start.o sclp.o cio.o virtio.o virtio-net.o jump2ipl.o netmain= .o =20 --=20 2.36.0 From nobody Sun Apr 28 21:22:02 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=1652780391; cv=none; d=zohomail.com; s=zohoarc; b=GwtCESPuIDz+UxmFAMibU/Bvse6SwQtd7TDAk4+u9IIa4UaXwzQPJXVFVVKs7STNUrSKiDLo0CF5D4QE1gnHl9ECkUrww/bVwBVVI0tVEXw/yzeF9uENL+nihbnjv5okRWpLrMMZndlH5ZLqD8oJWLXJXiqPPL1+xUz2PnU7feQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652780391; 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=Fv84jwqP2aV20ibLcqIS+ICZdAWusduaR8f5CX+KcCA=; b=M/jTXbUFx+mpNONrMTJcF/+GLsafh6H8z0fNtdawizJdCQigbV1dYUw492FlHH9BM2gF5Z/vATFS57ZfQ7QNPwXuMTrcY1XZeXhI1unA/nHY17yWLwaazUdLUrYKOx1QUaTcaac8esif+k+1jSN9MKKYf8tVG7iij/7RF69AMtQ= 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 1652780391378199.10436613587422; Tue, 17 May 2022 02:39:51 -0700 (PDT) Received: from localhost ([::1]:35078 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqtgD-0000o3-OX for importer@patchew.org; Tue, 17 May 2022 05:39:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37532) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqtTr-0000LM-VF for qemu-devel@nongnu.org; Tue, 17 May 2022 05:27:04 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:45432) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqtTq-0003gi-4S for qemu-devel@nongnu.org; Tue, 17 May 2022 05:27:03 -0400 Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-461-ShdXZas2PEeEhTCDt-fFZQ-1; Tue, 17 May 2022 05:26:54 -0400 Received: by mail-ed1-f71.google.com with SMTP id w5-20020a056402128500b0042aa2647eb6so5017562edv.12 for ; Tue, 17 May 2022 02:26:54 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id u12-20020aa7d88c000000b0042ac13e232csm1434203edq.39.2022.05.17.02.26.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 May 2022 02:26:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652779616; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Fv84jwqP2aV20ibLcqIS+ICZdAWusduaR8f5CX+KcCA=; b=fnsfFJh2/R1nTVTWiv4+vRATOwFG4JPnr9VRpdCNFJxmNlxTmju7HxqJqSZC/+RdInwCPF fscopn+QDHvazFbhU153Xc0cphaz67TClzMY3vPzc/Rjmt8ojv+xujIHk0VmOF2+XZh/re qedbQARac65bIXXX7I0AenEdYlehogU= X-MC-Unique: ShdXZas2PEeEhTCDt-fFZQ-1 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=Fv84jwqP2aV20ibLcqIS+ICZdAWusduaR8f5CX+KcCA=; b=PC/2XIJMu0cmXK1o/Pk1t+N8390sYcuaozOUamN5St4A9OIgh6jOiGGSGw5Og/M45g UTrTS4kiAz4Otsf55SeXq4VUi+R9aQ7GwIPlIH6vO5uTYVDiPhX3b957b0ROV7x95ZOE MmrTxuIAJ78leVt/34qdMYkHOuWYcnCNXvC5kiRpUGDIY89Co9qfumIdfVCSWr9Kd9h3 D2ewFpI9EWJ+rjq3PcGtjqZKUflW4+fdt3jLjjFYJkR6SDb/D2hb6PRosXsRRCBV6KL7 SsyJAHYvLfqzWu7JLyYxGH9g0B3TlnTxWLF/A8lWP8ARVwkOl8zF4YP/yRLe2UAlnmQq TGVw== X-Gm-Message-State: AOAM532NSoa/FjA8hoShDGvcpqmTxJo6wLA5foHcef6TH9StfLqoAyM7 851Xk77WlrQX5W5T4T9aoakkrPcnRKpWKJ2hSuCXUC/G05Rrm6Os+N1HNwfqG+J3ms5wOT46Nzy 8H9wScWh8xv1Udlstte/50WWeT1NpREeyeMkdgJMpsI713DqMS1x3UluA3jP9u9chsuI= X-Received: by 2002:a17:907:720f:b0:6f8:5c31:4027 with SMTP id dr15-20020a170907720f00b006f85c314027mr18798226ejc.284.1652779613327; Tue, 17 May 2022 02:26:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx921GoWcz43ROTbDh94QD+Q/YM4EUEl5RexDsRanVOMfYkyWlJCkl5l+C5WiQPa7TEkCjdIA== X-Received: by 2002:a17:907:720f:b0:6f8:5c31:4027 with SMTP id dr15-20020a170907720f00b006f85c314027mr18798209ejc.284.1652779612992; Tue, 17 May 2022 02:26:52 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, richard.henderson@linaro.org Subject: [PATCH 14/16] configure: enable cross-compilation of optionrom Date: Tue, 17 May 2022 11:26:14 +0200 Message-Id: <20220517092616.1272238-15-pbonzini@redhat.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220517092616.1272238-1-pbonzini@redhat.com> References: <20220517092616.1272238-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.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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 @redhat.com) X-ZM-MESSAGEID: 1652780393252100001 Content-Type: text/plain; charset="utf-8" While container-based cross compilers are not supported, this already makes it possible to build x86 optionroms on any machine that has an installation of GCC and binutils for 32- or 64-bit x86. Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini --- configure | 29 +++++++++++++++++++++-------- pc-bios/optionrom/Makefile | 2 -- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/configure b/configure index e977d8e958..a6363f3331 100755 --- a/configure +++ b/configure @@ -2095,6 +2095,13 @@ probe_target_compiler() { fi } =20 +probe_target_compilers() { + for i; do + probe_target_compiler $i + test -n "$target_cc" && return 0 + done +} + write_target_makefile() { if test -n "$target_cc"; then echo "CC=3D$target_cc" @@ -2205,6 +2212,9 @@ fi =20 QEMU_GA_MSI_MINGW_BIN_PATH=3D"$($pkg_config --variable=3Dprefix glib-2.0)/= bin" =20 +####################################### +# cross-compiled firmware targets + # Set up build tree symlinks that point back into the source tree # (these can be both files and directories). # Caution: avoid adding files or directories here using wildcards. This @@ -2231,19 +2241,27 @@ done =20 # Mac OS X ships with a broken assembler roms=3D -if { test "$cpu" =3D "i386" || test "$cpu" =3D "x86_64"; } && \ +probe_target_compilers i386 x86_64 +if test -n "$target_cc" && test "$targetos" !=3D "darwin" && test "$targetos" !=3D "sunos" &&= \ test "$targetos" !=3D "haiku" && test "$softmmu" =3D yes ; then # Different host OS linkers have different ideas about the name of the= ELF # emulation. Linux and OpenBSD/amd64 use 'elf_i386'; FreeBSD uses the = _fbsd # variant; OpenBSD/i386 uses the _obsd variant; and Windows uses i386p= e. for emu in elf_i386 elf_i386_fbsd elf_i386_obsd i386pe; do - if "$ld" -verbose 2>&1 | grep -q "^[[:space:]]*$emu[[:space:]]*$";= then + if "$target_ld" -verbose 2>&1 | grep -q "^[[:space:]]*$emu[[:space= :]]*$"; then ld_i386_emulation=3D"$emu" - roms=3D"optionrom" break fi done + if test -n "$ld_i386_emulation"; then + roms=3D"optionrom" + config_mak=3Dpc-bios/optionrom/config.mak + echo "# Automatically generated by configure - do not modify" > $c= onfig_mak + echo "TOPSRC_DIR=3D$source_path" >> $config_mak + echo "LD_I386_EMULATION=3D$ld_i386_emulation" >> $config_mak + write_target_makefile >> $config_mak + fi fi =20 # Only build s390-ccw bios if the compiler has -march=3Dz900 or -march=3Dz= 10 @@ -2396,7 +2414,6 @@ echo "GLIB_CFLAGS=3D$glib_cflags" >> $config_host_mak echo "GLIB_LIBS=3D$glib_libs" >> $config_host_mak echo "GLIB_VERSION=3D$(pkg-config --modversion glib-2.0)" >> $config_host_= mak echo "QEMU_LDFLAGS=3D$QEMU_LDFLAGS" >> $config_host_mak -echo "LD_I386_EMULATION=3D$ld_i386_emulation" >> $config_host_mak echo "STRIP=3D$strip" >> $config_host_mak echo "EXESUF=3D$EXESUF" >> $config_host_mak =20 @@ -2586,10 +2603,6 @@ for target in $target_list; do done echo "TCG_TESTS_TARGETS=3D$tcg_tests_targets" >> $makefile) =20 -config_mak=3Dpc-bios/optionrom/config.mak -echo "# Automatically generated by configure - do not modify" > $config_mak -echo "TOPSRC_DIR=3D$source_path" >> $config_mak - if test "$skip_meson" =3D no; then cross=3D"config-meson.cross.new" meson_quote() { diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile index 17ccc76241..f639915b4f 100644 --- a/pc-bios/optionrom/Makefile +++ b/pc-bios/optionrom/Makefile @@ -6,7 +6,6 @@ all: multiboot.bin multiboot_dma.bin linuxboot.bin linuxboo= t_dma.bin kvmvapic.bi # Dummy command so that make thinks it has done something @true =20 -include ../../config-host.mak CFLAGS =3D -O2 -g =20 quiet-command =3D $(if $(V),$1,$(if $(2),@printf " %-7s %s\n" $2 $3 && $1= , @$1)) @@ -44,7 +43,6 @@ Wa =3D -Wa, override ASFLAGS +=3D -32 override CFLAGS +=3D $(call cc-option, $(Wa)-32) =20 -LD_I386_EMULATION ?=3D elf_i386 override LDFLAGS =3D -m $(LD_I386_EMULATION) -T $(SRC_DIR)/flat.lds =20 pvh.img: pvh.o pvh_main.o --=20 2.36.0 From nobody Sun Apr 28 21:22:02 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=1652781522; cv=none; d=zohomail.com; s=zohoarc; b=gxK1NRF2BHY76EYLiioF/xq3+3KKXTpmjtUwcheiIZImemBOUX8SyePgzdW8vNunF816hyH5ot/16p+urSlhJWwknZOh2jQhJ2jLmEH6dsFFPERUFngEhWW9g3XMtS8CESKL2bZ+2w6aNh8zCYNxVmo33nozpIyb+ECkF3w1S4k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652781522; 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=JrXD//V5I3q5ZpCcSAAEzk/phgDCwoYvKRUuM1qPtFw=; b=kUqw8QC1ih0wcitdvsO+N29xOB8jG1K3PTMtk7sF5EHjN/PwO9ChuJ+jwsc9qyILHY7hwVoHTqyK+t+zw+QGExxmjfyucFzMD9rdveF+OuzFtfPFOjhFEwhL/XKeRrC+0kEnZJx3tIsU6Jaft0nbh2kyuN1yZ1i3tNxdEMKrljs= 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 1652781522055305.64154104110185; Tue, 17 May 2022 02:58:42 -0700 (PDT) Received: from localhost ([::1]:38114 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqtyS-00064X-Kt for importer@patchew.org; Tue, 17 May 2022 05:58:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37570) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqtTt-0000QR-OA for qemu-devel@nongnu.org; Tue, 17 May 2022 05:27:05 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:49581) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqtTq-0003gx-40 for qemu-devel@nongnu.org; Tue, 17 May 2022 05:27:05 -0400 Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-241-P_oT4FKZNBSPmo_Lh2tRtw-1; Tue, 17 May 2022 05:26:56 -0400 Received: by mail-ej1-f70.google.com with SMTP id ga27-20020a1709070c1b00b006f43c161da4so7064994ejc.7 for ; Tue, 17 May 2022 02:26:56 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id hf15-20020a1709072c4f00b006f3ef214e76sm769286ejc.220.2022.05.17.02.26.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 May 2022 02:26:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652779620; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JrXD//V5I3q5ZpCcSAAEzk/phgDCwoYvKRUuM1qPtFw=; b=JN2dKDlI9quTc06Pi+Xsp1sNisL7UqGEOoAlVXNfhuYUor7KIGwtgY2vHTGWPLkYpzpRIi NiGzshwfD/A95buxz0JNDg/rMTQvZYIO59kkxUDBZvN2/ZJsPKJdKtIb1K5bpNxwVF82YP Lq3FKi9TNfvmtI745nYPoZ9nzvrIN1Q= X-MC-Unique: P_oT4FKZNBSPmo_Lh2tRtw-1 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=JrXD//V5I3q5ZpCcSAAEzk/phgDCwoYvKRUuM1qPtFw=; b=CeTKfgm+qP/SOcl+MBqLTA+ohLZhrwxQ+Cpy8bFiWqfQofLqGgYQW+yBRMicY9ZaLZ zaNpLQVtkGNyjI42eSi/nAZy6BQd/ZRkngzlVBqi32NHbq6G7qjmZ/vb0YR7GUcLp0Yo Fi6QgdWZSRQCIlwIYfO5YKh3aZjy8BNsRVzm43yjrnVRC8AoNHJenNZGIDqg0c16DfCN ZYCNq3gh3Y86g2zz0lESNQGZ9vlYdWDRIKCSUlMWpwQZxcie33HDwo6xBSU+01FyjOrV 6GHUkauROu4DPMahirCtX5T9pqCpIf+OdfOwKCO1xDmlzd4hwcPD+/7c1rf5AOTdy3CX S5KQ== X-Gm-Message-State: AOAM533SCLmwzOO2iMh9fPYmB96dhSe3bvRDmVQlbltsyuZukptHZ8CP wQTF3sWJJjS4fntgJJq9A3azHc914mKH+L8+Ye8zZO73qPtV6KT14AJpRPckh2sLFU4KEQvBcbo nSf8ykBtneBqBzzRPTJEyE2Hrlc7FWrY/idTffA+f9zFJqaR0whAchLFrmJbTML8dIX4= X-Received: by 2002:a05:6402:908:b0:428:11f5:509d with SMTP id g8-20020a056402090800b0042811f5509dmr17883335edz.253.1652779615363; Tue, 17 May 2022 02:26:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyjCRhfh1oZMj5ErVfR8Qy7akRVLbkqkrbHG1mZNY5VBIbXvcxdj/VPlho/6eBKyikwQBR6/A== X-Received: by 2002:a05:6402:908:b0:428:11f5:509d with SMTP id g8-20020a056402090800b0042811f5509dmr17883312edz.253.1652779615072; Tue, 17 May 2022 02:26:55 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, richard.henderson@linaro.org Subject: [PATCH 15/16] configure: enable cross compilation of vof Date: Tue, 17 May 2022 11:26:15 +0200 Message-Id: <20220517092616.1272238-16-pbonzini@redhat.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220517092616.1272238-1-pbonzini@redhat.com> References: <20220517092616.1272238-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.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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 @redhat.com) X-ZM-MESSAGEID: 1652781523001100001 Content-Type: text/plain; charset="utf-8" While container-based cross compilers are not supported, this already makes it possible to build vof on any machine that has an installation of GCC and binutils for 32- or 64-bit PowerPC. Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini --- configure | 10 ++++++++++ pc-bios/vof/Makefile | 17 +++++++++-------- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/configure b/configure index a6363f3331..5b7b4e2cca 100755 --- a/configure +++ b/configure @@ -2227,6 +2227,7 @@ LINKS=3D"Makefile" LINKS=3D"$LINKS tests/tcg/Makefile.target" LINKS=3D"$LINKS pc-bios/optionrom/Makefile" LINKS=3D"$LINKS pc-bios/s390-ccw/Makefile" +LINKS=3D"$LINKS pc-bios/vof/Makefile" LINKS=3D"$LINKS .gdbinit scripts" # scripts needed by relative path in .gd= binit LINKS=3D"$LINKS tests/avocado tests/data" LINKS=3D"$LINKS tests/qemu-iotests/check" @@ -2264,6 +2265,15 @@ if test -n "$target_cc" && fi fi =20 +probe_target_compilers ppc ppc64 +if test -n "$target_cc" && test "$softmmu" =3D yes; then + roms=3D"$roms vof" + config_mak=3Dpc-bios/vof/config.mak + echo "# Automatically generated by configure - do not modify" > $confi= g_mak + echo "SRC_DIR=3D$source_path/pc-bios/vof" >> $config_mak + write_target_makefile >> $config_mak +fi + # Only build s390-ccw bios if the compiler has -march=3Dz900 or -march=3Dz= 10 # (which is the lowest architecture level that Clang supports) probe_target_compiler s390x diff --git a/pc-bios/vof/Makefile b/pc-bios/vof/Makefile index aa1678c4d8..391ac0d600 100644 --- a/pc-bios/vof/Makefile +++ b/pc-bios/vof/Makefile @@ -1,11 +1,10 @@ -all: build-all +include config.mak +VPATH=3D$(SRC_DIR) +all: vof.bin =20 -build-all: vof.bin - -CROSS ?=3D -CC =3D $(CROSS)gcc -LD =3D $(CROSS)ld -OBJCOPY =3D $(CROSS)objcopy +CC ?=3D $(CROSS)gcc +LD ?=3D $(CROSS)ld +OBJCOPY ?=3D $(CROSS)objcopy =20 %.o: %.S $(CC) -m32 -mbig-endian -mcpu=3Dpower4 -c -o $@ $< @@ -14,10 +13,12 @@ OBJCOPY =3D $(CROSS)objcopy $(CC) -m32 -mbig-endian -mcpu=3Dpower4 -c -fno-stack-protector -o $@ $< =20 vof.elf: entry.o main.o ci.o bootmem.o libc.o - $(LD) -nostdlib -e_start -Tvof.lds -EB -o $@ $^ + $(LD) -nostdlib -e_start -T$(SRC_DIR)/vof.lds -EB -o $@ $^ =20 %.bin: %.elf $(OBJCOPY) -O binary -j .text -j .data -j .toc -j .got2 $^ $@ =20 clean: rm -f *.o vof.bin vof.elf *~ + +.PHONY: all clean --=20 2.36.0 From nobody Sun Apr 28 21:22:02 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=1652781108; cv=none; d=zohomail.com; s=zohoarc; b=E0vN+F1z1QQ+USsJIbAmkidZIiuuZwvPOOLIssvuEzLGfeGRp5X2MsVBweG4cR9Mmab7GXDISrflT2bXY0gvFt9ll06af2igS4J0JJKZRAXPGJouru1rDa+xx2aGu6wjHUr5Kf/WHzVyKv5jn6IMCyrZA8+bgZr8UDOBlRc9oOA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652781108; 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=lPqzLngiTYE10M8Yb8SVUVOVe5bHTL/ubSAO0mPwohU=; b=Ggp10dctOFcnowEPfZcygLQcedHuAYfoaItPGe06bdiOik3FzKlFlCZu/LXVFzzJTOkvRPyD8mmfbcWQcchqBJ+eaCFXqAibk2AFFUFBuR9eL6uAC25fAsq7eNFCg7W7VtMBERERBngJeA38TkpxDDLDxJo8jmt3N3QZaDHN8gQ= 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 1652781108809131.26545001732404; Tue, 17 May 2022 02:51:48 -0700 (PDT) Received: from localhost ([::1]:53970 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqtrn-0005sy-Ms for importer@patchew.org; Tue, 17 May 2022 05:51:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37564) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqtTt-0000Pa-9F for qemu-devel@nongnu.org; Tue, 17 May 2022 05:27:05 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:23390) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqtTq-0003gt-52 for qemu-devel@nongnu.org; Tue, 17 May 2022 05:27:04 -0400 Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-122-wy3z96aeP2Sv214tv8ScYA-1; Tue, 17 May 2022 05:26:58 -0400 Received: by mail-ed1-f71.google.com with SMTP id b3-20020aa7d483000000b004282ca95814so11381458edr.9 for ; Tue, 17 May 2022 02:26:58 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id jy10-20020a170907762a00b006f3ef214df6sm811692ejc.92.2022.05.17.02.26.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 May 2022 02:26:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652779619; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lPqzLngiTYE10M8Yb8SVUVOVe5bHTL/ubSAO0mPwohU=; b=TyCpLXI+becD40g4T6vZi2CLNR7ZMRnyRKTa0nwfj1WxQQ7l+h+NgQKIdNPmDCs9vQnJKE twQM37wyiQVxtxVxpHoMKe5kem0IiX5hmXChqhWAr0v7/tIgE/aTvvGR0agDrT/Z+9zYpr Cifa2JvEiGchhD/N1fjp7QcQnVsQxmE= X-MC-Unique: wy3z96aeP2Sv214tv8ScYA-1 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=lPqzLngiTYE10M8Yb8SVUVOVe5bHTL/ubSAO0mPwohU=; b=QjVp8xAOF2DCDCtZJCWk5Y7cvLCWmUnzbGJuvGuKou03JxG60SVI5WjJytxbcGJsFB 9G0b2GJX6TfvluFP+PW53Dv54wb6uzv5dB+HQMVE9W0Q7ZSqig7ORUu4lXj80a8oebSl W44uon3d5xtst/BqUiaGh8BPzVbMsyf911ggkDgexIsNOH3V9dlKCjV+OAM7QJ4cNnNW Z9jvOcoVWo+0geStfFRtGjhLlTnWPPYTzg++0zpIva7gask5M4CsadFxC5PrFMPoHehE pYf2BUnoZKw4CYCRwHM3O7Ip2D1JZWX09xYLWZc8ZtK5LNJHnLjuDNTekr0BUXBmUqNS Y4Dg== X-Gm-Message-State: AOAM531rKKnwhBljv5lUd3ga3mX6PrMein4l/Gr4M9Qyj0oOv5cqAPRE refxQSdPjPI16j8XPeJU+WND+nHSC2N5xArvGbqeXbHOiZBzQJmq7qJvvGbNIcW65ytlDZZDjH+ fhok6q3POpi9TvP2aJvDpeDI+a0CvlbbvFORHH6Zdc4Us5Qn8+GEj9oermwOFtF8EVs0= X-Received: by 2002:a17:906:e202:b0:6fe:478b:7c1 with SMTP id gf2-20020a170906e20200b006fe478b07c1mr6993786ejb.419.1652779617060; Tue, 17 May 2022 02:26:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzz/0cTbw29QL8GwZJWi85HA+v6EMB5I2+7cVkxCDEV5vbwaln6m7XKz09uneoTYI805TrQrg== X-Received: by 2002:a17:906:e202:b0:6fe:478b:7c1 with SMTP id gf2-20020a170906e20200b006fe478b07c1mr6993762ejb.419.1652779616785; Tue, 17 May 2022 02:26:56 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, richard.henderson@linaro.org Subject: [PATCH 16/16] configure: remove unused variables from config-host.mak Date: Tue, 17 May 2022 11:26:16 +0200 Message-Id: <20220517092616.1272238-17-pbonzini@redhat.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220517092616.1272238-1-pbonzini@redhat.com> References: <20220517092616.1272238-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: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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 @redhat.com) X-ZM-MESSAGEID: 1652781111643100001 Content-Type: text/plain; charset="utf-8" The only compiler variable that is still needed is $(CC), for contrib/plugins/Makefile. All firmware builds have their own config-host.mak file. Signed-off-by: Paolo Bonzini --- configure | 6 ------ 1 file changed, 6 deletions(-) diff --git a/configure b/configure index 5b7b4e2cca..8cdec79f1a 100755 --- a/configure +++ b/configure @@ -2412,11 +2412,6 @@ echo "GENISOIMAGE=3D$genisoimage" >> $config_host_mak echo "MESON=3D$meson" >> $config_host_mak echo "NINJA=3D$ninja" >> $config_host_mak echo "CC=3D$cc" >> $config_host_mak -echo "AR=3D$ar" >> $config_host_mak -echo "AS=3D$as" >> $config_host_mak -echo "CCAS=3D$ccas" >> $config_host_mak -echo "OBJCOPY=3D$objcopy" >> $config_host_mak -echo "LD=3D$ld" >> $config_host_mak echo "QEMU_CFLAGS=3D$QEMU_CFLAGS" >> $config_host_mak echo "QEMU_CXXFLAGS=3D$QEMU_CXXFLAGS" >> $config_host_mak echo "QEMU_OBJCFLAGS=3D$QEMU_OBJCFLAGS" >> $config_host_mak @@ -2424,7 +2419,6 @@ echo "GLIB_CFLAGS=3D$glib_cflags" >> $config_host_mak echo "GLIB_LIBS=3D$glib_libs" >> $config_host_mak echo "GLIB_VERSION=3D$(pkg-config --modversion glib-2.0)" >> $config_host_= mak echo "QEMU_LDFLAGS=3D$QEMU_LDFLAGS" >> $config_host_mak -echo "STRIP=3D$strip" >> $config_host_mak echo "EXESUF=3D$EXESUF" >> $config_host_mak =20 # use included Linux headers --=20 2.36.0