This requires renaming several directories: tcg/mips, linux-user/include/host/mips, and common-user/host/mips.
Reviewed-by: Philippe Mathieu-Daudé <[email protected]> Reviewed-by: Pierrick Bouvier <[email protected]> Signed-off-by: Richard Henderson <[email protected]> --- 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 c58fa93fd5..d3e6041186 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4074,7 +4074,7 @@ R: Huacai Chen <[email protected]> R: Jiaxun Yang <[email protected]> R: Aleksandar Rikalo <[email protected]> S: Odd Fixes -F: tcg/mips/ +F: tcg/mips64/ PPC TCG target M: Richard Henderson <[email protected]> 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 e9d0b9e2c0..04d0b214b6 100755 --- a/configure +++ b/configure @@ -400,10 +400,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" @@ -455,7 +453,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 0647ca0c89..c36f2f6962 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
