From: Alan Modra Date: Tue, 25 Oct 2011 03:06:33 +0000 (+0000) Subject: 2011-10-13 Alan Modra X-Git-Tag: binutils-2_22~51 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d690455615e0f0780b25475d5a28a7d2ab9bbf92;p=thirdparty%2Fbinutils-gdb.git 2011-10-13 Alan Modra * 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_address_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 * symbols.c (local_symbol_make): Make global. * symbols.h (local_symbol_make): Declare. * as.c (main): Define __GAS_VERSION__. --- diff --git a/gas/ChangeLog b/gas/ChangeLog index 4d0d622fde6..50f9de8be6c 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,21 @@ +2011-10-25 Alan Modra + + Apply mainline patches + 2011-10-13 Alan Modra + * 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_address_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 + * symbols.c (local_symbol_make): Make global. + * symbols.h (local_symbol_make): Declare. + * as.c (main): Define __GAS_VERSION__. + 2011-09-22 Tristan Gingold * NEWS: Add marker for 2.22. diff --git a/gas/as.c b/gas/as.c index e58d861c83d..b99ea1e8be6 100644 --- a/gas/as.c +++ b/gas/as.c @@ -1206,6 +1206,9 @@ main (int argc, char ** argv) dwarf2_init (); + 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 arguments. */ diff --git a/gas/frags.c b/gas/frags.c index fb3c02d3b5d..fe3e78f5744 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 650ea5ed6a5..dd247f9c535 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 2ab58ecbc30..445caa1489d 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 fc475caec0e..086e01d6a5b 100644 --- a/gas/symbols.c +++ b/gas/symbols.c @@ -23,11 +23,9 @@ /* #define DEBUG_SYMS / * to debug symbol list maintenance. */ #include "as.h" - #include "safe-ctype.h" #include "obstack.h" /* For "symbols.h" */ #include "subsegs.h" - #include "struc-symbol.h" /* This is non-zero if symbols are case sensitive, which is the @@ -191,7 +189,7 @@ static unsigned long local_symbol_conversion_count; /* Create a local symbol and insert it into the local hash table. */ -static struct local_symbol * +struct local_symbol * local_symbol_make (const char *name, segT section, valueT val, fragS *frag) { char *name_copy; @@ -2138,6 +2136,16 @@ S_IS_STABD (symbolS *s) return S_GET_NAME (s) == 0; } +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) { diff --git a/gas/symbols.h b/gas/symbols.h index 1d5b2a3ca63..a3a31f765bc 100644 --- a/gas/symbols.h +++ b/gas/symbols.h @@ -50,6 +50,8 @@ symbolS *symbol_new (const char *name, segT segment, valueT value, fragS * frag); symbolS *symbol_create (const char *name, segT segment, valueT value, fragS * frag); +struct local_symbol *local_symbol_make (const char *name, segT section, + valueT val, fragS *frag); symbolS *symbol_clone (symbolS *, int); #undef symbol_clone_if_forward_ref symbolS *symbol_clone_if_forward_ref (symbolS *, int); @@ -98,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 *);