diff options
| author | Marcus Oakland <marcus.oakland@arm.com> | 2013-10-10 15:19:31 +0100 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2013-12-17 15:02:43 -0800 |
| commit | e365f9d6543bc6607864ef61257505239dde15d1 (patch) | |
| tree | ecc2e3605bc26aeb9b16a1d3adbceb70da40ba19 /linker/linker_phdr.cpp | |
| parent | 2e3826c08171ead1647c800a0a6d9c333d335762 (diff) | |
| download | bionic-e365f9d6543bc6607864ef61257505239dde15d1.zip bionic-e365f9d6543bc6607864ef61257505239dde15d1.tar.gz bionic-e365f9d6543bc6607864ef61257505239dde15d1.tar.bz2 | |
AArch64: Linker64 support for AArch64
Addition of support for AArch64 in the linker64 target.
Change-Id: I8dfd9711278f6706063e91f626b6007ea7a3dd6e
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Diffstat (limited to 'linker/linker_phdr.cpp')
| -rw-r--r-- | linker/linker_phdr.cpp | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/linker/linker_phdr.cpp b/linker/linker_phdr.cpp index 4884364..b4d72b2 100644 --- a/linker/linker_phdr.cpp +++ b/linker/linker_phdr.cpp @@ -29,6 +29,7 @@ #include "linker_phdr.h" #include <errno.h> +#include <machine/exec.h> #include <sys/mman.h> #include "linker.h" @@ -201,17 +202,7 @@ bool ElfReader::VerifyElfHeader() { return false; } - if (header_.e_machine != -#if defined(__arm__) - EM_ARM -#elif defined(__i386__) - EM_386 -#elif defined(__mips__) - EM_MIPS -#elif defined(__x86_64__) - EM_X86_64 -#endif - ) { + if (header_.e_machine != ELF_TARG_MACH) { DL_ERR("\"%s\" has unexpected e_machine: %d", name_, header_.e_machine); return false; } |