target/or1k: Rename from openrisc

This is the minimal change beginning with TARGET_ARCH in
configs/targets/or1k-* from openrisc to or1k, then adjust
TARGET_OR1K, QEMU_ARCH_OR1K, directory names,
and meson.build to match.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20260205030244.266447-2-richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>

diff --git a/MAINTAINERS b/MAINTAINERS
index 65ac60b86b172cd7b391257ccf10094b0b2c17d5..08bcd8892ac91b748ea95e7597dbc667d9bb999c 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -303,7 +303,7 @@ OpenRISC TCG CPUs
 M: Stafford Horne <shorne@gmail.com>
 S: Odd Fixes
 F: docs/system/openrisc/cpu-features.rst
-F: target/openrisc/
+F: target/or1k/
 F: hw/openrisc/
 F: include/hw/openrisc/
 F: tests/functional/or1k/meson.build

diff --git a/configs/targets/or1k-linux-user.mak b/configs/targets/or1k-linux-user.mak
index 97d7cb10465b51d818a8aae57219e0d581883262..0ee3a05884d85d56d8fc9f02c37db05f42353e2b 100644 (file)
--- a/configs/targets/or1k-linux-user.mak
+++ b/configs/targets/or1k-linux-user.mak
@@ -1,4 +1,4 @@
-TARGET_ARCH=openrisc
+TARGET_ARCH=or1k
 TARGET_BIG_ENDIAN=y
 TARGET_SYSTBL_ABI=common,32,or1k,time32,stat64,rlimit,renameat
 TARGET_SYSTBL=syscall.tbl

diff --git a/configs/targets/or1k-softmmu.mak b/configs/targets/or1k-softmmu.mak
index c53408a2bf5ae8c2d3ab5ea5c16afa18aa12af46..204283d604fe80166e16ffcb83f7bc79912d3495 100644 (file)
--- a/configs/targets/or1k-softmmu.mak
+++ b/configs/targets/or1k-softmmu.mak
@@ -1,4 +1,4 @@
-TARGET_ARCH=openrisc
+TARGET_ARCH=or1k
 TARGET_BIG_ENDIAN=y
 # needed by boot.c and all boards
 TARGET_NEED_FDT=y

diff --git a/hw/openrisc/Kconfig b/hw/openrisc/Kconfig
index 0702f622a55f525f1e8e7d6e2f57bae579599b35..b5c2e5655bc2605df7bd5ee8c1caf56c573a1a2b 100644 (file)
--- a/hw/openrisc/Kconfig
+++ b/hw/openrisc/Kconfig
@@ -1,7 +1,7 @@
 config OR1K_SIM
     bool
     default y
-    depends on OPENRISC
+    depends on OR1K
     select DEVICE_TREE
     select SERIAL_MM
     select OPENCORES_ETH
@@ -11,7 +11,7 @@ config OR1K_SIM
 config OR1K_VIRT
     bool
     default y
-    depends on OPENRISC
+    depends on OR1K
     imply PCI_DEVICES
     imply VIRTIO_VGA
     imply TEST_DEVICES

diff --git a/hw/openrisc/meson.build b/hw/openrisc/meson.build
index 82f1f0ef1cc91e437bb3dcc2279957c189212d2e..49c274b84836893cf721f51dc71b632db2ed4704 100644 (file)
--- a/hw/openrisc/meson.build
+++ b/hw/openrisc/meson.build
@@ -4,4 +4,4 @@ openrisc_ss.add(files('boot.c'))
 openrisc_ss.add(when: 'CONFIG_OR1K_SIM', if_true: files('openrisc_sim.c'))
 openrisc_ss.add(when: 'CONFIG_OR1K_VIRT', if_true: files('virt.c'))
 
-hw_arch += {'openrisc': openrisc_ss}
+hw_arch += {'or1k': openrisc_ss}

