aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gas/ChangeLog6
-rw-r--r--gas/config/tc-mips.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index debeb84..24bf8c0 100644
--- 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 ec0bf25..095c466 100644
--- 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
);
}