2002-02-15 Chris Demetriou <cgd@broadcom.com>

        * config/tc-mips.c (md_estimate_size_before_relax): Really
        make sure we treat weak like extern only for ELF.  (Fixes
        patch from 2001-07-25.)

diff --git a/gas/ChangeLog b/gas/ChangeLog
index debeb84e729e25ebe2fcf5724761cfe558d75712..24bf8c0205a2b8aeab438d3e36c924d7c1d4a5d6 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2002-02-15  Chris Demetriou  <cgd@broadcom.com>
+
+        * config/tc-mips.c (md_estimate_size_before_relax): Really
+       make sure we treat weak like extern only for ELF.  (Fixes
+       patch from 2001-07-25.)
+
 2002-02-15  Ben Elliston  <bje@redhat.com>
 
        * doc/as.texinfo: Add duplicate directory entry so that "info gas"

diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index ec0bf25e8b652f29914585f5889a0ead1523492e..095c466b95c06346135f840cf641d35f4e250e2f 100644 (file)
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -12194,8 +12194,8 @@ md_estimate_size_before_relax (fragp, segtype)
                && !linkonce
 #ifdef OBJ_ELF
                /* A global or weak symbol is treated as external.  */
-               && (OUTPUT_FLAVOR == bfd_target_elf_flavour
-                   && ! (S_IS_EXTERN (sym) || S_IS_WEAK (sym)))
+               && (OUTPUT_FLAVOR != bfd_target_elf_flavour
+                   || (! S_IS_EXTERN (sym) && ! S_IS_WEAK (sym)))
 #endif
                );
     }