diff options
| author | Thomas Huth <thuth@redhat.com> | 2021-04-30 18:03:55 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2021-05-12 17:42:23 +0200 |
| commit | 875bb7e35b78c609252187dc7bd68d90bf742da9 (patch) | |
| tree | e7ca74d7de49fb172c8f5d1f54de5ee27507f650 /include | |
| parent | a67b996e7894edfafbcd3fd007c9f58f26d25908 (diff) | |
Remove the deprecated moxie target
There are no known users of this CPU anymore, and there are no
binaries available online which could be used for regression tests,
so the code has likely completely bit-rotten already. It's been
marked as deprecated since two releases now and nobody spoke up
that there is still a need to keep it, thus let's remove it now.
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20210430160355.698194-1-thuth@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
[Commit message typos fixed, trivial conflicts resolved]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/disas/dis-asm.h | 1 | ||||
| -rw-r--r-- | include/elf.h | 3 | ||||
| -rw-r--r-- | include/exec/poison.h | 2 | ||||
| -rw-r--r-- | include/hw/elf_ops.h | 8 | ||||
| -rw-r--r-- | include/sysemu/arch_init.h | 1 |
5 files changed, 0 insertions, 15 deletions
diff --git a/include/disas/dis-asm.h b/include/disas/dis-asm.h index 4701445e80..8e985e7e94 100644 --- a/include/disas/dis-asm.h +++ b/include/disas/dis-asm.h @@ -443,7 +443,6 @@ int print_insn_m32r (bfd_vma, disassemble_info*); int print_insn_m88k (bfd_vma, disassemble_info*); int print_insn_mn10200 (bfd_vma, disassemble_info*); int print_insn_mn10300 (bfd_vma, disassemble_info*); -int print_insn_moxie (bfd_vma, disassemble_info*); int print_insn_ns32k (bfd_vma, disassemble_info*); int print_insn_big_powerpc (bfd_vma, disassemble_info*); int print_insn_little_powerpc (bfd_vma, disassemble_info*); diff --git a/include/elf.h b/include/elf.h index 78237c9a87..33ed830ec3 100644 --- a/include/elf.h +++ b/include/elf.h @@ -206,9 +206,6 @@ typedef struct mips_elf_abiflags_v0 { #define EM_AARCH64 183 -#define EM_MOXIE 223 /* Moxie processor family */ -#define EM_MOXIE_OLD 0xFEED - #define EF_AVR_MACH 0x7F /* Mask for AVR e_flags to get core type */ /* This is the info that is needed to parse the dynamic section of the file */ diff --git a/include/exec/poison.h b/include/exec/poison.h index 4cd3f8abb4..de972bfd8e 100644 --- a/include/exec/poison.h +++ b/include/exec/poison.h @@ -20,7 +20,6 @@ #pragma GCC poison TARGET_ABI_MIPSO32 #pragma GCC poison TARGET_MIPS64 #pragma GCC poison TARGET_ABI_MIPSN64 -#pragma GCC poison TARGET_MOXIE #pragma GCC poison TARGET_NIOS2 #pragma GCC poison TARGET_OPENRISC #pragma GCC poison TARGET_PPC @@ -79,7 +78,6 @@ #pragma GCC poison CONFIG_MICROBLAZE_DIS #pragma GCC poison CONFIG_MIPS_DIS #pragma GCC poison CONFIG_NANOMIPS_DIS -#pragma GCC poison CONFIG_MOXIE_DIS #pragma GCC poison CONFIG_NIOS2_DIS #pragma GCC poison CONFIG_PPC_DIS #pragma GCC poison CONFIG_RISCV_DIS diff --git a/include/hw/elf_ops.h b/include/hw/elf_ops.h index 6ee458e7bc..1c37cec4ae 100644 --- a/include/hw/elf_ops.h +++ b/include/hw/elf_ops.h @@ -368,14 +368,6 @@ static int glue(load_elf, SZ)(const char *name, int fd, } } break; - case EM_MOXIE: - if (ehdr.e_machine != EM_MOXIE) { - if (ehdr.e_machine != EM_MOXIE_OLD) { - ret = ELF_LOAD_WRONG_ARCH; - goto fail; - } - } - break; case EM_MIPS: case EM_NANOMIPS: if ((ehdr.e_machine != EM_MIPS) && diff --git a/include/sysemu/arch_init.h b/include/sysemu/arch_init.h index 16da279696..44e3734d18 100644 --- a/include/sysemu/arch_init.h +++ b/include/sysemu/arch_init.h @@ -19,7 +19,6 @@ enum { QEMU_ARCH_XTENSA = (1 << 12), QEMU_ARCH_OPENRISC = (1 << 13), QEMU_ARCH_UNICORE32 = (1 << 14), - QEMU_ARCH_MOXIE = (1 << 15), QEMU_ARCH_TRICORE = (1 << 16), QEMU_ARCH_NIOS2 = (1 << 17), QEMU_ARCH_HPPA = (1 << 18), |