diff options
| author | Alan Modra <amodra@gmail.com> | 2004-10-12 08:13:46 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2004-10-12 08:13:46 +0000 |
| commit | 1abc85973aa37dff9c0c7cac0593b14a6abd74e1 (patch) | |
| tree | 2de2c47de84ad2d12a02200f0769cb723224db05 /bfd | |
| parent | 9e66c9426beba82f01cd73f117922176058f474d (diff) | |
| download | binutils-1abc85973aa37dff9c0c7cac0593b14a6abd74e1.zip binutils-1abc85973aa37dff9c0c7cac0593b14a6abd74e1.tar.gz binutils-1abc85973aa37dff9c0c7cac0593b14a6abd74e1.tar.bz2 | |
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.
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 9 | ||||
| -rw-r--r-- | bfd/cpu-i386.c | 52 |
2 files changed, 35 insertions, 26 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 79cdc79..f8b7e6f 100644 --- 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 272c719..895568d 100644 --- 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 }; |