summaryrefslogtreecommitdiff
path: root/bfd
diff options
context:
space:
mode:
authorThiemo Seufer <ths@networkno.de>2002-05-19 21:06:34 +0000
committerThiemo Seufer <ths@networkno.de>2002-05-19 21:06:34 +0000
commit7387e5c8149c3592c14ce3c6d4708110182c9a99 (patch)
tree096b02eab892d12bc36ffaea016404c672be4442 /bfd
parent0ec2c1c8e8ec73c9bdecc54108e759a4e8ddba29 (diff)
downloadbinutils-redhat-7387e5c8149c3592c14ce3c6d4708110182c9a99.tar.gz
* cpu-mips.c (mips_compatible): Don't try to check machine
compatibility.
Diffstat (limited to 'bfd')
-rw-r--r--bfd/ChangeLog5
-rw-r--r--bfd/cpu-mips.c7
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 <seufer@csv.ica.uni-stuttgart.de>
+
+ * cpu-mips.c (mips_compatible): Don't try to check machine
+ compatibility.
+
2002-05-18 Tom Rix <trix@redhat.com>
* 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;
}