From: Ian Rickards <irickard@arm.com>
* dwarf2.c (concat_filename): If we can't establish the directory just return the filename.
This commit is contained in:
parent
ae66e5d720
commit
0dafd5f6a9
2 changed files with 12 additions and 2 deletions
|
@ -1,3 +1,8 @@
|
|||
2002-07-17 Ian Rickards <irickard@arm.com>
|
||||
|
||||
* dwarf2.c (concat_filename): If we can't establish the directory
|
||||
just return the filename.
|
||||
|
||||
2002-07-16 Moritz Jodeit <moritz@jodeit.org>
|
||||
|
||||
* peXXigen.c (_bfd_XXi_swap_aouthdr_out): Correct order of memset args.
|
||||
|
|
|
@ -856,13 +856,18 @@ concat_filename (table, file)
|
|||
filename = table->files[file - 1].name;
|
||||
if (IS_ABSOLUTE_PATH(filename))
|
||||
return filename;
|
||||
|
||||
else
|
||||
{
|
||||
char* dirname = (table->files[file - 1].dir
|
||||
? table->dirs[table->files[file - 1].dir - 1]
|
||||
: table->comp_dir);
|
||||
return (char*) concat (dirname, "/", filename, NULL);
|
||||
|
||||
/* Not all tools set DW_AT_comp_dir, so dirname may be unknown. The
|
||||
best we can do is return the filename part. */
|
||||
if (dirname == NULL)
|
||||
return filename;
|
||||
else
|
||||
return (char*) concat (dirname, "/", filename, NULL);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue