diff options
| author | Philippe Mathieu-Daudé <philmd@linaro.org> | 2024-08-14 12:01:18 +0200 |
|---|---|---|
| committer | Philippe Mathieu-Daudé <philmd@linaro.org> | 2024-08-20 00:47:57 +0200 |
| commit | f7e3d7521b41ada97c5344914d3c9bc6ed04c82a (patch) | |
| tree | 5b5a84de73c9358a17f65a58ba9061c0ff0b8e81 | |
| parent | 7d3a421feab29c03601813c8a0f98d5b2fd4420a (diff) | |
| download | qemu-f7e3d7521b41ada97c5344914d3c9bc6ed04c82a.zip qemu-f7e3d7521b41ada97c5344914d3c9bc6ed04c82a.tar.gz qemu-f7e3d7521b41ada97c5344914d3c9bc6ed04c82a.tar.bz2 | |
linux-user/mips: Do not try to use removed R5900 CPU
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>
| -rw-r--r-- | linux-user/mips/target_elf.h | 3 | ||||
| -rw-r--r-- | linux-user/mips64/target_elf.h | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/linux-user/mips/target_elf.h b/linux-user/mips/target_elf.h index b965e86..71a3231 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 5f2f2df..ec55d85 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 |