aboutsummaryrefslogtreecommitdiff
path: root/target-arm
diff options
context:
space:
mode:
authorPeter Crosthwaite <crosthwaitepeter@gmail.com>2015-05-10 23:29:25 -0700
committerPaolo Bonzini <pbonzini@redhat.com>2015-09-25 12:04:43 +0200
commitb597c3f7da17fcb37d394a16a6c0ef0a02846177 (patch)
treefd0efd2748470f6cd56e175767e93380a1557c1c /target-arm
parent98dbe5aca8c328b40a0598d6ab478d9b869d1b5c (diff)
downloadqemu-b597c3f7da17fcb37d394a16a6c0ef0a02846177.zip
qemu-b597c3f7da17fcb37d394a16a6c0ef0a02846177.tar.gz
qemu-b597c3f7da17fcb37d394a16a6c0ef0a02846177.tar.bz2
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>
Diffstat (limited to 'target-arm')
-rw-r--r--target-arm/cpu.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/target-arm/cpu.h b/target-arm/cpu.h
index 1b80516..cc1578c 100644
--- a/target-arm/cpu.h
+++ b/target-arm/cpu.h
@@ -26,10 +26,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