* emultempl/sh64elf.em (sh64_elf_${EMULATION_NAME}_after_allocation):

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

diff --git a/bfd/cpu-i386.c b/bfd/cpu-i386.c
index 4fbf52375030d4e27d8256c6f680083ea3172173..272c7196242f762da0ec7b5634cf0791f4407fdd 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
+   Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
 
@@ -31,7 +32,7 @@ const bfd_arch_info_type bfd_i386_arch_intel_syntax =
   "i386:intel",
   "i386:intel",
   3,
-  true,
+  TRUE,
   bfd_default_compatible,
   bfd_default_scan ,
   0,
@@ -43,11 +44,11 @@ const bfd_arch_info_type bfd_x86_64_arch_intel_syntax =
   8,  /* 8 bits in a byte */
   bfd_arch_i386,
   bfd_mach_x86_64_intel_syntax,
-  "x86_64:intel",
-  "x86_64:intel",
+  "i386:intel",
+  "i386:x86-64:intel",
   3,
-  true,
-  bfd_default_compatible, 
+  TRUE,
+  bfd_default_compatible,
   bfd_default_scan ,
   &bfd_i386_arch_intel_syntax,
 };
@@ -61,7 +62,7 @@ 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,
@@ -74,11 +75,11 @@ 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, 
+  TRUE,
+  bfd_default_compatible,
   bfd_default_scan ,
   &i8086_arch,
 };
@@ -93,9 +94,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_x86_64_arch
 };
-