From: Chris Demetriou <cgd@google.com>
Date: Fri, 15 Feb 2002 23:13:42 +0000 (+0000)
Subject: 2002-02-15  Chris Demetriou  <cgd@broadcom.com>
X-Git-Tag: binutils-2_12~49
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1eb38e17c88b5f6e753bc2f062621a824b6a8764;p=thirdparty%2Fbinutils-gdb.git

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 7cc88df2b82..08c132d357b 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 ec0bf25e8b6..095c466b95c 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
 		);
     }