From nobody Mon Feb 9 20:13:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1639645334; cv=none; d=zohomail.com; s=zohoarc; b=Yfp8x7JonaripkYrNMBaaiZ+hnNiWUyJykiXrX8XjxPP8IC/Qu5vzXRNkfGgPmQx/FeS1YVU0+gzqDaBAgnGfo2mqs9VBPNW/j2MsOmozIQKak7D4Dpa8r3njL8uBY0SK5GSfV1DnE3vksPaeJlbMNDQa8gQB7a38+MRSQO4zkc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639645334; h=Content-Type:Content-Transfer-Encoding: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=+CucA0KdzLmyPY1OJd5Daaf33bMrUJi+XAcx92BC2iE=; b=jE5MW52qaLO1GZkVyydbRDXH8GEo5J2AVM0AZDvj+8t+oa8eLVZJQBuD8o6C6wlzQZ08ZkmhrY004ajN03KvlVnQSJrjGULn0Ag05QejH1nsCquyfgWufdLDXb9HcXMvfD4i4uQfLgiOkZ31mjAQAcSICloOgHS7hS/0zq5afas= 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 1639645334355952.5337723928319; Thu, 16 Dec 2021 01:02:14 -0800 (PST) Received: from localhost ([::1]:47174 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mxmeT-0007l6-0t for importer@patchew.org; Thu, 16 Dec 2021 04:02:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35658) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mxmUX-0000mp-VF for qemu-devel@nongnu.org; Thu, 16 Dec 2021 03:51:58 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:42467) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mxmUW-0004DD-3V for qemu-devel@nongnu.org; Thu, 16 Dec 2021 03:51:57 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-515-xz7vjCX4M8WNWLXo9HADPg-1; Thu, 16 Dec 2021 03:51:49 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 059C484E256 for ; Thu, 16 Dec 2021 08:51:48 +0000 (UTC) Received: from avogadro.mxp.redhat.com (unknown [10.39.194.194]) by smtp.corp.redhat.com (Postfix) with ESMTP id 77B8C2BE77 for ; Thu, 16 Dec 2021 08:51:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639644715; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+CucA0KdzLmyPY1OJd5Daaf33bMrUJi+XAcx92BC2iE=; b=XOAkJXA/VVWoxqHk4Vp2RxKI3uClL6ijYY2EvrPtPpPa/wQFqWzRVGK7Q3ctfuvg+0swB6 gv3MkJWrqu4LxjOXyAdx5NmKHWprg7vATib/aXixnUuEbw06RTo899pYHyJBTpXHGQiqXh aKyECkozp4y/AR2plW8ib6BZlT3fk2E= X-MC-Unique: xz7vjCX4M8WNWLXo9HADPg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 08/10] meson: rename "arch" variable Date: Thu, 16 Dec 2021 09:51:37 +0100 Message-Id: <20211216085139.99682-9-pbonzini@redhat.com> In-Reply-To: <20211216085139.99682-1-pbonzini@redhat.com> References: <20211216085139.99682-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.718, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1639645336277100001 Content-Type: text/plain; charset="utf-8" Avoid confusion between the ARCH variable of configure/config-host.mak and the same-named variable of meson.build. Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- meson.build | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index 903d4f3b10..677ab1b57d 100644 --- a/meson.build +++ b/meson.build @@ -2845,7 +2845,7 @@ emulators =3D {} foreach target : target_dirs config_target =3D config_target_mak[target] target_name =3D config_target['TARGET_NAME'] - arch =3D config_target['TARGET_BASE_ARCH'] + target_base_arch =3D config_target['TARGET_BASE_ARCH'] arch_srcs =3D [config_target_h[target]] arch_deps =3D [] c_args =3D ['-DNEED_CPU_H', @@ -2861,11 +2861,11 @@ foreach target : target_dirs if target.endswith('-softmmu') qemu_target_name =3D 'qemu-system-' + target_name target_type=3D'system' - t =3D target_softmmu_arch[arch].apply(config_target, strict: false) + t =3D target_softmmu_arch[target_base_arch].apply(config_target, stric= t: false) arch_srcs +=3D t.sources() arch_deps +=3D t.dependencies() =20 - hw_dir =3D target_name =3D=3D 'sparc64' ? 'sparc64' : arch + hw_dir =3D target_name =3D=3D 'sparc64' ? 'sparc64' : target_base_arch hw =3D hw_arch[hw_dir].apply(config_target, strict: false) arch_srcs +=3D hw.sources() arch_deps +=3D hw.dependencies() @@ -2876,8 +2876,8 @@ foreach target : target_dirs abi =3D config_target['TARGET_ABI_DIR'] target_type=3D'user' qemu_target_name =3D 'qemu-' + target_name - if arch in target_user_arch - t =3D target_user_arch[arch].apply(config_target, strict: false) + if target_base_arch in target_user_arch + t =3D target_user_arch[target_base_arch].apply(config_target, strict= : false) arch_srcs +=3D t.sources() arch_deps +=3D t.dependencies() endif @@ -2915,7 +2915,7 @@ foreach target : target_dirs arch_srcs +=3D gdbstub_xml endif =20 - t =3D target_arch[arch].apply(config_target, strict: false) + t =3D target_arch[target_base_arch].apply(config_target, strict: false) arch_srcs +=3D t.sources() arch_deps +=3D t.dependencies() =20 --=20 2.33.1