aboutsummaryrefslogtreecommitdiff
path: root/gcc/dbxout.c
diff options
context:
space:
mode:
authorJason Merrill <jason@gcc.gnu.org>2000-09-22 13:59:46 -0400
committerJason Merrill <jason@gcc.gnu.org>2000-09-22 13:59:46 -0400
commita3a834aa73cc1f422c50b45955172805c5ab6fcc (patch)
treea67b3674ad3b4081215f47f5030ffa8a78b0a260 /gcc/dbxout.c
parent49895d5569d13006172ad37e60e1f833e3dde43c (diff)
downloadgcc-a3a834aa73cc1f422c50b45955172805c5ab6fcc.zip
gcc-a3a834aa73cc1f422c50b45955172805c5ab6fcc.tar.gz
gcc-a3a834aa73cc1f422c50b45955172805c5ab6fcc.tar.bz2
c-lex.c (skip_white_space): Just treat CRs as horizontal whitespace.
* c-lex.c (skip_white_space): Just treat CRs as horizontal whitespace. * dbxout.c (dbxout_symbol_name): Just use DECL_NAME for function-local names. From-SVN: r36570
Diffstat (limited to 'gcc/dbxout.c')
-rw-r--r--gcc/dbxout.c18
1 files changed, 13 insertions, 5 deletions
diff --git a/gcc/dbxout.c b/gcc/dbxout.c
index 1be2025..71c7959 100644
--- a/gcc/dbxout.c
+++ b/gcc/dbxout.c
@@ -2215,11 +2215,19 @@ dbxout_symbol_name (decl, suffix, letter)
const char *suffix;
int letter;
{
- /* One slight hitch: if this is a VAR_DECL which is a static
- class member, we must put out the mangled name instead of the
- DECL_NAME. Note also that static member (variable) names DO NOT begin
- with underscores in .stabs directives. */
- const char *name = IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (decl));
+ const char *name;
+
+ if (TYPE_P (DECL_CONTEXT (decl)))
+ /* One slight hitch: if this is a VAR_DECL which is a static
+ class member, we must put out the mangled name instead of the
+ DECL_NAME. Note also that static member (variable) names DO NOT begin
+ with underscores in .stabs directives. */
+ name = IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (decl));
+ else
+ /* ...but if we're function-local, we don't want to include the junk
+ added by ASM_FORMAT_PRIVATE_NAME. */
+ name = IDENTIFIER_POINTER (DECL_NAME (decl));
+
if (name == 0)
name = "(anon)";
fprintf (asmfile, "%s \"%s%s:", ASM_STABS_OP, name,