From f62318e98d84e79e457920c74515fb73bb013b23 Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Tue, 12 Feb 2019 13:56:16 -0800 Subject: [PATCH] Try to use the canonical version of a sysroot for debug file links. Object file paths passed to find_separate_debug_file are always canonical paths with symbolic links resolved. If a sysroot path traverses a symbolic link, it will not match the object file paths. Generate a canonical version of the sysroot directory. If it is valid, use it instead of gdb_sysroot with child_path to determine if an object file is under a system root. gdb/ChangeLog: * symfile.c (find_separate_debug_file): Use canonical path of sysroot with child_path instead of gdb_sysroot if it is valid. --- gdb/ChangeLog | 5 +++++ gdb/symfile.c | 13 ++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index de88a21..191863e 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2019-02-12 John Baldwin + * symfile.c (find_separate_debug_file): Use canonical path of + sysroot with child_path instead of gdb_sysroot if it is valid. + +2019-02-12 John Baldwin + * symfile.c (find_separate_debug_file): Use child_path to determine if an object file is under a sysroot. diff --git a/gdb/symfile.c b/gdb/symfile.c index ffcba1a..6148382 100644 --- a/gdb/symfile.c +++ b/gdb/symfile.c @@ -1441,6 +1441,7 @@ find_separate_debug_file (const char *dir, const char *dir_notarget = target_prefix ? dir + strlen ("target:") : dir; std::vector> debugdir_vec = dirnames_to_char_ptr_vec (debug_file_directory); + gdb::unique_xmalloc_ptr canon_sysroot = gdb_realpath (gdb_sysroot); for (const gdb::unique_xmalloc_ptr &debugdir : debugdir_vec) { @@ -1453,9 +1454,15 @@ find_separate_debug_file (const char *dir, if (separate_debug_file_exists (debugfile, crc32, objfile)) return debugfile; - const char *base_path; - if (canon_dir != NULL - && (base_path = child_path (gdb_sysroot, canon_dir)) != NULL) + const char *base_path = NULL; + if (canon_dir != NULL) + { + if (canon_sysroot.get () != NULL) + base_path = child_path (canon_sysroot.get (), canon_dir); + else + base_path = child_path (gdb_sysroot, canon_dir); + } + if (base_path != NULL) { /* If the file is in the sysroot, try using its base path in the global debugfile directory. */ -- 2.7.4