arm: Remove ELF_MACHINE from cpu.h
authorPeter Crosthwaite <crosthwaitepeter@gmail.com>
Mon, 11 May 2015 06:29:25 +0000 (23:29 -0700)
committerPaolo Bonzini <pbonzini@redhat.com>
Fri, 25 Sep 2015 10:04:43 +0000 (12:04 +0200)
commitb597c3f7da17fcb37d394a16a6c0ef0a02846177
treefd0efd2748470f6cd56e175767e93380a1557c1c
parent98dbe5aca8c328b40a0598d6ab478d9b869d1b5c
arm: Remove ELF_MACHINE from cpu.h

The only generic code relying on this is linux-user. Linux user
already has a lot of #ifdef TARGET_ customisation so instead, define
ELF_ARCH as either EM_ARM or EM_AARCH64 appropriately.

The armv7m bootloader can just pass EM_ARM directly, as that
is architecture specific code. Note that arm_boot already has its own
logic selecting an arm specific elf machine so this makes V7M more
consistent with arm_boot.

This removes another architecture specific definition from the global
namespace.

Cc: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <rth@twiddle.net>
Acked-By: Riku Voipio <riku.voipio@linaro.org>
Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
hw/arm/armv7m.c
linux-user/elfload.c
target-arm/cpu.h