yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-05-01 19:36:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

arm: Remove ELF_MACHINE from cpu.h

Browse source 
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.

Backports commit b597c3f7da17fcb37d394a16a6c0ef0a02846177 from qemu
This commit is contained in:
Peter Crosthwaite 2018-02-16 00:19:07 -05:00 committed by Lioncash
parent 96f8d6325a
commit 9f8b8ba793
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 0 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
qemu/target-arm/cpu.h
View file

@ -26,10 +26,8 @@
#if defined(TARGET_AARCH64) #if defined(TARGET_AARCH64)
/* AArch64 definitions */ /* AArch64 definitions */
# define TARGET_LONG_BITS 64 # define TARGET_LONG_BITS 64
# define ELF_MACHINE EM_AARCH64
#else #else
# define TARGET_LONG_BITS 32 # define TARGET_LONG_BITS 32
# define ELF_MACHINE EM_ARM
#endif #endif
#define TARGET_IS_BIENDIAN 1 #define TARGET_IS_BIENDIAN 1