generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Kill <machine/exec.h>.

Browse Source 
Bug: 18546535
Change-Id: I479e003deab21e31eb5caa5393067ed1dc558387
This commit is contained in:
Elliott Hughes
2014-12-02 16:16:29 -08:00
parent 6995c1dcb5
commit b514026eb2
7 changed files with 15 additions and 549 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
linker/linker_phdr.cpp
View File

@@ -29,7 +29,6 @@
#include "linker_phdr.h"
#include <errno.h>
#include <machine/exec.h>
#include <sys/mman.h>
#include <sys/types.h>
#include <sys/stat.h>
@@ -38,6 +37,20 @@
#include "linker.h"
#include "linker_debug.h"
static int GetTargetElfMachine() {
#if defined(__arm__)
return EM_ARM;
#elif defined(__aarch64__)
return EM_AARCH64;
#elif defined(__i386__)
return EM_386;
#elif defined(__mips__)
return EM_MIPS;
#elif defined(__x86_64__)
return EM_X86_64;
#endif
}
/**
TECHNICAL NOTE ON ELF LOADING.
@@ -200,7 +213,7 @@ bool ElfReader::VerifyElfHeader() {
return false;
}
if (header_.e_machine != ELF_TARG_MACH) {
if (header_.e_machine != GetTargetElfMachine()) {
DL_ERR("\"%s\" has unexpected e_machine: %d", name_, header_.e_machine);
return false;
}