Message ID | 9a32029ce1393c2b5eddc1d1575624f4f25f3ab9.1433052533.git.crosthwaite.peter@gmail.com |
---|---|
State | New |
Headers | show |
On 31/05/2015 08:12, Peter Crosthwaite wrote: > From: Peter Crosthwaite <crosthwaitepeter@gmail.com> > > The only generic code relying on this is linux-user. Linux user already > has a lot of #ifdef TARGET_ customisation so just define ELF_MACHINE > locally there. > > The armv7m bootloader can just pass EM_ARM directly, as that > is architecture specific code. > > This remove another architecture specific definition from the global > namespace. > > Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com> Introduce cpu-user.h, and move TARGET_VIRT_ADDR_SPACE_BITS there too? Paolo
diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c index c6eab6d..ad89073 100644 --- a/hw/arm/armv7m.c +++ b/hw/arm/armv7m.c @@ -215,7 +215,7 @@ qemu_irq *armv7m_init(MemoryRegion *system_memory, int mem_size, int num_irq, if (kernel_filename) { image_size = load_elf(kernel_filename, NULL, NULL, &entry, &lowaddr, - NULL, big_endian, ELF_MACHINE, 1); + NULL, big_endian, EM_ARM, 1); if (image_size < 0) { image_size = load_image_targphys(kernel_filename, 0, mem_size); lowaddr = 0; diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 0ba9706..58b799d 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -272,6 +272,7 @@ static void elf_core_copy_regs(target_elf_gregset_t *regs, const CPUX86State *en /* 32 bit ARM definitions */ #define ELF_START_MMAP 0x80000000 +# define ELF_MACHINE EM_ARM #define elf_check_arch(x) ((x) == ELF_MACHINE) @@ -480,6 +481,7 @@ static uint32_t get_elf_hwcap2(void) #else /* 64 bit ARM definitions */ #define ELF_START_MMAP 0x80000000 +#define ELF_MACHINE EM_AARCH64 #define elf_check_arch(x) ((x) == ELF_MACHINE) diff --git a/target-arm/cpu.h b/target-arm/cpu.h index 3d55343..f1176ed 100644 --- a/target-arm/cpu.h +++ b/target-arm/cpu.h @@ -27,10 +27,8 @@ #if defined(TARGET_AARCH64) /* AArch64 definitions */ # define TARGET_LONG_BITS 64 -# define ELF_MACHINE EM_AARCH64 #else # define TARGET_LONG_BITS 32 -# define ELF_MACHINE EM_ARM #endif #define TARGET_IS_BIENDIAN 1