]> xenbits.xensource.com Git - people/aperard/qemu-dm.git/commitdiff
linux-user/mips: Do not try to use removed R5900 CPU
authorPhilippe Mathieu-Daudé <philmd@linaro.org>
Wed, 14 Aug 2024 10:01:18 +0000 (12:01 +0200)
committerPhilippe Mathieu-Daudé <philmd@linaro.org>
Mon, 19 Aug 2024 22:47:57 +0000 (00:47 +0200)
R5900 emulation was removed in commit 823f2897bd.
Remove it from ELF parsing in order to avoid:

  $ qemu-mipsn32 ./test5900
  qemu-mipsn32: unable to find CPU model 'R5900'

This reverts commit 4d9e5a0eb7df6e98ac6cf5e16029f35dd05b9537.

Fixes: 823f2897bd ("target/mips: Disable R5900 support")
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20240814133928.6746-2-philmd@linaro.org>

linux-user/mips/target_elf.h
linux-user/mips64/target_elf.h

index b965e86b2bfec9b3d33dc57aa5bfe690e267cf01..71a32315a858a18a800e4c5f568898289ba28455 100644 (file)
@@ -12,9 +12,6 @@ static inline const char *cpu_get_model(uint32_t eflags)
     if ((eflags & EF_MIPS_ARCH) == EF_MIPS_ARCH_32R6) {
         return "mips32r6-generic";
     }
-    if ((eflags & EF_MIPS_MACH) == EF_MIPS_MACH_5900) {
-        return "R5900";
-    }
     if (eflags & EF_MIPS_NAN2008) {
         return "P5600";
     }
index 5f2f2df29f7f496a559eeb320302d22f30706742..ec55d8542ae199d0fc05407963d7fe75b0a6bf2d 100644 (file)
@@ -12,9 +12,6 @@ static inline const char *cpu_get_model(uint32_t eflags)
     if ((eflags & EF_MIPS_ARCH) == EF_MIPS_ARCH_64R6) {
         return "I6400";
     }
-    if ((eflags & EF_MIPS_MACH) == EF_MIPS_MACH_5900) {
-        return "R5900";
-    }
     return "5KEf";
 }
 #endif