PR 325

	* cpu-i386.c (bfd_x86_64_arch_intel_syntax): Place last in chain.
	Don't mark as default.
	(bfd_x86_64_arch): Don't mark as default.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 79cdc7955bb78c6aeac82d07a8eb845cc90ee624..f8b7e6f4c476dc89be3a0283fbedd7ef4088fe70 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,10 +1,17 @@
+2004-10-12  Alan Modra  <amodra@bigpond.net.au>
+
+       PR 325
+       * cpu-i386.c (bfd_x86_64_arch_intel_syntax): Place last in chain.
+       Don't mark as default.
+       (bfd_x86_64_arch): Don't mark as default.
+
 2004-10-12  Alan Modra  <amodra@bigpond.net.au>
 
        * elflink.c (enum action_discarded): New.
        (elf_section_complain_discarded): Delete.
        (elf_action_discarded): New function subsuming the above and also
        controlling reloc behaviour.
-       (elf_link_input_bfd): Use it.   
+       (elf_link_input_bfd): Use it.
 
 2004-10-11  Jakub Jelinek  <jakub@redhat.com>
 

diff --git a/bfd/cpu-i386.c b/bfd/cpu-i386.c
index 272c7196242f762da0ec7b5634cf0791f4407fdd..895568de2232bcf237069e7bb76e15a0b85ef0cf 100644 (file)
--- a/bfd/cpu-i386.c
+++ b/bfd/cpu-i386.c
@@ -1,5 +1,5 @@
 /* BFD support for the Intel 386 architecture.
-   Copyright 1992, 1994, 1995, 1996, 1998, 2000, 2001, 2002
+   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.
@@ -22,21 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "sysdep.h"
 #include "libbfd.h"
 
-const bfd_arch_info_type bfd_i386_arch_intel_syntax =
-{
-  32,  /* 32 bits in a word */
-  32,  /* 32 bits in an address */
-  8,   /* 8 bits in a byte */
-  bfd_arch_i386,
-  bfd_mach_i386_i386_intel_syntax,
-  "i386:intel",
-  "i386:intel",
-  3,
-  TRUE,
-  bfd_default_compatible,
-  bfd_default_scan ,
-  0,
-};
 const bfd_arch_info_type bfd_x86_64_arch_intel_syntax =
 {
   64, /* 64 bits in a word */
@@ -47,12 +32,29 @@ const bfd_arch_info_type bfd_x86_64_arch_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 */
+  32,  /* 32 bits in an address */
+  8,   /* 8 bits in a byte */
+  bfd_arch_i386,
+  bfd_mach_i386_i386_intel_syntax,
+  "i386:intel",
+  "i386:intel",
+  3,
   TRUE,
   bfd_default_compatible,
-  bfd_default_scan ,
-  &bfd_i386_arch_intel_syntax,
+  bfd_default_scan,
+  &bfd_x86_64_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) */
@@ -64,8 +66,8 @@ static const bfd_arch_info_type i8086_arch =
   3,
   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 =
@@ -78,10 +80,10 @@ const bfd_arch_info_type bfd_x86_64_arch =
   "i386",
   "i386:x86-64",
   3,
-  TRUE,
+  FALSE,
   bfd_default_compatible,
-  bfd_default_scan ,
-  &i8086_arch,
+  bfd_default_scan,
+  &i8086_arch
 };
 
 const bfd_arch_info_type bfd_i386_arch =
@@ -96,6 +98,6 @@ const bfd_arch_info_type bfd_i386_arch =
   3,
   TRUE,
   bfd_default_compatible,
-  bfd_default_scan ,
+  bfd_default_scan,
   &bfd_x86_64_arch
 };