svn commit: r258094 - head/contrib/llvm/tools/lldb/source/Host/common

[Ed Maste]

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)