Import of GNU Binutils version 2.11.0.

Believe it or not, this is heavily stripped down.

1 files changed, 36 insertions, 6 deletions

diff --git a/contrib/binutils/bfd/cpu-i386.c b/contrib/binutils/bfd/cpu-i386.c
index f5b9b18..c3e9baf 100644
--- a/contrib/binutils/bfd/cpu-i386.c
+++ b/contrib/binutils/bfd/cpu-i386.c
@@ -32,10 +32,25 @@ const bfd_arch_info_type bfd_i386_arch_intel_syntax =
   "i386:intel",
   3,
   true,
-  bfd_default_compatible, 
+  bfd_default_compatible,
   bfd_default_scan ,
   0,
 };
+const bfd_arch_info_type bfd_x86_64_arch_intel_syntax =
+{
+  64, /* 64 bits in a word */
+  64, /* 64 bits in an address */
+  8,  /* 8 bits in a byte */
+  bfd_arch_i386,
+  bfd_mach_x86_64_intel_syntax,
+  "x86_64:intel",
+  "x86_64:intel",
+  3,
+  true,
+  bfd_default_compatible,
+  bfd_default_scan ,
+  &bfd_i386_arch_intel_syntax,
+};
 static const bfd_arch_info_type i8086_arch =
 {
   32,	/* 32 bits in a word */
@@ -47,9 +62,25 @@ static const bfd_arch_info_type i8086_arch =
   "i8086",
   3,
   false,
-  bfd_default_compatible, 
+  bfd_default_compatible,
   bfd_default_scan ,
-  &bfd_i386_arch_intel_syntax,
+  &bfd_x86_64_arch_intel_syntax,
+};
+
+const bfd_arch_info_type bfd_x86_64_arch =
+{
+  64, /* 32 bits in a word */
+  64, /* 32 bits in an address */
+  8,  /* 8 bits in a byte */
+  bfd_arch_i386,
+  bfd_mach_x86_64,
+  "x86_64",
+  "x86_64",
+  3,
+  true,
+  bfd_default_compatible,
+  bfd_default_scan ,
+  &i8086_arch,
 };
 
 const bfd_arch_info_type bfd_i386_arch =
@@ -63,8 +94,7 @@ const bfd_arch_info_type bfd_i386_arch =
   "i386",
   3,
   true,
-  bfd_default_compatible, 
+  bfd_default_compatible,
   bfd_default_scan ,
-  &i8086_arch,
+  &bfd_x86_64_arch
 };
-