From nobody Tue Feb 10 23:00:49 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1687876394; cv=none; d=zohomail.com; s=zohoarc; b=EZOZ51onWEY6SSuYthl28FG9ZjbY/ms/1jlhAn5iW0X0cTyHg2EYc3k1PeZ7hj62zgUysuXwMiiAVUMwNUKmEl00Gqo/CeIbuDGV0GpyCmZPVEClG4dJfQdAmRmkr6L/RducZftEjlyQrVQARRQjXYHjjxULAsgq47COtZw/GHU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1687876394; 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=y72Cvu7+GGKH51wZ4ZTPnItUIyTNc7r63P3IdRE4o+o=; b=IT4ei5ah8VNquTGUaTnjPSKSkM4wYN1AZ5+GouFwg2pt1nKtJTkFCjvQ4DuCAss87Idb2Fn62XJYoYfh3pFrfmV61HNCMRJyFW4kH1qqA5YWPaKCRxw1Q0Ytr7TwVWYcx4Wc6xJl5C3QMoIRqZkH3iASRBrU2QGwSeUTcOjbsSo= 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 1687876394706474.90076551587026; Tue, 27 Jun 2023 07:33:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qE9kS-00042u-No; Tue, 27 Jun 2023 10:32:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qE9kQ-00042E-AG for qemu-devel@nongnu.org; Tue, 27 Jun 2023 10:32:50 -0400 Received: from mail-ej1-x62f.google.com ([2a00:1450:4864:20::62f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qE9kN-0003cG-Sa for qemu-devel@nongnu.org; Tue, 27 Jun 2023 10:32:50 -0400 Received: by mail-ej1-x62f.google.com with SMTP id a640c23a62f3a-9922d6f003cso83290466b.0 for ; Tue, 27 Jun 2023 07:32:47 -0700 (PDT) Received: from m1x-phil.lan ([176.187.199.204]) by smtp.gmail.com with ESMTPSA id r24-20020a1709067fd800b009890f2c4cf9sm4627699ejs.79.2023.06.27.07.32.43 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 27 Jun 2023 07:32:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687876366; x=1690468366; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=y72Cvu7+GGKH51wZ4ZTPnItUIyTNc7r63P3IdRE4o+o=; b=MztS8j7tLpzm56SqQpg7rc7fo6nwwsdVX1hBIumipRYBDODwklz1pxxzzxrOTaXGuq OJ6WS4isrkZ2jTgrLZ45tuQqE4N/vPiJNlLHRinRgaRRdZ4qMVKCKdrB9+3jHXOmUwXx b5SQSsJZmqNgrSpf6FhzL9lxxpvh4VrqzT84TPxrxKCJk/YdaZKVItCzC8jMf/8LrAca nEzLUfg1ho0ZYrLLWJBLJAk3jzMAmi5F74HF1VWb2viL4OxZjE28dpEnB9OiU+jnP42+ EsxZ0hErStDpZjiX3AywyQqkK0P4TdHvAoPi1wlZKS3r8W6kn1aSymOCC6JDjinBhVdJ aXfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687876366; x=1690468366; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=y72Cvu7+GGKH51wZ4ZTPnItUIyTNc7r63P3IdRE4o+o=; b=gdtfZJIkyfZWbDgZ28pFeujwAPGt88FcUv1ekfgT0UbcRU9EmjJCd5vLMtkr2uVeMj x6jL8eiNPEppnWd6QSVxKneFYmh+IK1TN4BMw6ulL9josmfjHU3M4Ek2TSnhB7HJRnHY agx/SR8nvmnWsXLiJZFi7gwxpQdRfx+jk0HpM781QsdQgxqyr0ch4w+vJQ4LO6rqVJnP 1eMnafHWdAX7wkhFMPT/KaF3rudPlJQdBLOCkrbQO0zvL069x4wzOSV0xvH9A8sqmlKc R1HTP08pOX/0biLIfI9bphnYURolFiF/VjVPcBZakalR5+xYz2q9UtA93RbfvIWbTzkg WJwA== X-Gm-Message-State: AC+VfDzuA8n0v1oEJ6PXjRrJ3vE4Il6pOdTdZstR4rRgUY7zzvNsx9l0 y0JKTs4SzVgzJFJfSOiwN4ecoXhKaVQjNOS0LfU= X-Google-Smtp-Source: ACHHUZ6i9BHvtFNXhZ3RkKuYWusx/WasaAnWMdOPkSkWknXDKSepYWk+KXa6CY215zaQOMuiOfOiAA== X-Received: by 2002:a17:907:724a:b0:987:16f5:692f with SMTP id ds10-20020a170907724a00b0098716f5692fmr25811436ejc.44.1687876365924; Tue, 27 Jun 2023 07:32:45 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Alistair Francis , Paolo Bonzini , Weiwei Li , Palmer Dabbelt , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Bin Meng , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Daniel Henrique Barboza , Liu Zhiwei , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-riscv@nongnu.org Subject: [PATCH 1/2] target/riscv: Only unify 'riscv32/64' -> 'riscv' for host cpu in meson Date: Tue, 27 Jun 2023 16:32:34 +0200 Message-Id: <20230627143235.29947-2-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230627143235.29947-1-philmd@linaro.org> References: <20230627143235.29947-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::62f; envelope-from=philmd@linaro.org; helo=mail-ej1-x62f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1687876396814100003 We want to keep the ability to distinct between 32/64-bit host. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- meson.build | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/meson.build b/meson.build index fc3c14a810..649de244c6 100644 --- a/meson.build +++ b/meson.build @@ -55,16 +55,11 @@ qapi_trace_events =3D [] =20 bsd_oses =3D ['gnu/kfreebsd', 'freebsd', 'netbsd', 'openbsd', 'dragonfly',= 'darwin'] supported_oses =3D ['windows', 'freebsd', 'netbsd', 'openbsd', 'darwin', '= sunos', 'linux'] -supported_cpus =3D ['ppc', 'ppc64', 's390x', 'riscv', 'x86', 'x86_64', +supported_cpus =3D ['ppc', 'ppc64', 's390x', 'riscv32', 'riscv64', 'x86', = 'x86_64', 'arm', 'aarch64', 'loongarch64', 'mips', 'mips64', 'sparc64'] =20 cpu =3D host_machine.cpu_family() =20 -# Unify riscv* to a single family. -if cpu in ['riscv32', 'riscv64'] - cpu =3D 'riscv' -endif - target_dirs =3D config_host['TARGET_DIRS'].split() have_linux_user =3D false have_bsd_user =3D false @@ -99,6 +94,8 @@ elif cpu =3D=3D 'x86' host_arch =3D 'i386' elif cpu =3D=3D 'mips64' host_arch =3D 'mips' +elif cpu in ['riscv32', 'riscv64'] + host_arch =3D 'riscv' else host_arch =3D cpu endif @@ -113,7 +110,7 @@ elif cpu in ['ppc', 'ppc64'] kvm_targets =3D ['ppc-softmmu', 'ppc64-softmmu'] elif cpu in ['mips', 'mips64'] kvm_targets =3D ['mips-softmmu', 'mipsel-softmmu', 'mips64-softmmu', 'mi= ps64el-softmmu'] -elif cpu in ['riscv'] +elif cpu in ['riscv32', 'riscv64'] kvm_targets =3D ['riscv32-softmmu', 'riscv64-softmmu'] else kvm_targets =3D [] --=20 2.38.1