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

* commit 'b8e82b5e729a1f6e30ee9593b2dbcbb3ad623874':
  EM_ARM and EM_AARCH64 are now in the uapi header.
This commit is contained in:
Elliott Hughes 2014-07-12 01:41:51 +00:00 committed by Android Git Automerger
commit 0594b9ddde

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