From fbf6506463a5de555a76cfcc153d56dc1cb9bf4b Mon Sep 17 00:00:00 2001 From: Ulrich Weigand Date: Wed, 17 Jun 2009 18:41:50 +0000 Subject: * buildsym.c (record_line): Remove call to gdbarch_addr_bits_remove. * coffread.c (coff_symtab_read): Call gdbarch_addr_bits_remove before calling record_line. (enter_linenos): Likewise. * dbxread.c (process_one_symbol): Likewise. * dwarf2read.c (dwarf_decode_lines): Likewise. * mdebugread.c (psymtab_to_symtab_1): Likewise. * xcoffread.c (enter_line_range): Likewise. --- gdb/dbxread.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'gdb/dbxread.c') diff --git a/gdb/dbxread.c b/gdb/dbxread.c index 33a2104..1d1aa2d 100644 --- a/gdb/dbxread.c +++ b/gdb/dbxread.c @@ -2790,7 +2790,11 @@ process_one_symbol (int type, int desc, CORE_ADDR valu, char *name, which may have an N_FUN stabs at the end of the function, but no N_SLINE stabs. */ if (sline_found_in_function) - record_line (current_subfile, 0, last_function_start + valu); + { + CORE_ADDR addr = last_function_start + valu; + record_line (current_subfile, 0, + gdbarch_addr_bits_remove (gdbarch, addr)); + } within_function = 0; new = pop_context (); @@ -3006,14 +3010,15 @@ no enclosing block")); if (within_function && sline_found_in_function == 0) { - if (processing_gcc_compilation == 2) - record_line (current_subfile, desc, last_function_start); - else - record_line (current_subfile, desc, valu); + CORE_ADDR addr = processing_gcc_compilation == 2 ? + last_function_start : valu; + record_line (current_subfile, desc, + gdbarch_addr_bits_remove (gdbarch, addr)); sline_found_in_function = 1; } else - record_line (current_subfile, desc, valu); + record_line (current_subfile, desc, + gdbarch_addr_bits_remove (gdbarch, valu)); break; case N_BCOMM: -- cgit v1.1