From 7bc000f4ab63febf36063308a62f1ddca19478f1 Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Sun, 3 Feb 2013 16:25:54 +0000 Subject: gdb/ * dwarf2read.c (file_file_name): New function with code from file_full_name. (file_full_name): Move most of the code to file_file_name. (macro_start_file): Rename variable full_name to file_name and use file_file_name for it. Add comp_dir parameter to new_macro_table. * macrocmd.c (show_pp_source_pos): New variable fullname. Replace any macro_source_file->filename access by macro_source_fullname call. * macroscope.c (_initialize_macroscope): Update the new_macro_table caller. * macrotab.c (struct macro_table): New field comp_dir. (macro_include): New variables link_fullname and source_fullname. Replace any macro_source_file->filename access by macro_source_fullname call. (macro_lookup_inclusion): Remove the partial filenames checking code. (check_for_redefinition): New variables source_fullname and found_key_fullname. Replace any macro_source_file->filename access by macro_source_fullname call. (macro_undef): New variables source_fullname and key_fullname. Replace any macro_source_file->filename access by macro_source_fullname call. (macro_lookup_definition): New variables retval and source_fullname. Replace any macro_source_file->filename access by macro_source_fullname call. (foreach_macro): New variable key_fullname. Replace any macro_source_file->filename access by macro_source_fullname call. (foreach_macro_in_scope): New variable datum_fullname. Replace any macro_source_file->filename access by macro_source_fullname call. (new_macro_table): Add parameter comp_dir. Initialize T with it. (macro_source_fullname): New function. * macrotab.h (struct macro_source_file): Extent the filename field comment. (new_macro_table): New parameter comp_dir, add a comment for it. (macro_source_fullname): new declaration. gdb/testsuite/ * gdb.linespec/base/one/header.h: New file. * gdb.linespec/base/two/header.h: New file. * gdb.linespec/macro-relative.c: New file. * gdb.linespec/macro-relative.exp: New file. --- gdb/macrocmd.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'gdb/macrocmd.c') diff --git a/gdb/macrocmd.c b/gdb/macrocmd.c index 9e4b0838901..250a1f0642b 100644 --- a/gdb/macrocmd.c +++ b/gdb/macrocmd.c @@ -129,13 +129,18 @@ show_pp_source_pos (struct ui_file *stream, struct macro_source_file *file, int line) { - fprintf_filtered (stream, "%s:%d\n", file->filename, line); + char *fullname; + + fullname = macro_source_fullname (file); + fprintf_filtered (stream, "%s:%d\n", fullname, line); + xfree (fullname); while (file->included_by) { - fprintf_filtered (gdb_stdout, " included at %s:%d\n", - file->included_by->filename, + fullname = macro_source_fullname (file->included_by); + fprintf_filtered (gdb_stdout, " included at %s:%d\n", fullname, file->included_at_line); + xfree (fullname); file = file->included_by; } } -- cgit v1.2.1