diff options
| author | obrien <obrien@FreeBSD.org> | 2002-04-12 19:33:52 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2002-04-12 19:33:52 +0000 |
| commit | 18ff9f4f1bddd11c341a37177885ac89fcccedd9 (patch) | |
| tree | b6180daa6d6e558ce86214f98d103e01ff4e70ff /contrib/binutils/bfd/archures.c | |
| parent | 1d1ccbf8e10277966ecf3c150370a50c9e184b35 (diff) | |
| download | FreeBSD-src-18ff9f4f1bddd11c341a37177885ac89fcccedd9.zip FreeBSD-src-18ff9f4f1bddd11c341a37177885ac89fcccedd9.tar.gz | |
Import of Binutils from the FSF 2.12 branch.
(this fixes several linker problems and coredumps)
These bits are taken from the FSF anoncvs repo on 10-April-2002 13:24 Zulu
Diffstat (limited to 'contrib/binutils/bfd/archures.c')
| -rw-r--r-- | contrib/binutils/bfd/archures.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/contrib/binutils/bfd/archures.c b/contrib/binutils/bfd/archures.c index 1caac7f..9a91424 100644 --- a/contrib/binutils/bfd/archures.c +++ b/contrib/binutils/bfd/archures.c @@ -259,8 +259,8 @@ DESCRIPTION .#define bfd_mach_avr5 5 . bfd_arch_cris, {* Axis CRIS *} . bfd_arch_s390, {* IBM s390 *} -.#define bfd_mach_s390_esa 0 -.#define bfd_mach_s390_esame 1 +.#define bfd_mach_s390_31 0 +.#define bfd_mach_s390_64 1 . bfd_arch_openrisc, {* OpenRISC *} . bfd_arch_mmix, {* Donald Knuth's educational processor. *} . bfd_arch_xstormy16, @@ -722,6 +722,9 @@ bfd_default_compatible (a, b) if (a->arch != b->arch) return NULL; + if (a->bits_per_word != b->bits_per_word) + return NULL; + if (a->mach > b->mach) return a; |
