From patchwork Tue Nov 16 09:50:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 519190 Delivered-To: patch@linaro.org Received: by 2002:ac0:c605:0:0:0:0:0 with SMTP id p5csp6896769imj; Tue, 16 Nov 2021 01:51:49 -0800 (PST) X-Google-Smtp-Source: ABdhPJyXb1tGBvV/Hpsskv2XOAxZgkG1a9yvG301haW7v90/cc1K9u6JABo6B0b1agm6FWJVZeY0 X-Received: by 2002:a05:6122:c6f:: with SMTP id i47mr37532286vkr.20.1637056309483; Tue, 16 Nov 2021 01:51:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637056309; cv=none; d=google.com; s=arc-20160816; b=akqU2brqeRrWk36xMtvUsg40oCVcQfHBrLrQEOgYKBbWgO01QZUadJmFbAAmSrQoB5 u/HFt/IpefMxbvw/SAcefy++3QkvK21+rKd94kfirKK5saM1rZSrs4p5373MJrwfBrlG o1AlhFMY2q+chmU2AZvuocRt5HbJuP0lBRaCXrAmzpQag63If2YEBU588CiX6TfoLA4p jnkoIGPb8sGJXQaIKpWoKsgAD3W97nAKeqasmCrsC3eK/TJDpjd+g68Sjq7RRMaTuU+3 Bi4NjtKsNfGuxCzIfXnPAL+UiqCUAxMg+viuWs4eAHAyZ6NfUq5g4pc8u5YKGnX8qLgh 1eBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:to:from:dkim-signature; bh=1L/V/Krd0XVpaocVCwvQSkrCguQOwUnlMgaDUewsAPQ=; b=Vm4rRiQODOzTmgZwzHqH6YlPZzGW9RwwgfGdxOo5vOfNb6xhylXRjrzHmqVWFYIcz/ P9drksYXDSOzuQPIXYozJjYtdPUnv/D2Bj7NJ8hxVZCYMyYDPaNS7Ez5yLtcDSu+zPPD oijy287dYWJLPNIjXKPs8McvobVOzZ0zbHR7sdj50YwVAxb+g4W0W6ok3J/ZRLhtrflh OQkRjl5wGMNa+b94n8sVOsFX8JExOgM4kNmUoHH0u3zsy1u5b7LCFDtDYJEbMnZZUR5m 2jxM40+Du77dDTeS4jsB/VDD8n9sMCZuivDR3sFS5TKIMH2XZQZ3/OO753HhEQmdS1Q+ +sJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=PnVZKFu6; 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=fail (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 ba14si37225584uab.175.2021.11.16.01.51.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 16 Nov 2021 01:51:49 -0800 (PST) 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=fail header.i=@linaro.org header.s=google header.b=PnVZKFu6; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:57932 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mmv80-0004Bk-Vu for patch@linaro.org; Tue, 16 Nov 2021 04:51:49 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45032) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mmv72-0004Aa-9i for qemu-devel@nongnu.org; Tue, 16 Nov 2021 04:50:50 -0500 Received: from [2a00:1450:4864:20::331] (port=37462 helo=mail-wm1-x331.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mmv70-0004d7-Oq for qemu-devel@nongnu.org; Tue, 16 Nov 2021 04:50:47 -0500 Received: by mail-wm1-x331.google.com with SMTP id k37-20020a05600c1ca500b00330cb84834fso1436784wms.2 for ; Tue, 16 Nov 2021 01:50:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=1L/V/Krd0XVpaocVCwvQSkrCguQOwUnlMgaDUewsAPQ=; b=PnVZKFu6NBuwCUR2EIweUUdKIFeyMjtqYumf4WEvQAjj1LBE5mNTxZSdvHjHwt6FmQ Uap9XoR2wa9VRtc37StblbQWosZPUsSRKtvzdOosS782aLto48RdjJ5ec5KIiIv9v8Vz Dv0dN1L/r88DlGaceGlKSmWiUsp2Cp0Q+ubMIS+i/HX9XfLDqEUqGrLsIUwpieYQyS9I /5q0TKlqHk7N1czJIF2d4dpxmgPPIYILBWLTqsY8OLrRKb0mbsJ/kVYdntj4GkIxUnyz KNf2Jga9CerqzkwUgaw9+8cG+ORRSzZ+M/IM7XUtEAQHhUtHDgcVPkzSzjKEIbhV67Dt ajrw== 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:mime-version :content-transfer-encoding; bh=1L/V/Krd0XVpaocVCwvQSkrCguQOwUnlMgaDUewsAPQ=; b=atQAkbIsIyYG7RcH9WAaJ67jXbFD7htOjz009rKPCvpHhujPX00hnkQSNC2pAm285A hhNhuI161d1D9E8qbbuG0WDFtxOvSejqJjhU+vxQ9m3ruuSxUPAszLqut/HRJm8Gy/Ry t1WDX3C+e5IVD19urRDgJ0uEENJUgeuFH87XVVeQylwsC5YeFc59C5YCl7jRc7TxjN8X DEU3TOOzqwVRsZwmNSGz+b4VNVsd0ly0RDMWa1QClrbl3nHvhIhK3+u3okz0tkWly1o0 frZ12HseGHhs+sE1dXfzpaFU/Ha0wgZIF58od5JAPo1v/fmbCX+iCO75UupGd0gjkAKF StsQ== X-Gm-Message-State: AOAM531WBY19GqlZosTlGrmoYVJf2ZZm3Ktp3+m7HaEIgRDQiiRXz/+s dvTK9O0zSa24THQLb/CBL0OH6RAapP+T5wimJ1M= X-Received: by 2002:a05:600c:378b:: with SMTP id o11mr69368257wmr.157.1637056245220; Tue, 16 Nov 2021 01:50:45 -0800 (PST) Received: from localhost.localdomain (145.red-37-158-173.dynamicip.rima-tde.net. [37.158.173.145]) by smtp.gmail.com with ESMTPSA id r17sm2191394wmq.11.2021.11.16.01.50.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Nov 2021 01:50:44 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH for-6.2] meson.build: Merge riscv32 and riscv64 cpu family Date: Tue, 16 Nov 2021 10:50:42 +0100 Message-Id: <20211116095042.335224-1-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::331 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=richard.henderson@linaro.org; helo=mail-wm1-x331.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 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, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Cc: pbonzini@redhat.com, alistair.francis@wdc.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" In ba0e73336200, we merged riscv32 and riscv64 in configure. However, meson does not treat them the same. We need to merge them here as well. Fixes: ba0e73336200 Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis Reviewed-by: Alistair Francis --- At the moment, configure for riscv64 host fails during meson. r~ --- meson.build | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meson.build b/meson.build index 2ece4fe088..ccc6cefc25 100644 --- a/meson.build +++ b/meson.build @@ -59,6 +59,12 @@ supported_cpus = ['ppc', 'ppc64', 's390x', 'riscv', 'x86', 'x86_64', 'arm', 'aarch64', 'mips', 'mips64', 'sparc', 'sparc64'] cpu = host_machine.cpu_family() + +# Unify riscv* to a single family. +if cpu in ['riscv32', 'riscv64'] + cpu = 'riscv' +endif + targetos = host_machine.system() if cpu in ['x86', 'x86_64']