[PATCH 13/50] meson: Drop host_arch rename for mips64

Richard Henderson posted 50 patches 2 days, 5 hours ago
Maintainers: "Alex Bennée" <alex.bennee@linaro.org>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Thomas Huth <thuth@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, Fabiano Rosas <farosas@suse.de>, Laurent Vivier <lvivier@redhat.com>, Richard Henderson <richard.henderson@linaro.org>, Riku Voipio <riku.voipio@iki.fi>, Stefan Hajnoczi <stefanha@redhat.com>, Fam Zheng <fam@euphon.net>, Kevin Wolf <kwolf@redhat.com>, Hanna Reitz <hreitz@redhat.com>, Warner Losh <imp@bsdimp.com>, Kyle Evans <kevans@freebsd.org>, "Daniel P. Berrangé" <berrange@redhat.com>, Stefano Stabellini <sstabellini@kernel.org>, Anthony PERARD <anthony@xenproject.org>, Paul Durrant <paul@xen.org>, "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, "Michael S. Tsirkin" <mst@redhat.com>, David Hildenbrand <david@kernel.org>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, Peter Xu <peterx@redhat.com>, Li Zhijian <lizhijian@fujitsu.com>, Hyman Huang <yong.huang@smartx.com>, Peter Maydell <peter.maydell@linaro.org>, Helge Deller <deller@gmx.de>, Zhao Liu <zhao1.liu@intel.com>, Eduardo Habkost <eduardo@habkost.net>, Palmer Dabbelt <palmer@dabbelt.com>, Alistair Francis <alistair.francis@wdc.com>, Weiwei Li <liwei1518@gmail.com>, Daniel Henrique Barboza <dbarboza@ventanamicro.com>, Liu Zhiwei <zhiwei_liu@linux.alibaba.com>, Ilya Leoshkevich <iii@linux.ibm.com>, WANG Xuerui <git@xen0n.name>, Stefan Weil <sw@weilnetz.de>
[PATCH 13/50] meson: Drop host_arch rename for mips64
Posted by Richard Henderson 2 days, 5 hours ago
This requires renaming several directories:
tcg/mips, linux-user/include/host/mips, and
common-user/host/mips.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 linux-user/include/host/{mips => mips64}/host-signal.h | 0
 tcg/{mips => mips64}/tcg-target-con-set.h              | 0
 tcg/{mips => mips64}/tcg-target-con-str.h              | 0
 tcg/{mips => mips64}/tcg-target-has.h                  | 0
 tcg/{mips => mips64}/tcg-target-mo.h                   | 0
 tcg/{mips => mips64}/tcg-target-reg-bits.h             | 0
 tcg/{mips => mips64}/tcg-target.h                      | 0
 MAINTAINERS                                            | 2 +-
 common-user/host/{mips => mips64}/safe-syscall.inc.S   | 0
 configure                                              | 8 +++-----
 meson.build                                            | 2 --
 tcg/{mips => mips64}/tcg-target-opc.h.inc              | 0
 tcg/{mips => mips64}/tcg-target.c.inc                  | 0
 13 files changed, 4 insertions(+), 8 deletions(-)
 rename linux-user/include/host/{mips => mips64}/host-signal.h (100%)
 rename tcg/{mips => mips64}/tcg-target-con-set.h (100%)
 rename tcg/{mips => mips64}/tcg-target-con-str.h (100%)
 rename tcg/{mips => mips64}/tcg-target-has.h (100%)
 rename tcg/{mips => mips64}/tcg-target-mo.h (100%)
 rename tcg/{mips => mips64}/tcg-target-reg-bits.h (100%)
 rename tcg/{mips => mips64}/tcg-target.h (100%)
 rename common-user/host/{mips => mips64}/safe-syscall.inc.S (100%)
 rename tcg/{mips => mips64}/tcg-target-opc.h.inc (100%)
 rename tcg/{mips => mips64}/tcg-target.c.inc (100%)

diff --git a/linux-user/include/host/mips/host-signal.h b/linux-user/include/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-bits.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 cf7d2fba2f..4a79947ba3 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4042,7 +4042,7 @@ R: Huacai Chen <chenhuacai@kernel.org>
 R: Jiaxun Yang <jiaxun.yang@flygoat.com>
 R: Aleksandar Rikalo <arikalo@gmail.com>
 S: Odd Fixes
-F: tcg/mips/
+F: tcg/mips64/
 
 PPC TCG target
 M: Richard Henderson <richard.henderson@linaro.org>
diff --git a/common-user/host/mips/safe-syscall.inc.S b/common-user/host/mips64/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 846fab904e..fab9a45531 100755
--- a/configure
+++ b/configure
@@ -395,10 +395,8 @@ elif check_define _ARCH_PPC64 ; then
   else
     cpu="ppc64"
   fi
-elif check_define __mips__ ; then
-  if check_define __mips64 ; then
-    cpu="mips64"
-  fi
+elif check_define __mips64 ; then
+  cpu="mips64"
 elif check_define __s390__ ; then
   if check_define __s390x__ ; then
     cpu="s390x"
