From: Ian Lance Taylor <ian@airs.com>
Date: Fri, 26 Jul 1996 15:58:57 +0000 (+0000)
Subject: 	* symbols.c (S_SET_EXTERNAL): Let .weak override.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5ca547dc2399a0a5d9f20626d4bf5547c3ccfddd;p=binutils-gdb.git

	* symbols.c (S_SET_EXTERNAL): Let .weak override.
	(S_CLEAR_EXTERNAL): Likewise.
	(S_SET_WEAK): Remove error; just let .weak override.
---

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 869dc062098..43316102299 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+Fri Jul 26 11:56:08 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* symbols.c (S_SET_EXTERNAL): Let .weak override.
+	(S_CLEAR_EXTERNAL): Likewise.
+	(S_SET_WEAK): Remove error; just let .weak override.
+
 start-sanitize-d10v
 Thu Jul 25 15:22:51 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
diff --git a/gas/symbols.c b/gas/symbols.c
index da83e9933c5..fa2fadbe4b1 100644
--- a/gas/symbols.c
+++ b/gas/symbols.c
@@ -1379,7 +1379,7 @@ S_SET_EXTERNAL (s)
 {
   if ((s->bsym->flags & BSF_WEAK) != 0)
     {
-      as_bad ("%s already declared as weak", S_GET_NAME (s));
+      /* Let .weak override .global.  */
       return;
     }
   s->bsym->flags |= BSF_GLOBAL;
@@ -1392,7 +1392,7 @@ S_CLEAR_EXTERNAL (s)
 {
   if ((s->bsym->flags & BSF_WEAK) != 0)
     {
-      as_bad ("%s already declared as weak", S_GET_NAME (s));
+      /* Let .weak override.  */
       return;
     }
   s->bsym->flags |= BSF_LOCAL;
@@ -1403,11 +1403,6 @@ void
 S_SET_WEAK (s)
      symbolS *s;
 {
-  if ((s->bsym->flags & BSF_GLOBAL) != 0)
-    {
-      as_bad ("%s already declared as global", S_GET_NAME (s));
-      return;
-    }
   s->bsym->flags |= BSF_WEAK;
   s->bsym->flags &= ~(BSF_GLOBAL|BSF_LOCAL);
 }