diff options
| -rw-r--r-- | gas/ChangeLog | 11 | ||||
| -rw-r--r-- | gas/as.c | 4 | ||||
| -rw-r--r-- | gas/frags.c | 4 | ||||
| -rw-r--r-- | gas/frags.h | 3 | ||||
| -rw-r--r-- | gas/read.c | 3 | ||||
| -rw-r--r-- | gas/symbols.c | 10 | ||||
| -rw-r--r-- | gas/symbols.h | 1 |
7 files changed, 28 insertions, 8 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index a67250ea8c..98cab137b7 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,14 @@ +2011-10-13 Alan Modra <amodra@gmail.com> + + * as.c (main): Define .gasversion. rather than __GAS_VERSION__. + * frags.h (bss_address_frag): Delete + (predefined_address_frag): New. + * frags.c (frag_init): Init predefined_address_frag. Delete ref + to bss_addres_frag. + * symbols.c (S_CAN_BE_REDEFINED): New function. + * symbols.h (S_CAN_BE_REDEFINED): Declare. + * read.c (assign_symbol): Use S_CAN_BE_REDEFINED. + 2011-10-12 Alan Modra <amodra@gmail.com> * symbols.c (local_symbol_make): Make global. @@ -1206,8 +1206,8 @@ main (int argc, char ** argv) dwarf2_init (); - local_symbol_make ("__GAS_VERSION__", absolute_section, - BFD_VERSION / 10000UL, &zero_address_frag); + local_symbol_make (".gasversion.", absolute_section, + BFD_VERSION / 10000UL, &predefined_address_frag); /* Now that we have fully initialized, and have created the output file, define any symbols requested by --defsym command line diff --git a/gas/frags.c b/gas/frags.c index fb3c02d3b5..fe3e78f574 100644 --- a/gas/frags.c +++ b/gas/frags.c @@ -25,7 +25,7 @@ #include "obstack.h" extern fragS zero_address_frag; -extern fragS bss_address_frag; +extern fragS predefined_address_frag; /* Initialization for frag routines. */ @@ -33,7 +33,7 @@ void frag_init (void) { zero_address_frag.fr_type = rs_fill; - bss_address_frag.fr_type = rs_fill; + predefined_address_frag.fr_type = rs_fill; } /* Check that we're not trying to assemble into a section that can't diff --git a/gas/frags.h b/gas/frags.h index 650ea5ed6a..dd247f9c53 100644 --- a/gas/frags.h +++ b/gas/frags.h @@ -118,8 +118,7 @@ extern addressT frag_now_fix_octets (void); /* For foreign-segment symbol fixups. */ COMMON fragS zero_address_frag; -/* For local common (N_BSS segment) fixups. */ -COMMON fragS bss_address_frag; +COMMON fragS predefined_address_frag; extern void frag_append_1_char (int); #define FRAG_APPEND_1_CHAR(X) frag_append_1_char (X) diff --git a/gas/read.c b/gas/read.c index 2ab58ecbc3..445caa1489 100644 --- a/gas/read.c +++ b/gas/read.c @@ -3091,9 +3091,8 @@ assign_symbol (char *name, int mode) if (S_IS_DEFINED (symbolP) || symbol_equated_p (symbolP)) { - /* Permit register names to be redefined. */ if ((mode != 0 || !S_IS_VOLATILE (symbolP)) - && S_GET_SEGMENT (symbolP) != reg_section) + && !S_CAN_BE_REDEFINED (symbolP)) { as_bad (_("symbol `%s' is already defined"), name); symbolP = symbol_clone (symbolP, 0); diff --git a/gas/symbols.c b/gas/symbols.c index b5d5a43b2f..086e01d6a5 100644 --- a/gas/symbols.c +++ b/gas/symbols.c @@ -2137,6 +2137,16 @@ S_IS_STABD (symbolS *s) } int +S_CAN_BE_REDEFINED (const symbolS *s) +{ + if (LOCAL_SYMBOL_CHECK (s)) + return (local_symbol_get_frag ((struct local_symbol *) s) + == &predefined_address_frag); + /* Permit register names to be redefined. */ + return s->bsym->section == reg_section; +} + +int S_IS_VOLATILE (const symbolS *s) { if (LOCAL_SYMBOL_CHECK (s)) diff --git a/gas/symbols.h b/gas/symbols.h index 7c9896feb9..a3a31f765b 100644 --- a/gas/symbols.h +++ b/gas/symbols.h @@ -100,6 +100,7 @@ extern int S_FORCE_RELOC (symbolS *, int); extern int S_IS_DEBUG (symbolS *); extern int S_IS_LOCAL (symbolS *); extern int S_IS_STABD (symbolS *); +extern int S_CAN_BE_REDEFINED (const symbolS *); extern int S_IS_VOLATILE (const symbolS *); extern int S_IS_FORWARD_REF (const symbolS *); extern const char *S_GET_NAME (symbolS *); |