diff options
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/symfile.c | 17 |
2 files changed, 20 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 194ae465769..e4f74cdc3e8 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2019-02-12 John Baldwin <jhb@FreeBSD.org> + + * symfile.c (find_separate_debug_file): Look for separate debug + files in debug directories under the sysroot. + 2019-02-12 Philippe Waroquiers <philippe.waroquiers@skynet.be> * symtab.h (struct minimal_symbol data_p): New const method. diff --git a/gdb/symfile.c b/gdb/symfile.c index e5ff38462c5..b5802e20adc 100644 --- a/gdb/symfile.c +++ b/gdb/symfile.c @@ -1452,13 +1452,13 @@ find_separate_debug_file (const char *dir, if (separate_debug_file_exists (debugfile, crc32, objfile)) return debugfile; - /* If the file is in the sysroot, try using its base path in the - global debugfile directory. */ if (canon_dir != NULL && filename_ncmp (canon_dir, gdb_sysroot, strlen (gdb_sysroot)) == 0 && IS_DIR_SEPARATOR (canon_dir[strlen (gdb_sysroot)])) { + /* If the file is in the sysroot, try using its base path in + the global debugfile directory. */ debugfile = target_prefix ? "target:" : ""; debugfile += debugdir.get (); debugfile += (canon_dir + strlen (gdb_sysroot)); @@ -1467,7 +1467,20 @@ find_separate_debug_file (const char *dir, if (separate_debug_file_exists (debugfile, crc32, objfile)) return debugfile; + + /* If the file is in the sysroot, try using its base path in + the sysroot's global debugfile directory. */ + debugfile = target_prefix ? "target:" : ""; + debugfile += gdb_sysroot; + debugfile += debugdir.get (); + debugfile += (canon_dir + strlen (gdb_sysroot)); + debugfile += "/"; + debugfile += debuglink; + + if (separate_debug_file_exists (debugfile, crc32, objfile)) + return debugfile; } + } return std::string (); |