summaryrefslogtreecommitdiffstats
path: root/contrib/binutils/bfd/archures.c
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/binutils/bfd/archures.c')
-rw-r--r--contrib/binutils/bfd/archures.c7
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;
OpenPOWER on IntegriCloud