From: Aleksandar Markovic <amarkovic@wavecomp.com>
Date: Thu, 2 Aug 2018 14:16:40 +0000 (+0200)
Subject: elf: Relax MIPS' elf_check_arch() to accept EM_NANOMIPS too
X-Git-Tag: v3.1.0-rc0~113^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f72541f3a59;p=thirdparty%2Fqemu.git

elf: Relax MIPS' elf_check_arch() to accept EM_NANOMIPS too

Starting from nanoMIPS introduction, machine variant can be
EM_MIPS or EM_NANOMIPS.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Aleksandar Markovic <amarkovic@wavecomp.com>
Signed-off-by: Stefan Markovic <smarkovic@wavecomp.com>
---

diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index df070553617..8638612aec5 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -853,6 +853,8 @@ static void elf_core_copy_regs(target_elf_gregset_t *regs, const CPUPPCState *en
 #endif
 #define ELF_ARCH    EM_MIPS
 
+#define elf_check_arch(x) ((x) == EM_MIPS || (x) == EM_NANOMIPS)
+
 static inline void init_thread(struct target_pt_regs *regs,
                                struct image_info *infop)
 {