From nobody Mon Feb 9 16:35:55 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=1768774140; cv=none; d=zohomail.com; s=zohoarc; b=h1AdFnzJsWUQI+GYoseMoLJD9rRssMwYtg1zL3NFUiQL6mPrRZ5quiDgXUKKOQu/TAsYF+taQ+B6MO0Ck8O4Md0zbkOclqz+wt+dTBhunQO9uAOFUAh7AF2KJkAGVnyvyele25oFmL3jcA9QfEvkndBXM0T/+AbdpGxDtR/AzXU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768774140; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=1elLXYSGrJNsfz40yQiYIFdnTmy9vR+YxG5ftNQkGbA=; b=VeDgHFTlbQA7FTsS2z5v/Gf2nICbKtG8ccNT3B9uoeODlr9vOKCs5EM+4LtiZHJSI4TLGmfZ/MJKCmq6RRHa6KgV7rNHbZdxhq8zfhs1tMeFPWOEI1ffGep80Js7D2acLCzlLvYQgNjdcI1hEdtJunEhMtX6kiFrtMTIfpG/T3Q= 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 1768774140674587.1051771997609; Sun, 18 Jan 2026 14:09:00 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vhatp-0002cn-0j; Sun, 18 Jan 2026 17:05:33 -0500 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 1vhatN-00029f-Kv for qemu-devel@nongnu.org; Sun, 18 Jan 2026 17:05:07 -0500 Received: from mail-pl1-x630.google.com ([2607:f8b0:4864:20::630]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vhatL-0000d6-Fu for qemu-devel@nongnu.org; Sun, 18 Jan 2026 17:05:04 -0500 Received: by mail-pl1-x630.google.com with SMTP id d9443c01a7336-2a110548cdeso24515685ad.0 for ; Sun, 18 Jan 2026 14:05:02 -0800 (PST) Received: from stoup.. ([180.233.125.201]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a7193dbb74sm74402865ad.56.2026.01.18.14.04.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Jan 2026 14:05:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1768773901; x=1769378701; darn=nongnu.org; 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=1elLXYSGrJNsfz40yQiYIFdnTmy9vR+YxG5ftNQkGbA=; b=D3qlQ9OXenMm39QsRr4VJTOR/+M132m2owehbRumXFAXMrQOZxPvUFTtbDcH8yVd2k ucgry0T4AmJWZ0+0sUv8rpPzPoenwauJKp//yA1gDxXbcAdpkcbmaClzwzz6p11/UX/3 nyvYxj5UQpN4W4KqiAKW1BpjHeGnGkL8pp7ZYfmn6NC9stgXDOqa0bzKfrpcGy5bppFM MhJn771eR+5dVeyzmeRJTEgfPYe+aXIpZWZwgjNnYh2SBJOdIo9uEKWDXAcKlCqclmIu NzsFDcKYVC5FxWshfU+5/EbK+IZKE8D3tVeQix4Vg6H170u32P2Cd8V/59dnvMqTc5uk GpYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768773901; x=1769378701; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=1elLXYSGrJNsfz40yQiYIFdnTmy9vR+YxG5ftNQkGbA=; b=Ok1r+edDeSGxPkknIBFgDUoN1WUi2BA5GgcyTCQS1wzRcF+6tMt96fP6zWt714bX4B Rv4vIyEYpWyjAN3Rmbw0ZwcxQyZf2I3Uir2OrA8aMV3Kz7V/YOVyw4ENPE44gp2piqrR CZgvH6NrT00Z4zoJF1fL5FkQpoXA3VTTqRW3vAuWoQlMf3ocgJ4iW9OHcRXq4zHjNf4j DB6V91mf5Vw3FMmGiU+wE8c1rhOXb7mM/YIG31eiOQGPmsme6Bs7SkGWGr/MehsVPMSB b1fJ4Ag/AItgF/KxiIervv/ANXyymbZay0D/l6ay8s7qhridRVVI2y7wtm5YOdEt2F8I 5dlw== X-Gm-Message-State: AOJu0YybV1OCfsr8JrIE+ZlTukn2uVLtxRIFNqHDAqx7IKA8CF7ac7Go C0lgvTIUqzQ+O4T+kHJKAEX/dd8UnPlvkrKSuwRA0y0p1M1B43as5Wa6RULv+rjjdZwjubjvqnn KCixI4t2rYQ== X-Gm-Gg: AY/fxX7Fe4TT+euRVHfID06hbZMHkxUCeSdG5AgT+VdIiEZCbPDjKDeD/X5hOE8KDiz KmHK4lOgoBCnQPbONwnaz2Wm74pg1XoiiIWp6DJD3cEYsGMqeGVCBrAKh9qZEXH3j1Unl0X7lIU CRw/FRCthQUtDestjMoBUwwLeI9ZQ4xgSBTSGspEspZGn3qmMc5zsbyOtG5MdvTYeF9iInuWKDX VvpPXBx6EuyugAgeZhAi6wOSz+D0FJRFkiNAgFC1kmveA10IAEqqmGvLJ4yQ0C/5EApk5QMALJI YQmA8y5GDGu+nB/C0PSVYZ2tpSDMSjMNPwyVVpjZiP9mqdgHiF8ZWuj8dcRu5aJTtdkEpdnRphe +fEbfy1QogN+Vj2ksERVwvfGTcrJhBwB00U6FZ9aJH1lJdhc8PYiZRwVcEIbiQbRnxJMkNtRz6v x7/qPnOvd6b103QTs1MQ== X-Received: by 2002:a17:902:d488:b0:295:7b89:cb8f with SMTP id d9443c01a7336-2a717413b94mr74261785ad.0.1768773901329; Sun, 18 Jan 2026 14:05:01 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pierrick Bouvier Subject: [PULL 17/54] meson: Drop host_arch rename for riscv64 Date: Mon, 19 Jan 2026 09:03:37 +1100 Message-ID: <20260118220414.8177-18-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260118220414.8177-1-richard.henderson@linaro.org> References: <20260118220414.8177-1-richard.henderson@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 (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=2607:f8b0:4864:20::630; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x630.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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, RCVD_IN_SBL_CSS=3.335, 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: qemu development 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: 1768774142712158500 This requires renaming several directories: tcg/riscv, linux-user/include/host/riscv, and common-user/host/riscv. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Signed-off-by: Richard Henderson --- host/include/{riscv =3D> riscv64}/host/cpuinfo.h | 0 linux-user/include/host/{riscv =3D> riscv64}/host-signal.h | 0 tcg/{riscv =3D> riscv64}/tcg-target-con-set.h | 0 tcg/{riscv =3D> riscv64}/tcg-target-con-str.h | 0 tcg/{riscv =3D> riscv64}/tcg-target-has.h | 0 tcg/{riscv =3D> riscv64}/tcg-target-mo.h | 0 tcg/{riscv =3D> riscv64}/tcg-target-reg-bits.h | 0 tcg/{riscv =3D> riscv64}/tcg-target.h | 0 MAINTAINERS | 2 +- common-user/host/{riscv =3D> riscv64}/safe-syscall.inc.S | 0 configure | 4 ++-- meson.build | 2 -- tcg/{riscv =3D> riscv64}/tcg-target-opc.h.inc | 0 tcg/{riscv =3D> riscv64}/tcg-target.c.inc | 0 14 files changed, 3 insertions(+), 5 deletions(-) rename host/include/{riscv =3D> riscv64}/host/cpuinfo.h (100%) rename linux-user/include/host/{riscv =3D> riscv64}/host-signal.h (100%) rename tcg/{riscv =3D> riscv64}/tcg-target-con-set.h (100%) rename tcg/{riscv =3D> riscv64}/tcg-target-con-str.h (100%) rename tcg/{riscv =3D> riscv64}/tcg-target-has.h (100%) rename tcg/{riscv =3D> riscv64}/tcg-target-mo.h (100%) rename tcg/{riscv =3D> riscv64}/tcg-target-reg-bits.h (100%) rename tcg/{riscv =3D> riscv64}/tcg-target.h (100%) rename common-user/host/{riscv =3D> riscv64}/safe-syscall.inc.S (100%) rename tcg/{riscv =3D> riscv64}/tcg-target-opc.h.inc (100%) rename tcg/{riscv =3D> riscv64}/tcg-target.c.inc (100%) diff --git a/host/include/riscv/host/cpuinfo.h b/host/include/riscv64/host/= cpuinfo.h similarity index 100% rename from host/include/riscv/host/cpuinfo.h rename to host/include/riscv64/host/cpuinfo.h diff --git a/linux-user/include/host/riscv/host-signal.h b/linux-user/inclu= de/host/riscv64/host-signal.h similarity index 100% rename from linux-user/include/host/riscv/host-signal.h rename to linux-user/include/host/riscv64/host-signal.h diff --git a/tcg/riscv/tcg-target-con-set.h b/tcg/riscv64/tcg-target-con-se= t.h similarity index 100% rename from tcg/riscv/tcg-target-con-set.h rename to tcg/riscv64/tcg-target-con-set.h diff --git a/tcg/riscv/tcg-target-con-str.h b/tcg/riscv64/tcg-target-con-st= r.h similarity index 100% rename from tcg/riscv/tcg-target-con-str.h rename to tcg/riscv64/tcg-target-con-str.h diff --git a/tcg/riscv/tcg-target-has.h b/tcg/riscv64/tcg-target-has.h similarity index 100% rename from tcg/riscv/tcg-target-has.h rename to tcg/riscv64/tcg-target-has.h diff --git a/tcg/riscv/tcg-target-mo.h b/tcg/riscv64/tcg-target-mo.h similarity index 100% rename from tcg/riscv/tcg-target-mo.h rename to tcg/riscv64/tcg-target-mo.h diff --git a/tcg/riscv/tcg-target-reg-bits.h b/tcg/riscv64/tcg-target-reg-b= its.h similarity index 100% rename from tcg/riscv/tcg-target-reg-bits.h rename to tcg/riscv64/tcg-target-reg-bits.h diff --git a/tcg/riscv/tcg-target.h b/tcg/riscv64/tcg-target.h similarity index 100% rename from tcg/riscv/tcg-target.h rename to tcg/riscv64/tcg-target.h diff --git a/MAINTAINERS b/MAINTAINERS index d3e6041186..c1e586c58f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4086,7 +4086,7 @@ M: Palmer Dabbelt M: Alistair Francis L: qemu-riscv@nongnu.org S: Maintained -F: tcg/riscv/ +F: tcg/riscv64/ F: disas/riscv.[ch] =20 S390 TCG target diff --git a/common-user/host/riscv/safe-syscall.inc.S b/common-user/host/r= iscv64/safe-syscall.inc.S similarity index 100% rename from common-user/host/riscv/safe-syscall.inc.S rename to common-user/host/riscv64/safe-syscall.inc.S diff --git a/configure b/configure index 04d0b214b6..ee09f90125 100755 --- a/configure +++ b/configure @@ -469,8 +469,8 @@ case "$cpu" in CPU_CFLAGS=3D"-m64 -mlittle-endian" ;; =20 - riscv32 | riscv64) - host_arch=3Driscv + riscv64) + host_arch=3Driscv64 linux_arch=3Driscv ;; =20 diff --git a/meson.build b/meson.build index c36f2f6962..e1ac764793 100644 --- a/meson.build +++ b/meson.build @@ -265,8 +265,6 @@ enable_modules =3D get_option('modules') \ =20 if cpu not in supported_cpus host_arch =3D 'unknown' -elif cpu in ['riscv32', 'riscv64'] - host_arch =3D 'riscv' else host_arch =3D cpu endif diff --git a/tcg/riscv/tcg-target-opc.h.inc b/tcg/riscv64/tcg-target-opc.h.= inc similarity index 100% rename from tcg/riscv/tcg-target-opc.h.inc rename to tcg/riscv64/tcg-target-opc.h.inc diff --git a/tcg/riscv/tcg-target.c.inc b/tcg/riscv64/tcg-target.c.inc similarity index 100% rename from tcg/riscv/tcg-target.c.inc rename to tcg/riscv64/tcg-target.c.inc --=20 2.43.0