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 d4132b7b978bbc7e4726f6edd681d142910fa9ed..4bd00a34b5e69207dfbd28f290b0fdf2665c71dc 100644 (file)
--- 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 f6dafcd86b239ea4471486ec6e8325c0bfe65152..8e3d492c71bafea13414622f4f4ff4a1521c2961 100644 (file)
--- 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.  */