From nobody Mon Feb 9 12:57:20 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=1768534666; cv=none; d=zohomail.com; s=zohoarc; b=igxUcxo0q8nOHK/31syyWpUh6uObf/qb2kH6l3lwBaOe0irncjZhMsoQH+HYMJ6PWLRqfCFJKxFxOGHMJNgGAcMcakirRLRdY1SLGv0HyvarISNSvleDovl+cx1eNt8pI4uQM5K4liNrjmGtMnS7A2fQcMSMuMbB431VstFszWM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768534666; 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=KL546BRv3o5TBcmNuNTcD1O7NivqyCwfyc6P5AJbIyY=; b=KwsWLqIZ6TRYEERkwIsdAj/ldASZJy3GisE9ARIFw9/88mYgTz9IorGJRH1BE5mAo/rkGj9YyoCUeBz7o6RGn4pXpxr5Wt9s2nzTMFk0iuxZpiHoO1Cnqy8hrfbEEW1s7K+vZWHBlywEKrQasmnG0BZUCiDEgdZXt65e1kUPyAE= 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 1768534666616656.1662469776285; Thu, 15 Jan 2026 19:37:46 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vgabo-0007Vr-TH; Thu, 15 Jan 2026 22:34:48 -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 1vgabd-0007Fz-N5 for qemu-devel@nongnu.org; Thu, 15 Jan 2026 22:34:40 -0500 Received: from mail-pf1-x433.google.com ([2607:f8b0:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vgabc-0005ks-0Y for qemu-devel@nongnu.org; Thu, 15 Jan 2026 22:34:37 -0500 Received: by mail-pf1-x433.google.com with SMTP id d2e1a72fcca58-7b22ffa2a88so705436b3a.1 for ; Thu, 15 Jan 2026 19:34:35 -0800 (PST) Received: from stoup.. ([180.233.125.201]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-81fa12b5c67sm683372b3a.69.2026.01.15.19.34.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Jan 2026 19:34:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1768534475; x=1769139275; 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=KL546BRv3o5TBcmNuNTcD1O7NivqyCwfyc6P5AJbIyY=; b=PebdVed6IiAeFlUbg9Y3i0KLuwCTinvPIBb1gbDbIoBnAOHtRTFxiz0t9gEcuGEGkJ sSFhhhzPIQf94LA22qkuivpJwz6WsnuOoTSl+xjujhRaulSyobhvmWXbsYLF8GDRP+nh ed+NQ4pcNdp/GZpviJCvNLUxOvwzb3QtyumaHLVLrySAv310bDcoJD7lRU/rMaF/IVXr QA69pcYcmSj0ayNn4A7DKs4ZZ2I/TPXWzipfpXD54go1DmufDgmpkdEKNvO+jWMjQ5tu IG0zm3o/TjMeyJ9bdxC/fUfqWn4blWejcKQnC9R/N/U/cXQEhvCQ8Xp6MLPGM1zqlvUT N3kQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768534475; x=1769139275; 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=KL546BRv3o5TBcmNuNTcD1O7NivqyCwfyc6P5AJbIyY=; b=UaLqJhz5+Lfonhw56w3gaM0XYY7uPJnTYmWM5hoC77kGjIVC+Z6DZe4HNrc4eCsrL2 7XV7KJZclMbwinSdU0MtCU4OpVRH4k4sRknBbVLea1tEvoiZybs6stQrA/rMOMsTm0r0 154JSBqd748+tfq551t7KOr/yAvhGrKD0OPMJcr6bDiK0Q2RiCEHSIwJCIDVncUjTUoP tYSyb5Qgemosfn3EmRRRkY08hXmBzjQSi0kacuQao7PMG+l2VaaMf941JOveE/NmX07P fEhiwnD86ooYIlxzJ3kk4+gZlmFzPzHMh7yrsxdBB3oG6/v/rCi0mGmh5JZBlCVblWrp zNzQ== X-Gm-Message-State: AOJu0YyCnqBPTlbUvnhifU/WE3gIv1VtX0TNLmyfyOfwJ5B42nT0Farl e31omeaOqUx04LYzHecWTKIhWTED2YWi2IAk47FBwVQeA2ArEw0pwH3v9t3/unzB7RXbSApm1LS +dEmxNn3q5A== X-Gm-Gg: AY/fxX7wtR/GA6lRTK4LDeMQh6q/M15OfyfSDsIqAJUBI4GMOOTbRyPt8XVQIpDn7D0 sVyM65qUM02lq+nydUBll/iCgeKCyKKk7jdJSiRhbNwdOFJ+5O/gDrQietUVFw3rNe1ID/i96TQ nA44xHvfnpZGZUV2KbTAd6HbyOQmk67sqI4GKv2dNhIR72LmXuHmD4z4XvgAz8mcVs1XrFPN/MI 3UbH8Ed6PtnfhGbDVvzBW4OTJHVnC+Sg6BzP9hR4vlbTbSjhwNtddKE4k2GuiqcS8yN8keiFKLn njA6YibUqAJw2KSJ0URZetOJbY7t/fSCHA+jYjglb78je39mZobbGW1u691oH2+IWYrlmSb1Rj4 NV9Tmj+MIXalnaGXxxlV3kFOpb0UoSi2Duil3w3geTQQZq+1Xdbblmk0Vfpmzqu4rE17L4QrNK2 2tsGJdGFYPjKJHygrVYA== X-Received: by 2002:a05:6a00:2e90:b0:81f:44f9:7c1a with SMTP id d2e1a72fcca58-81fa1771ec6mr1122948b3a.3.1768534474569; Thu, 15 Jan 2026 19:34:34 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: ktokunaga.mail@gmail.com, berrange@redhat.com, pierrick.bouvier@linaro.org, thuth@redhat.com, pbonzini@redhat.com, philmd@linaro.org Subject: [PATCH v2 20/58] meson: Drop host_arch rename for mips64 Date: Fri, 16 Jan 2026 14:32:26 +1100 Message-ID: <20260116033305.51162-21-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260116033305.51162-1-richard.henderson@linaro.org> References: <20260116033305.51162-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::433; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x433.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 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: 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: 1768534667999158500 This requires renaming several directories: tcg/mips, linux-user/include/host/mips, and common-user/host/mips. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Signed-off-by: Richard Henderson --- linux-user/include/host/{mips =3D> mips64}/host-signal.h | 0 tcg/{mips =3D> mips64}/tcg-target-con-set.h | 0 tcg/{mips =3D> mips64}/tcg-target-con-str.h | 0 tcg/{mips =3D> mips64}/tcg-target-has.h | 0 tcg/{mips =3D> mips64}/tcg-target-mo.h | 0 tcg/{mips =3D> mips64}/tcg-target-reg-bits.h | 0 tcg/{mips =3D> mips64}/tcg-target.h | 0 MAINTAINERS | 2 +- common-user/host/{mips =3D> mips64}/safe-syscall.inc.S | 0 configure | 8 +++----- meson.build | 2 -- tcg/{mips =3D> mips64}/tcg-target-opc.h.inc | 0 tcg/{mips =3D> mips64}/tcg-target.c.inc | 0 13 files changed, 4 insertions(+), 8 deletions(-) rename linux-user/include/host/{mips =3D> mips64}/host-signal.h (100%) rename tcg/{mips =3D> mips64}/tcg-target-con-set.h (100%) rename tcg/{mips =3D> mips64}/tcg-target-con-str.h (100%) rename tcg/{mips =3D> mips64}/tcg-target-has.h (100%) rename tcg/{mips =3D> mips64}/tcg-target-mo.h (100%) rename tcg/{mips =3D> mips64}/tcg-target-reg-bits.h (100%) rename tcg/{mips =3D> mips64}/tcg-target.h (100%) rename common-user/host/{mips =3D> mips64}/safe-syscall.inc.S (100%) rename tcg/{mips =3D> mips64}/tcg-target-opc.h.inc (100%) rename tcg/{mips =3D> mips64}/tcg-target.c.inc (100%) diff --git a/linux-user/include/host/mips/host-signal.h b/linux-user/includ= e/host/mips64/host-signal.h similarity index 100% rename from linux-user/include/host/mips/host-signal.h rename to linux-user/include/host/mips64/host-signal.h diff --git a/tcg/mips/tcg-target-con-set.h b/tcg/mips64/tcg-target-con-set.h similarity index 100% rename from tcg/mips/tcg-target-con-set.h rename to tcg/mips64/tcg-target-con-set.h diff --git a/tcg/mips/tcg-target-con-str.h b/tcg/mips64/tcg-target-con-str.h similarity index 100% rename from tcg/mips/tcg-target-con-str.h rename to tcg/mips64/tcg-target-con-str.h diff --git a/tcg/mips/tcg-target-has.h b/tcg/mips64/tcg-target-has.h similarity index 100% rename from tcg/mips/tcg-target-has.h rename to tcg/mips64/tcg-target-has.h diff --git a/tcg/mips/tcg-target-mo.h b/tcg/mips64/tcg-target-mo.h similarity index 100% rename from tcg/mips/tcg-target-mo.h rename to tcg/mips64/tcg-target-mo.h diff --git a/tcg/mips/tcg-target-reg-bits.h b/tcg/mips64/tcg-target-reg-bit= s.h similarity index 100% rename from tcg/mips/tcg-target-reg-bits.h rename to tcg/mips64/tcg-target-reg-bits.h diff --git a/tcg/mips/tcg-target.h b/tcg/mips64/tcg-target.h similarity index 100% rename from tcg/mips/tcg-target.h rename to tcg/mips64/tcg-target.h diff --git a/MAINTAINERS b/MAINTAINERS index c58fa93fd5..d3e6041186 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4074,7 +4074,7 @@ R: Huacai Chen R: Jiaxun Yang R: Aleksandar Rikalo S: Odd Fixes -F: tcg/mips/ +F: tcg/mips64/ =20 PPC TCG target M: Richard Henderson diff --git a/common-user/host/mips/safe-syscall.inc.S b/common-user/host/mi= ps64/safe-syscall.inc.S similarity index 100% rename from common-user/host/mips/safe-syscall.inc.S rename to common-user/host/mips64/safe-syscall.inc.S diff --git a/configure b/configure index e9d0b9e2c0..04d0b214b6 100755 --- a/configure +++ b/configure @@ -400,10 +400,8 @@ elif check_define _ARCH_PPC64 ; then else cpu=3D"ppc64" fi -elif check_define __mips__ ; then - if check_define __mips64 ; then - cpu=3D"mips64" - fi +elif check_define __mips64 ; then + cpu=3D"mips64" elif check_define __s390__ ; then if check_define __s390x__ ; then cpu=3D"s390x" @@ -455,7 +453,7 @@ case "$cpu" in =20 mips64*|mipsisa64*) cpu=3Dmips64 - host_arch=3Dmips + host_arch=3Dmips64 linux_arch=3Dmips ;; =20 diff --git a/meson.build b/meson.build index 0647ca0c89..c36f2f6962 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 =3D=3D 'mips64' - host_arch =3D 'mips' elif cpu in ['riscv32', 'riscv64'] host_arch =3D 'riscv' else diff --git a/tcg/mips/tcg-target-opc.h.inc b/tcg/mips64/tcg-target-opc.h.inc similarity index 100% rename from tcg/mips/tcg-target-opc.h.inc rename to tcg/mips64/tcg-target-opc.h.inc diff --git a/tcg/mips/tcg-target.c.inc b/tcg/mips64/tcg-target.c.inc similarity index 100% rename from tcg/mips/tcg-target.c.inc rename to tcg/mips64/tcg-target.c.inc --=20 2.43.0