From patchwork Tue Jun 27 14:32:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 696840 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp3809840wrm; Tue, 27 Jun 2023 07:33:14 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4Cvq+VTBsaePbbsPIpQbCR13ZAXEn5a1xEHOqbKIS/r2iT0PcHwLmjYlH+Go5I/OXyhL1/ X-Received: by 2002:a05:620a:d8c:b0:75b:23a0:d9dc with SMTP id q12-20020a05620a0d8c00b0075b23a0d9dcmr39420789qkl.50.1687876394326; Tue, 27 Jun 2023 07:33:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687876394; cv=none; d=google.com; s=arc-20160816; b=aXt2N/iv/AiCI4UWVHi4lvvVDWiIINfTd8NktHDfJU9R6PmpaFQimoU9WPKDONJXP8 3XB9OIy0pz5dDTQqJu8ePL4ci7aBf3nM9cdqSmaStuTrLMN6wVtCQvkzrzRBBOnW9NO+ deGPjsaaCEECmc/EgOOI2KmEozfMJYo0llmivZhCGkY8X95sZWt+OVnawfDtMszXGmkV YBshJEeztwFojvSSM1Xr83SCtahwSwNp4mVA3fkUFjjYgSS5/XYC3+H4wUEknYLM9d3n Lkb+Ee1MFNFSioiOzTkvbGCvnTl2cYorLqZvUwMYQTt5zIZCoLvfqcc+AIsUTEXUm5is PKqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=y72Cvu7+GGKH51wZ4ZTPnItUIyTNc7r63P3IdRE4o+o=; fh=JohOF+S5eXEMRaC+pciRqiqS+AwiH9W3q8SoiUUnOM8=; b=BneO2vK6pvluWzkMHVTEFY+pe7sJjCge/v6As143UEK65CtTF5GXNSKVd6gru7FOoX iO3f4TbMHOqa+RNdwEYRCK1iQh8R2dLwvrIvKVpqkvNPmqnz2LGCj9nD5xJzoRrFwZS5 VL6/C85mswzVijcb/3sJ2JzwfRaoCSeeNVpEfJsoqeWoI/C9Y8Vm6RqEWb1LHqqfoGIn WirqQ11JHKboSiF83rDd+rCc0JEx853eLGgjVji23OvDaiPfs9RnlXhjWTYNZ9jt21Vx 7srGAe3x/tMReN4jB4nxTs9/yd26LPQaByn035ORNy+caCO/F+qsFXypHDvvFYghmkeI wiEQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MztS8j7t; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id rl8-20020a05620a904800b0075bbc2ff3e2si3130205qkn.571.2023.06.27.07.33.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 27 Jun 2023 07:33:14 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MztS8j7t; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] 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) 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-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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Alistair Francis , Paolo Bonzini , Weiwei Li , Palmer Dabbelt , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Bin Meng , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Daniel Henrique Barboza , Liu Zhiwei , Thomas Huth , =?utf-8?q?Philippe_Mathieu-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 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org We want to keep the ability to distinct between 32/64-bit host. Signed-off-by: Philippe Mathieu-Daudé --- 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 = [] bsd_oses = ['gnu/kfreebsd', 'freebsd', 'netbsd', 'openbsd', 'dragonfly', 'darwin'] supported_oses = ['windows', 'freebsd', 'netbsd', 'openbsd', 'darwin', 'sunos', 'linux'] -supported_cpus = ['ppc', 'ppc64', 's390x', 'riscv', 'x86', 'x86_64', +supported_cpus = ['ppc', 'ppc64', 's390x', 'riscv32', 'riscv64', 'x86', 'x86_64', 'arm', 'aarch64', 'loongarch64', 'mips', 'mips64', 'sparc64'] cpu = host_machine.cpu_family() -# Unify riscv* to a single family. -if cpu in ['riscv32', 'riscv64'] - cpu = 'riscv' -endif - target_dirs = config_host['TARGET_DIRS'].split() have_linux_user = false have_bsd_user = false @@ -99,6 +94,8 @@ elif cpu == 'x86' host_arch = 'i386' elif cpu == 'mips64' host_arch = 'mips' +elif cpu in ['riscv32', 'riscv64'] + host_arch = 'riscv' else host_arch = cpu endif @@ -113,7 +110,7 @@ elif cpu in ['ppc', 'ppc64'] kvm_targets = ['ppc-softmmu', 'ppc64-softmmu'] elif cpu in ['mips', 'mips64'] kvm_targets = ['mips-softmmu', 'mipsel-softmmu', 'mips64-softmmu', 'mips64el-softmmu'] -elif cpu in ['riscv'] +elif cpu in ['riscv32', 'riscv64'] kvm_targets = ['riscv32-softmmu', 'riscv64-softmmu'] else kvm_targets = []