@@ -15077,7 +15077,7 @@ rs6000_output_mi_thunk (FILE *file, tree
thunk_fndecl ATTRIBUTE_UNUSED,
HOST_WIDE_INT delta, HOST_WIDE_INT vcall_offset,
tree function)
{
- const char *fnname = IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (thunk_fndecl));
+ const char *fnname = get_fnname_from_decl (thunk_fndecl);
rtx this_rtx, funexp;
rtx_insn *insn;
@@ -21468,7 +21468,7 @@ rs6000_declare_alias (struct symtab_node *n, void *d)
putc ('\n', data->file);
}
fputs ("\t.globl ", data->file);
- RS6000_OUTPUT_BASENAME (data->file, buffer);
+ assemble_name (data->file, buffer);
putc ('\n', data->file);
}
#ifdef ASM_WEAKEN_DECL
@@ -21491,13 +21491,12 @@ rs6000_declare_alias (struct symtab_node *n, void *d)
putc ('\n', data->file);
}
fputs ("\t.lglobl ", data->file);
- RS6000_OUTPUT_BASENAME (data->file, buffer);
+ assemble_name (data->file, buffer);
putc ('\n', data->file);
}
if (data->function_descriptor)
- fputs (".", data->file);
- RS6000_OUTPUT_BASENAME (data->file, buffer);
- fputs (":\n", data->file);
+ putc ('.', data->file);
+ ASM_OUTPUT_LABEL (data->file, buffer);
return false;
}