am 0594b9dd: am b8e82b5e: Merge "EM_ARM and EM_AARCH64 are now in the uapi header."

* commit '0594b9ddded7d832b786c209dd7cd4e26ee32eb8':
  EM_ARM and EM_AARCH64 are now in the uapi header.
This commit is contained in:
Elliott Hughes 2014-07-12 02:06:38 +00:00 committed by Android Git Automerger
commit f65d552b3d

View File

@ -67,9 +67,6 @@ typedef struct {
#define ELFOSABI_SYSV 0 /* Synonym for ELFOSABI_NONE used by valgrind. */
#define EM_ARM 40
#define EM_AARCH64 183
#define PT_GNU_RELRO 0x6474e552
#define STB_LOOS 10