diff options
Diffstat (limited to 'gas')
-rw-r--r-- | gas/ChangeLog | 6 | ||||
-rw-r--r-- | gas/symbols.c | 1 |
2 files changed, 7 insertions, 0 deletions
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. */ |