Signed-off-by: Richard Henderson <richard.hender...@linaro.org> --- linux-user/s390x/target_elf.h | 6 ++++++ linux-user/elfload.c | 12 ------------ 2 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/linux-user/s390x/target_elf.h b/linux-user/s390x/target_elf.h index e51b053339..aa12ecf36b 100644 --- a/linux-user/s390x/target_elf.h +++ b/linux-user/s390x/target_elf.h @@ -8,4 +8,10 @@ #ifndef S390X_TARGET_ELF_H #define S390X_TARGET_ELF_H +#define ELF_CLASS ELFCLASS64 +#define ELF_DATA ELFDATA2MSB +#define ELF_ARCH EM_S390 +#define VDSO_HEADER "vdso.c.inc" +#define USE_ELF_CORE_DUMP + #endif diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 4294a6582e..28407a7a00 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -138,18 +138,6 @@ typedef abi_uint target_gid_t; #endif typedef abi_int target_pid_t; -#ifdef TARGET_S390X - -#define ELF_CLASS ELFCLASS64 -#define ELF_DATA ELFDATA2MSB -#define ELF_ARCH EM_S390 - -#define USE_ELF_CORE_DUMP - -#define VDSO_HEADER "vdso.c.inc" - -#endif /* TARGET_S390X */ - #ifdef TARGET_RISCV #define ELF_ARCH EM_RISCV -- 2.43.0
