diff mbox series

[PATCH-for-9.1,1/4] linux-user/mips: Do not try to use removed R5900 CPU

Message ID 20240814133928.6746-2-philmd@linaro.org (mailing list archive)
State New, archived
Headers show
Series linux-user/mips: Select correct CPUs | expand

Commit Message

Philippe Mathieu-Daudé Aug. 14, 2024, 1:39 p.m. UTC 
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>
---
 linux-user/mips/target_elf.h   | 3 ---
 linux-user/mips64/target_elf.h | 3 ---
 2 files changed, 6 deletions(-)

Comments

Richard Henderson Aug. 14, 2024, 10:15 p.m. UTC | #1 
On 8/14/24 23:39, Philippe Mathieu-Daudé wrote:
> 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>
> ---
>   linux-user/mips/target_elf.h   | 3 ---
>   linux-user/mips64/target_elf.h | 3 ---
>   2 files changed, 6 deletions(-)

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

r~
diff mbox series

Patch

diff --git a/linux-user/mips/target_elf.h b/linux-user/mips/target_elf.h
index b965e86b2b..71a32315a8 100644
--- a/linux-user/mips/target_elf.h
+++ b/linux-user/mips/target_elf.h
@@ -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";
     }
diff --git a/linux-user/mips64/target_elf.h b/linux-user/mips64/target_elf.h
index 5f2f2df29f..ec55d8542a 100644
--- a/linux-user/mips64/target_elf.h
+++ b/linux-user/mips64/target_elf.h
@@ -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