aboutsummaryrefslogtreecommitdiff
path: root/gas
diff options
context:
space:
mode:
authorJan Beulich <jbeulich@novell.com>2005-04-19 15:05:09 +0000
committerJan Beulich <jbeulich@novell.com>2005-04-19 15:05:09 +0000
commit91c4c44904833bf50cc90e18c2e5cf46c7565b8f (patch)
treeb1ab95254b4ea0293baba397b3ed7fcb8d409bee /gas
parent80b8152b3c463c43c02eb1dfe691824120225f0d (diff)
downloadgdb-91c4c44904833bf50cc90e18c2e5cf46c7565b8f.zip
gdb-91c4c44904833bf50cc90e18c2e5cf46c7565b8f.tar.gz
gdb-91c4c44904833bf50cc90e18c2e5cf46c7565b8f.tar.bz2
gas/
2005-04-19 Jan Beulich <jbeulich@novell.com> * symbols.h (symbol_find_base): Remove prototype. * symbols.c (save_symbol_name): Remove code section conditional upon STRIP_UNDERSCORE. (symbol_find): Remove. (symbol_find_base): Rename to symbol_find. * subsegs.c (section_symbol): Replace use of symbol_find_base with symbol_find. * config/obj-coff.c (tag_insert): Remove code section conditional upon STRIP_UNDERSCORE. (obj_coff_def): Likewise. (obj_coff_endef): Replace use of symbol_find_base with symbol_find. (coff_frob_symbol): Likewise. (yank_symbols): Likewise. (c_section_symbol): Likewise. * config/obj-coff.h (DO_NOT_STRIP): Remove. * config/tc-arm.c (symbol_locate): Remove code section conditional upon STRIP_UNDERSCORE. * config/tc-h8300.h (DO_NOT_STRIP): Remove. * config/tc-h8500.h (DO_NOT_STRIP): Remove. * config/tc-sh.h (DO_NOT_STRIP): Remove. * config/tc-w65.h (DO_NOT_STRIP): Remove. * config/tc-z8k.h (DO_NOT_STRIP): Remove.
Diffstat (limited to 'gas')
-rw-r--r--gas/ChangeLog25
-rw-r--r--gas/config/obj-coff.c32
-rw-r--r--gas/config/obj-coff.h5
-rw-r--r--gas/config/tc-arm.c4
-rw-r--r--gas/config/tc-h8300.h1
-rw-r--r--gas/config/tc-h8500.h1
-rw-r--r--gas/config/tc-sh.h2
-rw-r--r--gas/config/tc-w65.h1
-rw-r--r--gas/config/tc-z8k.h1
-rw-r--r--gas/subsegs.c2
-rw-r--r--gas/symbols.c20
-rw-r--r--gas/symbols.h1
12 files changed, 34 insertions, 61 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index cb282e9..eb51697 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,28 @@
+2005-04-19 Jan Beulich <jbeulich@novell.com>
+
+ * symbols.h (symbol_find_base): Remove prototype.
+ * symbols.c (save_symbol_name): Remove code section conditional upon
+ STRIP_UNDERSCORE.
+ (symbol_find): Remove.
+ (symbol_find_base): Rename to symbol_find.
+ * subsegs.c (section_symbol): Replace use of symbol_find_base with
+ symbol_find.
+ * config/obj-coff.c (tag_insert): Remove code section conditional
+ upon STRIP_UNDERSCORE.
+ (obj_coff_def): Likewise.
+ (obj_coff_endef): Replace use of symbol_find_base with symbol_find.
+ (coff_frob_symbol): Likewise.
+ (yank_symbols): Likewise.
+ (c_section_symbol): Likewise.
+ * config/obj-coff.h (DO_NOT_STRIP): Remove.
+ * config/tc-arm.c (symbol_locate): Remove code section conditional
+ upon STRIP_UNDERSCORE.
+ * config/tc-h8300.h (DO_NOT_STRIP): Remove.
+ * config/tc-h8500.h (DO_NOT_STRIP): Remove.
+ * config/tc-sh.h (DO_NOT_STRIP): Remove.
+ * config/tc-w65.h (DO_NOT_STRIP): Remove.
+ * config/tc-z8k.h (DO_NOT_STRIP): Remove.
+
2005-04-19 Andreas Schwab <schwab@suse.de>
* config/tc-ia64.c (md_assemble): Fix error message for wrong
diff --git a/gas/config/obj-coff.c b/gas/config/obj-coff.c
index 922caed..b00275e 100644
--- a/gas/config/obj-coff.c
+++ b/gas/config/obj-coff.c
@@ -137,10 +137,6 @@ tag_insert (const char *name, symbolS *symbolP)
static symbolS *
tag_find (char *name)
{
-#ifdef STRIP_UNDERSCORE
- if (*name == '_')
- name++;
-#endif /* STRIP_UNDERSCORE */
return (symbolS *) hash_find (tag_hash, name);
}
@@ -529,11 +525,6 @@ obj_coff_def (int what ATTRIBUTE_UNUSED)
SKIP_WHITESPACES ();
symbol_name = input_line_pointer;
-#ifdef STRIP_UNDERSCORE
- if (symbol_name[0] == '_' && symbol_name[1] != 0)
- symbol_name++;
-#endif
-
name_end = get_symbol_end ();
symbol_name_length = strlen (symbol_name);
symbol_name_copy = xmalloc (symbol_name_length + 1);
@@ -723,8 +714,7 @@ obj_coff_endef (int ignore ATTRIBUTE_UNUSED)
&& !SF_GET_TAG (def_symbol_in_progress))
|| S_GET_SEGMENT (def_symbol_in_progress) == absolute_section
|| ! symbol_constant_p (def_symbol_in_progress)
- || (symbolP = symbol_find_base (S_GET_NAME (def_symbol_in_progress),
- DO_NOT_STRIP)) == NULL
+ || (symbolP = symbol_find (S_GET_NAME (def_symbol_in_progress))) == NULL
|| SF_GET_TAG (def_symbol_in_progress) != SF_GET_TAG (symbolP))
{
/* If it already is at the end of the symbol list, do nothing */
@@ -771,8 +761,7 @@ obj_coff_endef (int ignore ATTRIBUTE_UNUSED)
{
symbolS *oldtag;
- oldtag = symbol_find_base (S_GET_NAME (def_symbol_in_progress),
- DO_NOT_STRIP);
+ oldtag = symbol_find (S_GET_NAME (def_symbol_in_progress));
if (oldtag == NULL || ! SF_GET_TAG (oldtag))
tag_insert (S_GET_NAME (def_symbol_in_progress),
def_symbol_in_progress);
@@ -1245,7 +1234,7 @@ coff_frob_symbol (symbolS *symp, int *punt)
&& !SF_GET_STATICS (symp)
&& S_GET_STORAGE_CLASS (symp) != C_LABEL
&& symbol_constant_p (symp)
- && (real = symbol_find_base (S_GET_NAME (symp), DO_NOT_STRIP))
+ && (real = symbol_find (S_GET_NAME (symp)))
&& S_GET_STORAGE_CLASS (real) == C_NULL
&& real != symp)
{
@@ -2453,13 +2442,7 @@ obj_coff_def (int what ATTRIBUTE_UNUSED)
#endif
/* Initialize the new symbol. */
-#ifdef STRIP_UNDERSCORE
- S_SET_NAME (def_symbol_in_progress, (*symbol_name_copy == '_'
- ? symbol_name_copy + 1
- : symbol_name_copy));
-#else /* STRIP_UNDERSCORE */
S_SET_NAME (def_symbol_in_progress, symbol_name_copy);
-#endif /* STRIP_UNDERSCORE */
/* free(symbol_name_copy); */
def_symbol_in_progress->sy_name_offset = (unsigned long) ~0;
def_symbol_in_progress->sy_number = ~0;
@@ -2611,7 +2594,7 @@ obj_coff_endef (int ignore ATTRIBUTE_UNUSED)
&& !SF_GET_TAG (def_symbol_in_progress))
|| S_GET_SEGMENT (def_symbol_in_progress) == absolute_section
|| def_symbol_in_progress->sy_value.X_op != O_constant
- || (symbolP = symbol_find_base (S_GET_NAME (def_symbol_in_progress), DO_NOT_STRIP)) == NULL
+ || (symbolP = symbol_find (S_GET_NAME (def_symbol_in_progress))) == NULL
|| (SF_GET_TAG (def_symbol_in_progress) != SF_GET_TAG (symbolP)))
{
symbol_append (def_symbol_in_progress, symbol_lastP, &symbol_rootP,
@@ -2654,8 +2637,7 @@ obj_coff_endef (int ignore ATTRIBUTE_UNUSED)
{
symbolS *oldtag;
- oldtag = symbol_find_base (S_GET_NAME (def_symbol_in_progress),
- DO_NOT_STRIP);
+ oldtag = symbol_find (S_GET_NAME (def_symbol_in_progress));
if (oldtag == NULL || ! SF_GET_TAG (oldtag))
tag_insert (S_GET_NAME (def_symbol_in_progress),
def_symbol_in_progress);
@@ -2977,7 +2959,7 @@ yank_symbols (void)
&& !SF_GET_STATICS (symbolP)
&& S_GET_STORAGE_CLASS (symbolP) != C_LABEL
&& symbolP->sy_value.X_op == O_constant
- && (real_symbolP = symbol_find_base (S_GET_NAME (symbolP), DO_NOT_STRIP))
+ && (real_symbolP = symbol_find (S_GET_NAME (symbolP)))
&& real_symbolP != symbolP)
{
/* FIXME-SOON: where do dups come from?
@@ -3240,7 +3222,7 @@ c_section_symbol (char *name, int idx)
{
symbolS *symbolP;
- symbolP = symbol_find_base (name, DO_NOT_STRIP);
+ symbolP = symbol_find (name);
if (symbolP == NULL)
symbolP = symbol_new (name, idx, 0, &zero_address_frag);
else
diff --git a/gas/config/obj-coff.h b/gas/config/obj-coff.h
index 18fabae..c6819a2 100644
--- a/gas/config/obj-coff.h
+++ b/gas/config/obj-coff.h
@@ -265,8 +265,6 @@
#define SYM_AUXINFO(S) \
(&coffsymbol (symbol_get_bfdsym (S))->native[1])
-#define DO_NOT_STRIP 0
-
/* The number of auxiliary entries. */
#define S_GET_NUMBER_AUXILIARY(s) \
(coffsymbol (symbol_get_bfdsym (s))->native->u.syment.n_numaux)
@@ -453,9 +451,6 @@ typedef struct
unsigned int ost_flags;
} obj_symbol_type;
-#ifndef DO_NOT_STRIP
-#define DO_NOT_STRIP 0
-#endif
/* Symbol table macros and constants. */
/* Possible and useful section number in symbol table
diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index 298468f..6c58040 100644
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -1137,10 +1137,6 @@ symbol_locate (symbolS * symbolP,
name_length = strlen (name) + 1; /* +1 for \0. */
obstack_grow (&notes, name, name_length);
preserved_copy_of_name = obstack_finish (&notes);
-#ifdef STRIP_UNDERSCORE
- if (preserved_copy_of_name[0] == '_')
- preserved_copy_of_name++;
-#endif
#ifdef tc_canonicalize_symbol_name
preserved_copy_of_name =
diff --git a/gas/config/tc-h8300.h b/gas/config/tc-h8300.h
index 720e03a..71c4e29 100644
--- a/gas/config/tc-h8300.h
+++ b/gas/config/tc-h8300.h
@@ -88,7 +88,6 @@ extern void tc_reloc_mangle (struct fix *, struct internal_reloc *, bfd_vma);
#define TC_CONS_RELOC (Hmode ? R_RELLONG: R_RELWORD)
-#define DO_NOT_STRIP 0
#define LISTING_HEADER "Renesas H8/300 GAS "
#define NEED_FX_R_TYPE 1
#ifndef OBJ_ELF
diff --git a/gas/config/tc-h8500.h b/gas/config/tc-h8500.h
index e305bd6..88121fc 100644
--- a/gas/config/tc-h8500.h
+++ b/gas/config/tc-h8500.h
@@ -41,7 +41,6 @@ struct internal_reloc;
extern void tc_reloc_mangle
(struct fix *, struct internal_reloc *, bfd_vma);
-#define DO_NOT_STRIP 0
#define LISTING_HEADER "Renesas H8/500 GAS "
#define NEED_FX_R_TYPE 1
#define RELOC_32 1234
diff --git a/gas/config/tc-sh.h b/gas/config/tc-sh.h
index a2df0ca..d0b5002 100644
--- a/gas/config/tc-sh.h
+++ b/gas/config/tc-sh.h
@@ -135,8 +135,6 @@ extern void sh_frob_file (void);
#ifdef OBJ_COFF
/* COFF specific definitions. */
-#define DO_NOT_STRIP 0
-
/* This macro translates between an internal fix and a coff reloc type. */
#define TC_COFF_FIX2RTYPE(fix) ((fix)->fx_r_type)
diff --git a/gas/config/tc-w65.h b/gas/config/tc-w65.h
index dadd07d..f3164b7 100644
--- a/gas/config/tc-w65.h
+++ b/gas/config/tc-w65.h
@@ -41,7 +41,6 @@ struct fix;
#define TC_RELOC_MANGLE(s,a,b,c) tc_reloc_mangle (a,b,c)
extern void tc_reloc_mangle (struct fix *, struct internal_reloc *, bfd_vma);
-#define DO_NOT_STRIP 0
#define LISTING_HEADER "W65816 GAS "
#define NEED_FX_R_TYPE 1
#define RELOC_32 1234
diff --git a/gas/config/tc-z8k.h b/gas/config/tc-z8k.h
index 90a76d8..ad3c8e6 100644
--- a/gas/config/tc-z8k.h
+++ b/gas/config/tc-z8k.h
@@ -44,7 +44,6 @@ struct internal_reloc;
extern void tc_reloc_mangle
PARAMS ((struct fix *, struct internal_reloc *, bfd_vma));
-#define DO_NOT_STRIP 0
#define LISTING_HEADER "Zilog Z8000 GAS "
#define NEED_FX_R_TYPE 1
#define RELOC_32 1234
diff --git a/gas/subsegs.c b/gas/subsegs.c
index e9ed688..7e4f19c 100644
--- a/gas/subsegs.c
+++ b/gas/subsegs.c
@@ -524,7 +524,7 @@ section_symbol (segT sec)
else
{
segT seg;
- s = symbol_find_base (sec->symbol->name, 0);
+ s = symbol_find (sec->symbol->name);
/* We have to make sure it is the right symbol when we
have multiple sections with the same section name. */
if (s == NULL
diff --git a/gas/symbols.c b/gas/symbols.c
index 002ae35..a7f0581 100644
--- a/gas/symbols.c
+++ b/gas/symbols.c
@@ -113,11 +113,6 @@ save_symbol_name (const char *name)
obstack_grow (&notes, name, name_length);
ret = obstack_finish (&notes);
-#ifdef STRIP_UNDERSCORE
- if (ret[0] == '_')
- ++ret;
-#endif
-
#ifdef tc_canonicalize_symbol_name
ret = tc_canonicalize_symbol_name (ret);
#endif
@@ -600,16 +595,6 @@ symbol_temp_make (void)
of a struct symbol associated with that name. */
symbolS *
-symbol_find (const char *name)
-{
-#ifdef STRIP_UNDERSCORE
- return (symbol_find_base (name, 1));
-#else /* STRIP_UNDERSCORE */
- return (symbol_find_base (name, 0));
-#endif /* STRIP_UNDERSCORE */
-}
-
-symbolS *
symbol_find_exact (const char *name)
{
#ifdef BFD_ASSEMBLER
@@ -626,11 +611,8 @@ symbol_find_exact (const char *name)
}
symbolS *
-symbol_find_base (const char *name, int strip_underscore)
+symbol_find (const char *name)
{
- if (strip_underscore && *name == '_')
- name++;
-
#ifdef tc_canonicalize_symbol_name
{
char *copy;
diff --git a/gas/symbols.h b/gas/symbols.h
index 89bbdb1..f1fd351 100644
--- a/gas/symbols.h
+++ b/gas/symbols.h
@@ -50,7 +50,6 @@ extern int symbols_case_sensitive;
char *decode_local_label_name (char *s);
symbolS *symbol_find (const char *name);
symbolS *symbol_find_exact (const char *name);
-symbolS *symbol_find_base (const char *name, int strip_underscore);
symbolS *symbol_find_or_make (const char *name);
symbolS *symbol_make (const char *name);
symbolS *symbol_new (const char *name, segT segment, valueT value,