Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

gdb/

Browse Source 
Make auto-load handle multiple components of DEBUG_FILE_DIRECTORY.
	* auto-load.c (auto_load_objfile_script): Remove check for NULL
	DEBUG_FILE_DIRECTORY.  Handle multiple components of
	DEBUG_FILE_DIRECTORY.
This commit is contained in:
Jan Kratochvil
2012-05-11 18:06:28 +00:00
parent e04d7088af
commit b09aca3aa7
2 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
gdb/auto-load.c
View File

@@ -587,17 +587,29 @@ auto_load_objfile_script (struct objfile *objfile,
input = fopen (filename, "r");
debugfile = filename;
if (!input && debug_file_directory)
if (!input)
{
/* Also try the same file in the separate debug info directory. */
debugfile = xmalloc (strlen (filename)
+ strlen (debug_file_directory) + 1);
strcpy (debugfile, debug_file_directory);
/* FILENAME is absolute, so we don't need a "/" here. */
strcat (debugfile, filename);
char *debugdir;
VEC (char_ptr) *debugdir_vec;
int ix;
make_cleanup (xfree, debugfile);
input = fopen (debugfile, "r");
debugdir_vec = dirnames_to_char_ptr_vec (debug_file_directory);
make_cleanup_free_char_ptr_vec (debugdir_vec);
for (ix = 0; VEC_iterate (char_ptr, debugdir_vec, ix, debugdir); ++ix)
{
/* Also try the same file in the separate debug info directory. */
debugfile = xmalloc (strlen (debugdir) + strlen (filename) + 1);
strcpy (debugfile, debugdir);
/* FILENAME is absolute, so we don't need a "/" here. */
strcat (debugfile, filename);
make_cleanup (xfree, debugfile);
input = fopen (debugfile, "r");
if (input != NULL)
break;
}
}
if (!input && gdb_datadir)