From e4be4980a327cdf0d12f4fa7625d0bd04c93c46a Mon Sep 17 00:00:00 2001 From: ths Date: Sun, 19 May 2002 21:06:34 +0000 Subject: [PATCH] * cpu-mips.c (mips_compatible): Don't try to check machine compatibility. --- bfd/ChangeLog | 5 +++++ bfd/cpu-mips.c | 7 ++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index e5e7ce329e..02b963fc1f 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2002-05-19 Thiemo Seufer + + * cpu-mips.c (mips_compatible): Don't try to check machine + compatibility. + 2002-05-18 Tom Rix * coff64-rs6000.c (_bfd_xcoff64_swap_aux_out): Fix C_FILE auxent. diff --git a/bfd/cpu-mips.c b/bfd/cpu-mips.c index d54b0a5589..d5343ff31e 100644 --- a/bfd/cpu-mips.c +++ b/bfd/cpu-mips.c @@ -37,11 +37,8 @@ mips_compatible (a, b) if (a->arch != b->arch) return NULL; - if (a->mach > b->mach) - return a; - - if (b->mach > a->mach) - return b; + /* Machine compatibility is checked in + _bfd_mips_elf_merge_private_bfd_data. */ return a; } -- 2.11.0