am 3030157f: am 8e6e7cda: Merge "Update <sys/exec_elf.h> to include EM_AARCH64."

* commit '3030157f82e012612ef4c6d999878be2f65116dd':
  Update <sys/exec_elf.h> to include EM_AARCH64.
This commit is contained in:
Elliott Hughes 2013-10-29 08:57:41 -07:00 committed by Android Git Automerger
commit 5abb9b15d1

View File

@ -1,4 +1,4 @@
/* $NetBSD: exec_elf.h,v 1.130 2013/10/28 21:36:43 matt Exp $ */ /* $NetBSD: exec_elf.h,v 1.131 2013/10/29 00:22:59 christos Exp $ */
/*- /*-
* Copyright (c) 1994 The NetBSD Foundation, Inc. * Copyright (c) 1994 The NetBSD Foundation, Inc.
@ -301,6 +301,7 @@ typedef struct {
#define EM_SEP 108 /* Sharp embedded microprocessor */ #define EM_SEP 108 /* Sharp embedded microprocessor */
#define EM_ARCA 109 /* Arca RISC microprocessor */ #define EM_ARCA 109 /* Arca RISC microprocessor */
#define EM_UNICORE 110 /* UNICORE from PKU-Unity Ltd. and MPRC Peking University */ #define EM_UNICORE 110 /* UNICORE from PKU-Unity Ltd. and MPRC Peking University */
#define EM_AARCH64 183 /* AArch64 64-bit ARM microprocessor */
/* Unofficial machine types follow */ /* Unofficial machine types follow */
#define EM_AVR32 6317 /* used by NetBSD/avr32 */ #define EM_AVR32 6317 /* used by NetBSD/avr32 */