Merge tag 'upstream/3.14'

[debian/elilo] / elf.h

diff --git a/elf.h b/elf.h
index ad367f570502782bbd9feeb76e2600415cc7f928..8289e0da93cee62750eea463964623218e526ead 100644 (file)
--- a/elf.h
+++ b/elf.h
@@ -103,6 +103,7 @@ typedef UINT64      Elf64_Word;
 
 #define EM_IA_64       50      /* HP/Intel IA-64 */
 
+#define EM_X86_64       62      /* Intel/AMD x86-64 */
 /*
  * This is an interim value that we will use until the committee comes
  * up with a final number.