[Lldb-commits] [lldb] r232904 - Reverted r232883 due to failing tests.

[Vince Harron]

Author: vharron
Date: Sun Mar 22 00:47:00 2015
New Revision: 232904

URL: http://llvm.org/viewvc/llvm-project?rev=232904&view=rev
Log:
Reverted r232883 due to failing tests.


Modified:
    lldb/trunk/include/lldb/Host/android/HostInfoAndroid.h
    lldb/trunk/include/lldb/Host/linux/HostInfoLinux.h
    lldb/trunk/source/Host/android/HostInfoAndroid.cpp
    lldb/trunk/source/Host/linux/HostInfoLinux.cpp

Modified: lldb/trunk/include/lldb/Host/android/HostInfoAndroid.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Host/android/HostInfoAndroid.h?rev=232904&r1=232903&r2=232904&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Host/android/HostInfoAndroid.h (original)
+++ lldb/trunk/include/lldb/Host/android/HostInfoAndroid.h Sun Mar 22 00:47:00 2015
@@ -25,6 +25,7 @@ class HostInfoAndroid : public HostInfoL
 
   protected:
     static void ComputeHostArchitectureSupport(ArchSpec &arch_32, ArchSpec &arch_64);
+    static bool ComputeSupportExeDirectory(FileSpec &file_spec);
 };
 
 } // end of namespace lldb_private

Modified: lldb/trunk/include/lldb/Host/linux/HostInfoLinux.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Host/linux/HostInfoLinux.h?rev=232904&r1=232903&r2=232904&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Host/linux/HostInfoLinux.h (original)
+++ lldb/trunk/include/lldb/Host/linux/HostInfoLinux.h Sun Mar 22 00:47:00 2015
@@ -40,7 +40,7 @@ class HostInfoLinux : public HostInfoPos
     static FileSpec GetProgramFileSpec();
 
   protected:
-    static bool ComputeSupportExeDirectory(FileSpec &file_spec);
+    static bool ComputeSharedLibraryDirectory(FileSpec &file_spec);
     static bool ComputeSystemPluginsDirectory(FileSpec &file_spec);
     static bool ComputeUserPluginsDirectory(FileSpec &file_spec);
     static void ComputeHostArchitectureSupport(ArchSpec &arch_32, ArchSpec &arch_64);

Modified: lldb/trunk/source/Host/android/HostInfoAndroid.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/android/HostInfoAndroid.cpp?rev=232904&r1=232903&r2=232904&view=diff
==============================================================================
--- lldb/trunk/source/Host/android/HostInfoAndroid.cpp (original)
+++ lldb/trunk/source/Host/android/HostInfoAndroid.cpp Sun Mar 22 00:47:00 2015
@@ -30,6 +30,13 @@ HostInfoAndroid::ComputeHostArchitecture
     }
 }
 
+bool
+HostInfoAndroid::ComputeSupportExeDirectory(FileSpec &file_spec)
+{
+    file_spec.GetDirectory() = HostInfoLinux::GetProgramFileSpec().GetDirectory();
+    return (bool)file_spec.GetDirectory();
+}
+
 FileSpec
 HostInfoAndroid::GetDefaultShell()
 {

Modified: lldb/trunk/source/Host/linux/HostInfoLinux.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/linux/HostInfoLinux.cpp?rev=232904&r1=232903&r2=232904&view=diff
==============================================================================
--- lldb/trunk/source/Host/linux/HostInfoLinux.cpp (original)
+++ lldb/trunk/source/Host/linux/HostInfoLinux.cpp Sun Mar 22 00:47:00 2015
@@ -222,10 +222,12 @@ HostInfoLinux::GetProgramFileSpec()
 }
 
 bool
-HostInfoLinux::ComputeSupportExeDirectory(FileSpec &file_spec)
+HostInfoLinux::ComputeSharedLibraryDirectory(FileSpec &file_spec)
 {
+    if (HostInfoPosix::ComputeSharedLibraryDirectory(file_spec))
+        return true;
     file_spec.GetDirectory() = GetProgramFileSpec().GetDirectory();
-    return static_cast<bool>(file_spec.GetDirectory());
+    return (bool)file_spec.GetDirectory();
 }
 
 bool