summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/ChangeLog3
-rw-r--r--gdb/dwarf2read.c5
2 files changed, 5 insertions, 3 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 29ab6250a85..9aaeedf3837 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,8 @@
2013-06-20 Doug Evans <dje@google.com>
+ * dwarf2read.c (struct dwp_file): Fix comment.
+ (open_and_init_dwp_file): Set dwp_file->name to bfd's file name.
+
* source.c (openp): Document OPF_TRY_CWD_FIRST+OPF_SEARCH_IN_PATH
better.
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 555698a0800..32d33f02cc4 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -813,7 +813,7 @@ struct dwp_file
/* Name of the file. */
const char *name;
- /* The bfd, when the file is open. Otherwise this is NULL. */
+ /* The bfd. */
bfd *dbfd;
/* Section info for this file. */
@@ -9596,8 +9596,7 @@ open_and_init_dwp_file (void)
return NULL;
}
dwp_file = OBSTACK_ZALLOC (&objfile->objfile_obstack, struct dwp_file);
- dwp_file->name = obstack_copy0 (&objfile->objfile_obstack,
- dwp_name, strlen (dwp_name));
+ dwp_file->name = bfd_get_filename (dbfd);
dwp_file->dbfd = dbfd;
do_cleanups (cleanups);