Signed-off-by: Richard Henderson <richard.hender...@linaro.org> --- linux-user/mips/target_elf.h | 5 +++++ linux-user/mips64/target_elf.h | 12 ++++++++++++ linux-user/elfload.c | 20 -------------------- 3 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/linux-user/mips/target_elf.h b/linux-user/mips/target_elf.h index febf710c7a..850a6d83cc 100644 --- a/linux-user/mips/target_elf.h +++ b/linux-user/mips/target_elf.h @@ -8,4 +8,9 @@ #ifndef MIPS_TARGET_ELF_H #define MIPS_TARGET_ELF_H +#define ELF_CLASS ELFCLASS32 +#define ELF_ARCH EM_MIPS +#define EXSTACK_DEFAULT true +#define USE_ELF_CORE_DUMP + #endif diff --git a/linux-user/mips64/target_elf.h b/linux-user/mips64/target_elf.h index 02e6d14840..77f3b4685a 100644 --- a/linux-user/mips64/target_elf.h +++ b/linux-user/mips64/target_elf.h @@ -8,4 +8,16 @@ #ifndef MIPS64_TARGET_ELF_H #define MIPS64_TARGET_ELF_H +#define ELF_CLASS ELFCLASS64 +#define ELF_ARCH EM_MIPS +#define EXSTACK_DEFAULT true + +#ifdef TARGET_ABI_MIPSN32 +#define elf_check_abi(x) ((x) & EF_MIPS_ABI2) +#else +#define elf_check_abi(x) (!((x) & EF_MIPS_ABI2)) +#endif + +#define USE_ELF_CORE_DUMP + #endif diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 49fd098067..609e9b99b5 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -138,26 +138,6 @@ typedef abi_uint target_gid_t; #endif typedef abi_int target_pid_t; -#ifdef TARGET_MIPS - -#ifdef TARGET_MIPS64 -#define ELF_CLASS ELFCLASS64 -#else -#define ELF_CLASS ELFCLASS32 -#endif -#define ELF_ARCH EM_MIPS -#define EXSTACK_DEFAULT true - -#ifdef TARGET_ABI_MIPSN32 -#define elf_check_abi(x) ((x) & EF_MIPS_ABI2) -#else -#define elf_check_abi(x) (!((x) & EF_MIPS_ABI2)) -#endif - -#define USE_ELF_CORE_DUMP - -#endif /* TARGET_MIPS */ - #ifdef TARGET_MICROBLAZE #define elf_check_arch(x) ( (x) == EM_MICROBLAZE || (x) == EM_MICROBLAZE_OLD) -- 2.43.0
