Browse Source

linux-user: Rename elf_check_arch

Rename to elf_check_machine to match ELF_MACHINE.
Remove the unnecessary definition for loongarch64.

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
pull/299/head
Richard Henderson 1 year ago
parent
commit
eb727cc45a
  1. 6
      linux-user/elfload.c
  2. 2
      linux-user/i386/target_elf.h
  3. 1
      linux-user/loongarch64/target_elf.h
  4. 2
      linux-user/microblaze/target_elf.h
  5. 2
      linux-user/sparc/target_elf.h

6
linux-user/elfload.c

@ -130,8 +130,8 @@ typedef abi_uint target_gid_t;
#endif
typedef abi_int target_pid_t;
#ifndef elf_check_arch
#define elf_check_arch(x) ((x) == ELF_MACHINE)
#ifndef elf_check_machine
#define elf_check_machine(x) ((x) == ELF_MACHINE)
#endif
#ifndef elf_check_abi
@ -346,7 +346,7 @@ static bool elf_check_ident(struct elfhdr *ehdr)
This has to wait until after bswapping the header. */
static bool elf_check_ehdr(struct elfhdr *ehdr)
{
return (elf_check_arch(ehdr->e_machine)
return (elf_check_machine(ehdr->e_machine)
&& elf_check_abi(ehdr->e_flags)
&& ehdr->e_ehsize == sizeof(struct elfhdr)
&& ehdr->e_phentsize == sizeof(struct elf_phdr)

2
linux-user/i386/target_elf.h

@ -30,7 +30,7 @@ typedef struct target_elf_gregset_t {
/*
* This is used to ensure we don't load something for the wrong architecture.
*/
#define elf_check_arch(x) ((x) == EM_386 || (x) == EM_486)
#define elf_check_machine(x) ((x) == EM_386 || (x) == EM_486)
/*
* i386 is the only target which supplies AT_SYSINFO for the vdso.

1
linux-user/loongarch64/target_elf.h

@ -11,7 +11,6 @@
#define ELF_CLASS ELFCLASS64
#define ELF_MACHINE EM_LOONGARCH
#define EXSTACK_DEFAULT true
#define elf_check_arch(x) ((x) == EM_LOONGARCH)
#define VDSO_HEADER "vdso.c.inc"
#define HAVE_ELF_HWCAP 1

2
linux-user/microblaze/target_elf.h

@ -13,7 +13,7 @@
#define ELF_CLASS ELFCLASS32
#define ELF_MACHINE EM_MICROBLAZE
#define elf_check_arch(x) ((x) == EM_MICROBLAZE || (x) == EM_MICROBLAZE_OLD)
#define elf_check_machine(x) ((x) == EM_MICROBLAZE || (x) == EM_MICROBLAZE_OLD)
#define HAVE_ELF_CORE_DUMP 1

2
linux-user/sparc/target_elf.h

@ -13,7 +13,7 @@
# define ELF_MACHINE EM_SPARC
#elif defined(TARGET_ABI32)
# define ELF_CLASS ELFCLASS32
# define elf_check_arch(x) ((x) == EM_SPARC32PLUS || (x) == EM_SPARC)
# define elf_check_machine(x) ((x) == EM_SPARC32PLUS || (x) == EM_SPARC)
#else
# define ELF_CLASS ELFCLASS64
# define ELF_MACHINE EM_SPARCV9

Loading…
Cancel
Save