From owner-svn-src-all@FreeBSD.ORG Wed Nov 13 14:46:42 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7079DBC3; Wed, 13 Nov 2013 14:46:42 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 45DE326BF; Wed, 13 Nov 2013 14:46:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rADEkg0d066066; Wed, 13 Nov 2013 14:46:42 GMT (envelope-from emaste@svn.freebsd.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rADEkgCN066065; Wed, 13 Nov 2013 14:46:42 GMT (envelope-from emaste@svn.freebsd.org) Message-Id: <201311131446.rADEkgCN066065@svn.freebsd.org> From: Ed Maste Date: Wed, 13 Nov 2013 14:46:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r258094 - head/contrib/llvm/tools/lldb/source/Host/common X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Nov 2013 14:46:42 -0000 Author: emaste Date: Wed Nov 13 14:46:41 2013 New Revision: 258094 URL: http://svnweb.freebsd.org/changeset/base/258094 Log: lldb: Correct a standalone debug file path For a file /bin/ls with a .gnu_debuglink entry of "ls.debug" the path should be /usr/lib/debug/bin/ls.debug, not /usr/lib/debug/bin/ls. ref: https://sourceware.org/gdb/onlinedocs/gdb/Separate-Debug-Files.html Upstream defect pr17903 (http://llvm.org/pr17903) Sponsored by: DARPA, AFRL Modified: head/contrib/llvm/tools/lldb/source/Host/common/Symbols.cpp Modified: head/contrib/llvm/tools/lldb/source/Host/common/Symbols.cpp ============================================================================== --- head/contrib/llvm/tools/lldb/source/Host/common/Symbols.cpp Wed Nov 13 14:35:00 2013 (r258093) +++ head/contrib/llvm/tools/lldb/source/Host/common/Symbols.cpp Wed Nov 13 14:46:41 2013 (r258094) @@ -61,9 +61,9 @@ Symbols::LocateExecutableSymbolFile (con uuid_str = uuid_str + ".debug"; } - // Get full path to our module. Needed to check debug files like this: - // /usr/lib/debug/usr/lib/libboost_date_time.so.1.46.1 - std::string module_filename = module_spec.GetFileSpec().GetPath(); + // Get directory of our module. Needed to check debug files like this: + // /usr/lib/debug/usr/lib/library.so.debug + std::string module_directory = module_spec.GetFileSpec().GetDirectory().AsCString(); size_t num_directories = debug_file_search_paths.GetSize(); for (size_t idx = 0; idx < num_directories; ++idx) @@ -79,7 +79,7 @@ Symbols::LocateExecutableSymbolFile (con files.push_back (dirname + "/" + symbol_filename); files.push_back (dirname + "/.debug/" + symbol_filename); files.push_back (dirname + "/.build-id/" + uuid_str); - files.push_back (dirname + module_filename); + files.push_back (dirname + module_directory + "/" + symbol_filename); const uint32_t num_files = files.size(); for (size_t idx_file = 0; idx_file < num_files; ++idx_file)