2002-06-07 Chris Demetriou <cgd@broadcom.com>

[deliverable/binutils-gdb.git] / bfd / cpu-mips.c

diff --git a/bfd/cpu-mips.c b/bfd/cpu-mips.c
index 10dd0b748c9e78f4ff6fdeaf639fa40c08814fa8..d5343ff31ef25e723196c3b52168c02ab03929bc 100644 (file)
--- a/bfd/cpu-mips.c
+++ b/bfd/cpu-mips.c
@@ -23,10 +23,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "sysdep.h"
 #include "libbfd.h"
 
+static const bfd_arch_info_type *mips_compatible
+  PARAMS ((const bfd_arch_info_type *, const bfd_arch_info_type *));
+
 /* The default routine tests bits_per_word, which is wrong on mips as
    mips word size doesn't correlate with reloc size.  */
 
-const bfd_arch_info_type *
+static const bfd_arch_info_type *
 mips_compatible (a, b)
      const bfd_arch_info_type *a;
      const bfd_arch_info_type *b;
@@ -34,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;
 }
@@ -54,7 +54,7 @@ mips_compatible (a, b)
     PRINT,                                             \
     3,                                                 \
     DEFAULT,                                           \
-    mips_compatible,                                   \
+    mips_compatible,                                   \
     bfd_default_scan,                                  \
     NEXT,                                              \
   }