diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2011-01-03 18:16:46 +0000 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2011-01-03 18:16:46 +0000 |
| commit | e5128032e51ac05abbdce244cf1b3b750363619c (patch) | |
| tree | 5b5958c1ebb61713fd162b386564abf53914289c /bfd/cpu-i386.c | |
| parent | e8e3473a2849faaff12f08383f202dad86b2c5e0 (diff) | |
| download | binutils-redhat-e5128032e51ac05abbdce244cf1b3b750363619c.tar.gz | |
Don't allow mixing x64_32 with x86_64.
bfd/
2011-01-03 H.J. Lu <hongjiu.lu@intel.com>
* cpu-i386.c (bfd_i386_compatible): New.
(bfd_x64_32_arch_intel_syntax): Replace bfd_default_compatible
with bfd_i386_compatible.
(bfd_x86_64_arch_intel_syntax): Likewise.
(bfd_i386_arch_intel_syntax): Likewise.
(i8086_arch): Likewise.
(bfd_x64_32_arch): Likewise.
(bfd_x86_64_arch): Likewise.
(bfd_i386_arch): Likewise.
ld/testsuite/
2011-01-03 H.J. Lu <hongjiu.lu@intel.com>
* ld-x86-64/dummy.s: New.
* ld-x86-64/foo.s: Likewise.
* ld-x86-64/ia32-1.d: Likewise.
* ld-x86-64/ia32-2.d: Likewise.
* ld-x86-64/ia32-3.d: Likewise.
* ld-x86-64/ilp32-1.d: Likewise.
* ld-x86-64/ilp32-2.d: Likewise.
* ld-x86-64/ilp32-3.d: Likewise.
* ld-x86-64/lp64-1.d: Likewise.
* ld-x86-64/lp64-2.d: Likewise.
* ld-x86-64/lp64-3.d: Likewise.
* ld-x86-64/start.s: Likewise.
* ld-x86-64/x86-64.exp: Run ilp32-1, ilp32-2, ilp32-3, ia32-1,
ia32-2, ia32-3, lp64-1, lp64-2 and lp64-3.
Diffstat (limited to 'bfd/cpu-i386.c')
| -rw-r--r-- | bfd/cpu-i386.c | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/bfd/cpu-i386.c b/bfd/cpu-i386.c index f679a183eb..c4f41c50c2 100644 --- a/bfd/cpu-i386.c +++ b/bfd/cpu-i386.c @@ -1,6 +1,6 @@ /* BFD support for the Intel 386 architecture. Copyright 1992, 1994, 1995, 1996, 1998, 2000, 2001, 2002, 2004, 2005, - 2007, 2009 + 2007, 2009, 2010, 2011 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -24,6 +24,19 @@ #include "bfd.h" #include "libbfd.h" +static const bfd_arch_info_type * +bfd_i386_compatible (const bfd_arch_info_type *a, + const bfd_arch_info_type *b) +{ + const bfd_arch_info_type *compat = bfd_default_compatible (a, b); + + /* Don't allow mixing x64_32 with x86_64. */ + if (compat && a->bits_per_address != b->bits_per_address) + compat = NULL; + + return compat; +} + static const bfd_arch_info_type bfd_x64_32_arch_intel_syntax = { 64, /* 64 bits in a word */ @@ -35,7 +48,7 @@ static const bfd_arch_info_type bfd_x64_32_arch_intel_syntax = "i386:x64-32:intel", 3, FALSE, - bfd_default_compatible, + bfd_i386_compatible, bfd_default_scan, 0 }; @@ -51,7 +64,7 @@ static const bfd_arch_info_type bfd_x86_64_arch_intel_syntax = "i386:x86-64:intel", 3, FALSE, - bfd_default_compatible, + bfd_i386_compatible, bfd_default_scan, &bfd_x64_32_arch_intel_syntax, }; @@ -67,7 +80,7 @@ static const bfd_arch_info_type bfd_i386_arch_intel_syntax = "i386:intel", 3, TRUE, - bfd_default_compatible, + bfd_i386_compatible, bfd_default_scan, &bfd_x86_64_arch_intel_syntax }; @@ -83,7 +96,7 @@ static const bfd_arch_info_type i8086_arch = "i8086", 3, FALSE, - bfd_default_compatible, + bfd_i386_compatible, bfd_default_scan, &bfd_i386_arch_intel_syntax }; @@ -99,7 +112,7 @@ static const bfd_arch_info_type bfd_x64_32_arch = "i386:x64-32", 3, FALSE, - bfd_default_compatible, + bfd_i386_compatible, bfd_default_scan, &i8086_arch }; @@ -115,7 +128,7 @@ static const bfd_arch_info_type bfd_x86_64_arch = "i386:x86-64", 3, FALSE, - bfd_default_compatible, + bfd_i386_compatible, bfd_default_scan, &bfd_x64_32_arch }; @@ -131,7 +144,7 @@ const bfd_arch_info_type bfd_i386_arch = "i386", 3, TRUE, - bfd_default_compatible, + bfd_i386_compatible, bfd_default_scan, &bfd_x86_64_arch }; |