diff options
| author | Vince Harron <vince@nethacker.com> | 2015-03-22 05:47:00 +0000 |
|---|---|---|
| committer | Vince Harron <vince@nethacker.com> | 2015-03-22 05:47:00 +0000 |
| commit | 62fa2732b96517c79c00feb9d5f0f544e62d43be (patch) | |
| tree | 54d2c698de674569271dc199b00f600f445daaa5 | |
| parent | d6aa0ec737785d9b14f9dd9bb6d101892155f8c2 (diff) | |
| download | bcm5719-llvm-62fa2732b96517c79c00feb9d5f0f544e62d43be.tar.gz bcm5719-llvm-62fa2732b96517c79c00feb9d5f0f544e62d43be.zip | |
Reverted r232883 due to failing tests.
llvm-svn: 232904
| -rw-r--r-- | lldb/include/lldb/Host/android/HostInfoAndroid.h | 1 | ||||
| -rw-r--r-- | lldb/include/lldb/Host/linux/HostInfoLinux.h | 2 | ||||
| -rw-r--r-- | lldb/source/Host/android/HostInfoAndroid.cpp | 7 | ||||
| -rw-r--r-- | lldb/source/Host/linux/HostInfoLinux.cpp | 6 |
4 files changed, 13 insertions, 3 deletions
diff --git a/lldb/include/lldb/Host/android/HostInfoAndroid.h b/lldb/include/lldb/Host/android/HostInfoAndroid.h index 4132116f449..ed9d3ee2713 100644 --- a/lldb/include/lldb/Host/android/HostInfoAndroid.h +++ b/lldb/include/lldb/Host/android/HostInfoAndroid.h @@ -25,6 +25,7 @@ class HostInfoAndroid : public HostInfoLinux protected: static void ComputeHostArchitectureSupport(ArchSpec &arch_32, ArchSpec &arch_64); + static bool ComputeSupportExeDirectory(FileSpec &file_spec); }; } // end of namespace lldb_private diff --git a/lldb/include/lldb/Host/linux/HostInfoLinux.h b/lldb/include/lldb/Host/linux/HostInfoLinux.h index e4b22075325..4596b33be96 100644 --- a/lldb/include/lldb/Host/linux/HostInfoLinux.h +++ b/lldb/include/lldb/Host/linux/HostInfoLinux.h @@ -40,7 +40,7 @@ class HostInfoLinux : public HostInfoPosix 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); diff --git a/lldb/source/Host/android/HostInfoAndroid.cpp b/lldb/source/Host/android/HostInfoAndroid.cpp index f44b6c65792..b819f92e95f 100644 --- a/lldb/source/Host/android/HostInfoAndroid.cpp +++ b/lldb/source/Host/android/HostInfoAndroid.cpp @@ -30,6 +30,13 @@ HostInfoAndroid::ComputeHostArchitectureSupport(ArchSpec &arch_32, ArchSpec &arc } } +bool +HostInfoAndroid::ComputeSupportExeDirectory(FileSpec &file_spec) +{ + file_spec.GetDirectory() = HostInfoLinux::GetProgramFileSpec().GetDirectory(); + return (bool)file_spec.GetDirectory(); +} + FileSpec HostInfoAndroid::GetDefaultShell() { diff --git a/lldb/source/Host/linux/HostInfoLinux.cpp b/lldb/source/Host/linux/HostInfoLinux.cpp index d5f88fe7fce..3c192dce8f0 100644 --- a/lldb/source/Host/linux/HostInfoLinux.cpp +++ b/lldb/source/Host/linux/HostInfoLinux.cpp @@ -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 |