diff --git a/include/exec/poison.h b/include/exec/poison.h
index a779adbb7a6cbfa68fa011fabb324b7410603692..21eed4c54fac1fdee83582112ea4f053524bd3d1 100644 (file)
--- a/include/exec/poison.h
+++ b/include/exec/poison.h
@@ -21,7 +21,7 @@
 #pragma GCC poison TARGET_ABI_MIPSO32
 #pragma GCC poison TARGET_MIPS64
 #pragma GCC poison TARGET_ABI_MIPSN64
-#pragma GCC poison TARGET_OPENRISC
+#pragma GCC poison TARGET_OR1K
 #pragma GCC poison TARGET_PPC
 #pragma GCC poison TARGET_PPC64
 #pragma GCC poison TARGET_ABI32

diff --git a/include/system/arch_init.h b/include/system/arch_init.h
index 51e24c3091e20bd7cbdbdf7b8b7d86754d9e85d6..f2f909d54064b5188d851b345a2379b57f13a381 100644 (file)
--- a/include/system/arch_init.h
+++ b/include/system/arch_init.h
@@ -15,7 +15,7 @@ enum {
     QEMU_ARCH_SH4 = (1 << 10),
     QEMU_ARCH_SPARC = (1 << 11),
     QEMU_ARCH_XTENSA = (1 << 12),
-    QEMU_ARCH_OPENRISC = (1 << 13),
+    QEMU_ARCH_OR1K = (1 << 13),
     QEMU_ARCH_TRICORE = (1 << 16),
     QEMU_ARCH_HPPA = (1 << 18),
     QEMU_ARCH_RISCV = (1 << 19),

diff --git a/include/user/abitypes.h b/include/user/abitypes.h
index be7a8765238266e8044d36910f643372750c0751..534a29bc12c6b4d140b8199d70b510528b3861b1 100644 (file)
--- a/include/user/abitypes.h
+++ b/include/user/abitypes.h
@@ -22,7 +22,7 @@
 
 #if (defined(TARGET_I386) && !defined(TARGET_X86_64)) \
     || defined(TARGET_SH4) \
-    || defined(TARGET_OPENRISC) \
+    || defined(TARGET_OR1K) \
     || defined(TARGET_MICROBLAZE)
 #define ABI_LLONG_ALIGNMENT 4
 #endif

diff --git a/linux-user/meson.build b/linux-user/meson.build
index efca8433698fa0163356fb27b47ffc66b4ca1aca..332847a621852fd8f6241a366a0623d291d29ba0 100644 (file)
--- a/linux-user/meson.build
+++ b/linux-user/meson.build
@@ -50,7 +50,7 @@ subdir('m68k')
 subdir('microblaze')
 subdir('mips64')
 subdir('mips')
-subdir('openrisc')
+subdir('or1k')
 subdir('ppc')
 subdir('riscv')
 subdir('s390x')

diff --git a/linux-user/openrisc/meson.build b/linux-user/openrisc/meson.build
deleted file mode 100644 (file)
index 273e7a0..0000000
--- a/linux-user/openrisc/meson.build
+++ /dev/null
@@ -1,5 +0,0 @@
-syscall_nr_generators += {
-  'openrisc': generator(sh,
-                      arguments: [ meson.current_source_dir() / 'syscallhdr.sh', '@INPUT@', '@OUTPUT@', '@EXTRA_ARGS@' ],
-                      output: '@BASENAME@_nr.h')
-}

diff --git a/linux-user/openrisc/cpu_loop.c b/linux-user/or1k/cpu_loop.c
similarity index 100%
rename from linux-user/openrisc/cpu_loop.c
rename to linux-user/or1k/cpu_loop.c

diff --git a/linux-user/openrisc/elfload.c b/linux-user/or1k/elfload.c
similarity index 100%
rename from linux-user/openrisc/elfload.c
rename to linux-user/or1k/elfload.c

diff --git a/linux-user/or1k/meson.build b/linux-user/or1k/meson.build
new file mode 100644 (file)
index 0000000..bb7c2ee
--- /dev/null
+++ b/linux-user/or1k/meson.build
@@ -0,0 +1,5 @@
+syscall_nr_generators += {
+  'or1k': generator(sh,
+                    arguments: [ meson.current_source_dir() / 'syscallhdr.sh', '@INPUT@', '@OUTPUT@', '@EXTRA_ARGS@' ],
+                    output: '@BASENAME@_nr.h')
+}

diff --git a/linux-user/openrisc/signal.c b/linux-user/or1k/signal.c
similarity index 100%
rename from linux-user/openrisc/signal.c
rename to linux-user/or1k/signal.c

diff --git a/linux-user/openrisc/sockbits.h b/linux-user/or1k/sockbits.h
similarity index 100%
rename from linux-user/openrisc/sockbits.h
rename to linux-user/or1k/sockbits.h

diff --git a/linux-user/openrisc/syscall.tbl b/linux-user/or1k/syscall.tbl
similarity index 100%
rename from linux-user/openrisc/syscall.tbl
rename to linux-user/or1k/syscall.tbl

diff --git a/linux-user/openrisc/syscallhdr.sh b/linux-user/or1k/syscallhdr.sh
similarity index 100%
rename from linux-user/openrisc/syscallhdr.sh
rename to linux-user/or1k/syscallhdr.sh

diff --git a/linux-user/openrisc/target_cpu.h b/linux-user/or1k/target_cpu.h
similarity index 100%
rename from linux-user/openrisc/target_cpu.h
rename to linux-user/or1k/target_cpu.h

diff --git a/linux-user/openrisc/target_elf.h b/linux-user/or1k/target_elf.h
similarity index 100%
rename from linux-user/openrisc/target_elf.h
rename to linux-user/or1k/target_elf.h

diff --git a/linux-user/openrisc/target_errno_defs.h b/linux-user/or1k/target_errno_defs.h
similarity index 100%
rename from linux-user/openrisc/target_errno_defs.h
rename to linux-user/or1k/target_errno_defs.h

diff --git a/linux-user/openrisc/target_fcntl.h b/linux-user/or1k/target_fcntl.h
similarity index 100%
rename from linux-user/openrisc/target_fcntl.h
rename to linux-user/or1k/target_fcntl.h

diff --git a/linux-user/openrisc/target_mman.h b/linux-user/or1k/target_mman.h
similarity index 100%
rename from linux-user/openrisc/target_mman.h
rename to linux-user/or1k/target_mman.h

diff --git a/linux-user/openrisc/target_prctl.h b/linux-user/or1k/target_prctl.h
similarity index 100%
rename from linux-user/openrisc/target_prctl.h
rename to linux-user/or1k/target_prctl.h

diff --git a/linux-user/openrisc/target_proc.h b/linux-user/or1k/target_proc.h
similarity index 100%
rename from linux-user/openrisc/target_proc.h
rename to linux-user/or1k/target_proc.h

diff --git a/linux-user/openrisc/target_ptrace.h b/linux-user/or1k/target_ptrace.h
similarity index 100%
rename from linux-user/openrisc/target_ptrace.h
rename to linux-user/or1k/target_ptrace.h

diff --git a/linux-user/openrisc/target_resource.h b/linux-user/or1k/target_resource.h
similarity index 100%
rename from linux-user/openrisc/target_resource.h
rename to linux-user/or1k/target_resource.h

diff --git a/linux-user/openrisc/target_signal.h b/linux-user/or1k/target_signal.h
similarity index 100%
rename from linux-user/openrisc/target_signal.h
rename to linux-user/or1k/target_signal.h

diff --git a/linux-user/openrisc/target_structs.h b/linux-user/or1k/target_structs.h
similarity index 100%
rename from linux-user/openrisc/target_structs.h
rename to linux-user/or1k/target_structs.h

diff --git a/linux-user/openrisc/target_syscall.h b/linux-user/or1k/target_syscall.h
similarity index 100%
rename from linux-user/openrisc/target_syscall.h
rename to linux-user/or1k/target_syscall.h

diff --git a/linux-user/openrisc/termbits.h b/linux-user/or1k/termbits.h
similarity index 100%
rename from linux-user/openrisc/termbits.h
rename to linux-user/or1k/termbits.h

diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
index 6ae6e1fa13971bf2533b2f33c2a34a9ec77d1711..20d862fd8b1f4002bbd7256baab499eb749a8f1f 100644 (file)
--- a/linux-user/syscall_defs.h
+++ b/linux-user/syscall_defs.h
@@ -72,7 +72,7 @@
 
 #if defined(TARGET_I386) || defined(TARGET_ARM) || defined(TARGET_SH4)  \
     || defined(TARGET_M68K)                                             \
-    || defined(TARGET_S390X) || defined(TARGET_OPENRISC)                \
+    || defined(TARGET_S390X) || defined(TARGET_OR1K)                    \
     || defined(TARGET_RISCV)                                            \
     || defined(TARGET_XTENSA) || defined(TARGET_LOONGARCH64)
 
@@ -1976,7 +1976,7 @@ struct target_stat64  {
     abi_ulong __unused5;
 };
 
-#elif defined(TARGET_OPENRISC) \
+#elif defined(TARGET_OR1K) \
     || defined(TARGET_RISCV) || defined(TARGET_HEXAGON) || defined(TARGET_LOONGARCH)
 
 /* These are the asm-generic versions of the stat and stat64 structures */

diff --git a/system/qdev-monitor.c b/system/qdev-monitor.c
index be18902bb2f9dc0200934d39536c0be527ce24ac..1ac6d9a857559b7f46f9176ce69406394b4a4765 100644 (file)
--- a/system/qdev-monitor.c
+++ b/system/qdev-monitor.c
@@ -62,7 +62,7 @@ typedef struct QDevAlias
                               QEMU_ARCH_I386 | \
                               QEMU_ARCH_LOONGARCH | \
                               QEMU_ARCH_MIPS | \
-                              QEMU_ARCH_OPENRISC | \
+                              QEMU_ARCH_OR1K | \
                               QEMU_ARCH_PPC | \
                               QEMU_ARCH_RISCV | \
                               QEMU_ARCH_SH4 | \

diff --git a/target/Kconfig b/target/Kconfig
index d0c7b59d9c718d59057bd505e94b28e84d4245d8..3c73e3bae01eea4881a7e9922f49be57ff3e1474 100644 (file)
--- a/target/Kconfig
+++ b/target/Kconfig
@@ -7,7 +7,7 @@ source loongarch/Kconfig
 source m68k/Kconfig
 source microblaze/Kconfig
 source mips/Kconfig
-source openrisc/Kconfig
+source or1k/Kconfig
 source ppc/Kconfig
 source riscv/Kconfig
 source rx/Kconfig

diff --git a/target/meson.build b/target/meson.build
index b29598e7c5edffcd2c6aaafcc10629d12d06c9a2..d891ef9ee09d5fb34123a1f4377b3a3c1bc6415b 100644 (file)
--- a/target/meson.build
+++ b/target/meson.build
@@ -8,7 +8,7 @@ subdir('loongarch')
 subdir('m68k')
 subdir('microblaze')
 subdir('mips')
-subdir('openrisc')
+subdir('or1k')
 subdir('ppc')
 subdir('riscv')
 subdir('rx')

diff --git a/target/openrisc/Kconfig b/target/or1k/Kconfig
similarity index 76%
rename from target/openrisc/Kconfig
rename to target/or1k/Kconfig
index cd66c2e3b6ca813afa43c7531ea4e27e6b20a852..b2693067b1f13dcbe09751250c343e3658872eac 100644 (file)
--- a/target/openrisc/Kconfig
+++ b/target/or1k/Kconfig
@@ -1,3 +1,3 @@
-config OPENRISC
+config OR1K
     bool
     select DEVICE_TREE # needed by boot.c

diff --git a/target/openrisc/cpu-param.h b/target/or1k/cpu-param.h
similarity index 100%
rename from target/openrisc/cpu-param.h
rename to target/or1k/cpu-param.h

diff --git a/target/openrisc/cpu-qom.h b/target/or1k/cpu-qom.h
similarity index 100%
rename from target/openrisc/cpu-qom.h
rename to target/or1k/cpu-qom.h

diff --git a/target/openrisc/cpu.c b/target/or1k/cpu.c
similarity index 100%
rename from target/openrisc/cpu.c
rename to target/or1k/cpu.c

diff --git a/target/openrisc/cpu.h b/target/or1k/cpu.h
similarity index 100%
rename from target/openrisc/cpu.h
rename to target/or1k/cpu.h

diff --git a/target/openrisc/disas.c b/target/or1k/disas.c
similarity index 100%
rename from target/openrisc/disas.c
rename to target/or1k/disas.c

diff --git a/target/openrisc/exception.c b/target/or1k/exception.c
similarity index 100%
rename from target/openrisc/exception.c
rename to target/or1k/exception.c

diff --git a/target/openrisc/exception.h b/target/or1k/exception.h
similarity index 100%
rename from target/openrisc/exception.h
rename to target/or1k/exception.h

diff --git a/target/openrisc/exception_helper.c b/target/or1k/exception_helper.c
similarity index 100%
rename from target/openrisc/exception_helper.c
rename to target/or1k/exception_helper.c

diff --git a/target/openrisc/fpu_helper.c b/target/or1k/fpu_helper.c
similarity index 100%
rename from target/openrisc/fpu_helper.c
rename to target/or1k/fpu_helper.c

diff --git a/target/openrisc/gdbstub.c b/target/or1k/gdbstub.c
similarity index 100%
rename from target/openrisc/gdbstub.c
rename to target/or1k/gdbstub.c

diff --git a/target/openrisc/helper.h b/target/or1k/helper.h
similarity index 100%
rename from target/openrisc/helper.h
rename to target/or1k/helper.h

diff --git a/target/openrisc/insns.decode b/target/or1k/insns.decode
similarity index 100%
rename from target/openrisc/insns.decode
rename to target/or1k/insns.decode

diff --git a/target/openrisc/interrupt.c b/target/or1k/interrupt.c
similarity index 100%
rename from target/openrisc/interrupt.c
rename to target/or1k/interrupt.c

diff --git a/target/openrisc/interrupt_helper.c b/target/or1k/interrupt_helper.c
similarity index 100%
rename from target/openrisc/interrupt_helper.c
rename to target/or1k/interrupt_helper.c

diff --git a/target/openrisc/machine.c b/target/or1k/machine.c
similarity index 100%
rename from target/openrisc/machine.c
rename to target/or1k/machine.c

diff --git a/target/openrisc/meson.build b/target/or1k/meson.build
similarity index 79%
rename from target/openrisc/meson.build
rename to target/or1k/meson.build
index d51ea1ab7536c7d6cfdaa3ce6ee09e381475f6d8..cad8c1b1ae0619fd08b6c4f2333435117fd9d8dc 100644 (file)
--- a/target/openrisc/meson.build
+++ b/target/or1k/meson.build
@@ -21,5 +21,5 @@ openrisc_system_ss.add(files(
   'mmu.c',
 ))
 
-target_arch += {'openrisc': openrisc_ss}
-target_common_system_arch += {'openrisc': openrisc_system_ss}
+target_arch += {'or1k': openrisc_ss}
+target_common_system_arch += {'or1k': openrisc_system_ss}

diff --git a/target/openrisc/mmu.c b/target/or1k/mmu.c
similarity index 100%
rename from target/openrisc/mmu.c
rename to target/or1k/mmu.c

diff --git a/target/openrisc/sys_helper.c b/target/or1k/sys_helper.c
similarity index 100%
rename from target/openrisc/sys_helper.c
rename to target/or1k/sys_helper.c

diff --git a/target/openrisc/translate.c b/target/or1k/translate.c
similarity index 100%
rename from target/openrisc/translate.c
rename to target/or1k/translate.c