2005-02-14 H.J. Lu <hongjiu.lu@intel.com>

[deliverable/binutils-gdb.git] / bfd / cpu-i386.c

diff --git a/bfd/cpu-i386.c b/bfd/cpu-i386.c
index 4fbf52375030d4e27d8256c6f680083ea3172173..895568de2232bcf237069e7bb76e15a0b85ef0cf 100644 (file)
--- a/bfd/cpu-i386.c
+++ b/bfd/cpu-i386.c
@@ -1,5 +1,6 @@
 /* BFD support for the Intel 386 architecture.
-   Copyright 1992, 94, 95, 1996 Free Software Foundation, Inc.
+   Copyright 1992, 1994, 1995, 1996, 1998, 2000, 2001, 2002, 2004
+   Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
 
@@ -21,6 +22,22 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "sysdep.h"
 #include "libbfd.h"
 
+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,
+  "i386:intel",
+  "i386:x86-64:intel",
+  3,
+  FALSE,
+  bfd_default_compatible,
+  bfd_default_scan,
+  0
+};
+
 const bfd_arch_info_type bfd_i386_arch_intel_syntax =
 {
   32,  /* 32 bits in a word */
@@ -31,27 +48,13 @@ const bfd_arch_info_type bfd_i386_arch_intel_syntax =
   "i386:intel",
   "i386:intel",
   3,
-  true,
+  TRUE,
   bfd_default_compatible,
-  bfd_default_scan ,
-  0,
+  bfd_default_scan,
+  &bfd_x86_64_arch_intel_syntax
 };
-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 =
+
+const bfd_arch_info_type i8086_arch =
 {
   32,  /* 32 bits in a word */
   32,  /* 32 bits in an address (well, not really) */
@@ -61,10 +64,10 @@ static const bfd_arch_info_type i8086_arch =
   "i8086",
   "i8086",
   3,
-  false,
+  FALSE,
   bfd_default_compatible,
-  bfd_default_scan ,
-  &bfd_x86_64_arch_intel_syntax,
+  bfd_default_scan,
+  &bfd_i386_arch_intel_syntax
 };
 
 const bfd_arch_info_type bfd_x86_64_arch =
@@ -74,13 +77,13 @@ const bfd_arch_info_type bfd_x86_64_arch =
   8,  /* 8 bits in a byte */
   bfd_arch_i386,
   bfd_mach_x86_64,
-  "x86_64",
-  "x86_64",
+  "i386",
+  "i386:x86-64",
   3,
-  true,
-  bfd_default_compatible, 
-  bfd_default_scan ,
-  &i8086_arch,
+  FALSE,
+  bfd_default_compatible,
+  bfd_default_scan,
+  &i8086_arch
 };
 
 const bfd_arch_info_type bfd_i386_arch =
@@ -93,9 +96,8 @@ const bfd_arch_info_type bfd_i386_arch =
   "i386",
   "i386",
   3,
-  true,
+  TRUE,
   bfd_default_compatible,
-  bfd_default_scan ,
-  &bfd_x86_64_arch 
+  bfd_default_scan,
+  &bfd_x86_64_arch
 };
-