espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-07-31 05:44:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

* dwarf2read.c (try_open_dwop_file): Work around behaviour of

Browse Source 
OPF_TRY_CWD_FIRST to not search path if the file contains a '/'.
This commit is contained in:
Doug Evans
2013-06-13 23:01:37 +00:00
parent cdd4989877
commit 9c02c12947
2 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/ChangeLog
View File

@ -1,3 +1,8 @@
2013-06-13 Doug Evans <dje@google.com>
* dwarf2read.c (try_open_dwop_file): Work around behaviour of
OPF_TRY_CWD_FIRST to not search path if the file contains a '/'.
2013-06-12 Phil Muldoon <pmuldoon@redhat.com> 2013-06-12 Phil Muldoon <pmuldoon@redhat.com>
* stack.c (backtrace_command_1): Fix indentation. * stack.c (backtrace_command_1): Fix indentation.

21
gdb/dwarf2read.c
View File

@ -9290,22 +9290,31 @@ try_open_dwop_file (const char *file_name, int is_dwp)
bfd *sym_bfd; bfd *sym_bfd;
int desc, flags; int desc, flags;
char *absolute_name; char *absolute_name;
/* Blech. OPF_TRY_CWD_FIRST also disables searching the path list if
FILE_NAME contains a '/'. So we can't use it. Instead prepend "."
to debug_file_directory. */
char *search_path;
static const char dirname_separator_string[] = { DIRNAME_SEPARATOR, '\0' };
flags = OPF_TRY_CWD_FIRST; if (*debug_file_directory != '\0')
search_path = concat (".", dirname_separator_string, debug_file_directory,
NULL);
else
search_path = xstrdup (".");
flags = 0;
if (is_dwp) if (is_dwp)
flags |= OPF_SEARCH_IN_PATH; flags |= OPF_SEARCH_IN_PATH;
desc = openp (debug_file_directory, flags, file_name, desc = openp (search_path, flags, file_name,
O_RDONLY | O_BINARY, &absolute_name); O_RDONLY | O_BINARY, &absolute_name);
xfree (search_path);
if (desc < 0) if (desc < 0)
return NULL; return NULL;
sym_bfd = gdb_bfd_open (absolute_name, gnutarget, desc); sym_bfd = gdb_bfd_open (absolute_name, gnutarget, desc);
if (!sym_bfd)
{
xfree (absolute_name); xfree (absolute_name);
if (sym_bfd == NULL)
return NULL; return NULL;
}
xfree (absolute_name);
bfd_set_cacheable (sym_bfd, 1); bfd_set_cacheable (sym_bfd, 1);
if (!bfd_check_format (sym_bfd, bfd_object)) if (!bfd_check_format (sym_bfd, bfd_object))