From patchwork Mon Jan 28 20:47:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Baldwin X-Patchwork-Id: 31231 Received: (qmail 6062 invoked by alias); 28 Jan 2019 20:47:17 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 6045 invoked by uid 89); 28 Jan 2019 20:47:17 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.2 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_HELO_PASS, SPF_SOFTFAIL autolearn=ham version=3.3.2 spammy=searched, HContent-Transfer-Encoding:8bit X-HELO: mail.baldwin.cx Received: from bigwig.baldwin.cx (HELO mail.baldwin.cx) (96.47.65.170) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 28 Jan 2019 20:47:15 +0000 Received: from ralph.baldwin.cx (ralph.baldwin.cx [66.234.199.215]) by mail.baldwin.cx (Postfix) with ESMTPSA id 696E810B4CE for ; Mon, 28 Jan 2019 15:47:13 -0500 (EST) From: John Baldwin To: gdb-patches@sourceware.org Subject: [PATCH v2 1/4] Look for separate debug files in debug directories under a sysroot. Date: Mon, 28 Jan 2019 12:47:02 -0800 Message-Id: <29e9742d6a77273f0bc103496d44066ca9b06d2f.1548707934.git.jhb@FreeBSD.org> In-Reply-To: References: MIME-Version: 1.0 X-IsSubscribed: yes When an object file is present in a system root, GDB currently looks for separate debug files under the global debugfile directories. For example, if the sysroot is set to "/myroot" and hte global debugfile directory is set to "/usr/lib/debug", GDB will look for a separate debug file for "/myroot/lib/libc.so.7" in the following paths: /myroot/lib/libc.so.7.debug /myroot/lib/.debug/libc.so.7.debug /usr/lib/debug//myroot/lib/libc.so.7.debug /usr/lib/debug/lib/libc.so.7.debug However, some system roots include a full system installation including a nested global debugfile directory under the sysroot. This patch adds an additional check to support such systems. In the example above the additional path searched is: /myroot/usr/lib/debug/lib/libc.so.7.debug To try to preserve existing behavior as much as possible, this new path is searched last for each global debugfile directory. gdb/ChangeLog: * symfile.c (find_separate_debug_file): Look for separate debug files in debug directories under the sysroot. --- gdb/ChangeLog | 5 +++++ gdb/symfile.c | 17 +++++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 5d5f72b817..38d740e440 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2019-01-28 John Baldwin + + * symfile.c (find_separate_debug_file): Look for separate debug + files in debug directories under the sysroot. + 2019-01-28 John Baldwin * aarch64-fbsd-tdep.c (aarch64_fbsd_gregmap) diff --git a/gdb/symfile.c b/gdb/symfile.c index e5ff38462c..b5802e20ad 100644 --- a/gdb/symfile.c +++ b/gdb/symfile.c @@ -1452,22 +1452,35 @@ 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)); debugfile += "/"; debugfile += debuglink; + 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 ();