From: Dave Anglin <dave.anglin@nrc.ca>
Date: Mon, 5 Dec 2005 17:00:36 +0000 (+0000)
Subject: 	Bug gas/1948
X-Git-Tag: gdb-csl-20060226-branchpoint~612
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b3ce1bf78e82453aa76e77b95abbd676caa3a7ab;p=external%2Fbinutils.git

	Bug gas/1948
	* symbols.c (colon): Also check if now_seg is bss_section when a symbol
	is being redefined.
---

diff --git a/gas/ChangeLog b/gas/ChangeLog
index d4132b7..4bd00a3 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-05  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	Bug gas/1948
+	* symbols.c (colon): Also check if now_seg is bss_section when a symbol
+	is being redefined.
+
 2005-12-02  Arnold Metselaar  <arnoldm@sourceware.org>
 
 	* config/tc-z80.c (emit_ldreg): fix bug in ld rr,<xx>
diff --git a/gas/symbols.c b/gas/symbols.c
index f6dafcd..8e3d492 100644
--- a/gas/symbols.c
+++ b/gas/symbols.c
@@ -376,6 +376,7 @@ colon (/* Just seen "x:" - rattle symbols & frags.  */
 		    && S_IS_EXTERNAL (symbolP))
 		   || S_GET_SEGMENT (symbolP) == bss_section)
 		  && (now_seg == data_section
+		      || now_seg == bss_section
 		      || now_seg == S_GET_SEGMENT (symbolP)))
 		{
 		  /* Select which of the 2 cases this is.  */