@@ -448,7 +446,7 @@ case "$cpu" in
 
   mips64*|mipsisa64*)
     cpu=mips64
-    host_arch=mips
+    host_arch=mips64
     linux_arch=mips
     ;;
 
diff --git a/meson.build b/meson.build
index f9fb76ece3..6896c7a64f 100644
--- a/meson.build
+++ b/meson.build
@@ -265,8 +265,6 @@ enable_modules = get_option('modules') \
 
 if cpu not in supported_cpus
   host_arch = 'unknown'
-elif cpu == 'mips64'
-  host_arch = 'mips'
 elif cpu in ['riscv32', 'riscv64']
   host_arch = '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
-- 
2.43.0
Re: [PATCH 13/50] meson: Drop host_arch rename for mips64
Posted by Pierrick Bouvier 1 day, 14 hours ago
On 1/7/26 9:29 PM, Richard Henderson wrote:
> This requires renaming several directories:
> tcg/mips, linux-user/include/host/mips, and
> common-user/host/mips.
> 
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
>   linux-user/include/host/{mips => mips64}/host-signal.h | 0
>   tcg/{mips => mips64}/tcg-target-con-set.h              | 0
>   tcg/{mips => mips64}/tcg-target-con-str.h              | 0
>   tcg/{mips => mips64}/tcg-target-has.h                  | 0
>   tcg/{mips => mips64}/tcg-target-mo.h                   | 0
>   tcg/{mips => mips64}/tcg-target-reg-bits.h             | 0
>   tcg/{mips => mips64}/tcg-target.h                      | 0
>   MAINTAINERS                                            | 2 +-
>   common-user/host/{mips => mips64}/safe-syscall.inc.S   | 0
>   configure                                              | 8 +++-----
>   meson.build                                            | 2 --
>   tcg/{mips => mips64}/tcg-target-opc.h.inc              | 0
>   tcg/{mips => mips64}/tcg-target.c.inc                  | 0
>   13 files changed, 4 insertions(+), 8 deletions(-)
>   rename linux-user/include/host/{mips => mips64}/host-signal.h (100%)
>   rename tcg/{mips => mips64}/tcg-target-con-set.h (100%)
>   rename tcg/{mips => mips64}/tcg-target-con-str.h (100%)
>   rename tcg/{mips => mips64}/tcg-target-has.h (100%)
>   rename tcg/{mips => mips64}/tcg-target-mo.h (100%)
>   rename tcg/{mips => mips64}/tcg-target-reg-bits.h (100%)
>   rename tcg/{mips => mips64}/tcg-target.h (100%)
>   rename common-user/host/{mips => mips64}/safe-syscall.inc.S (100%)
>   rename tcg/{mips => mips64}/tcg-target-opc.h.inc (100%)
>   rename tcg/{mips => mips64}/tcg-target.c.inc (100%)
> 

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Re: [PATCH 13/50] meson: Drop host_arch rename for mips64
Posted by Philippe Mathieu-Daudé 1 day, 23 hours ago
On 8/1/26 06:29, Richard Henderson wrote:
> This requires renaming several directories:
> tcg/mips, linux-user/include/host/mips, and
> common-user/host/mips.
> 
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
>   linux-user/include/host/{mips => mips64}/host-signal.h | 0
>   tcg/{mips => mips64}/tcg-target-con-set.h              | 0
>   tcg/{mips => mips64}/tcg-target-con-str.h              | 0
>   tcg/{mips => mips64}/tcg-target-has.h                  | 0
>   tcg/{mips => mips64}/tcg-target-mo.h                   | 0
>   tcg/{mips => mips64}/tcg-target-reg-bits.h             | 0
>   tcg/{mips => mips64}/tcg-target.h                      | 0
>   MAINTAINERS                                            | 2 +-
>   common-user/host/{mips => mips64}/safe-syscall.inc.S   | 0
>   configure                                              | 8 +++-----
>   meson.build                                            | 2 --
>   tcg/{mips => mips64}/tcg-target-opc.h.inc              | 0
>   tcg/{mips => mips64}/tcg-target.c.inc                  | 0
>   13 files changed, 4 insertions(+), 8 deletions(-)
>   rename linux-user/include/host/{mips => mips64}/host-signal.h (100%)
>   rename tcg/{mips => mips64}/tcg-target-con-set.h (100%)
>   rename tcg/{mips => mips64}/tcg-target-con-str.h (100%)
>   rename tcg/{mips => mips64}/tcg-target-has.h (100%)
>   rename tcg/{mips => mips64}/tcg-target-mo.h (100%)
>   rename tcg/{mips => mips64}/tcg-target-reg-bits.h (100%)
>   rename tcg/{mips => mips64}/tcg-target.h (100%)
>   rename common-user/host/{mips => mips64}/safe-syscall.inc.S (100%)
>   rename tcg/{mips => mips64}/tcg-target-opc.h.inc (100%)
>   rename tcg/{mips => mips64}/tcg-target.c.inc (100%)

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>