replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Reverted r232883 due to failing tests. 

llvm-svn: 232904
This commit is contained in:
Vince Harron 2015-03-22 05:47:00 +00:00
parent d6aa0ec737
commit 62fa2732b9
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lldb/include/lldb/Host/android/HostInfoAndroid.h
View File

@ -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

2
lldb/include/lldb/Host/linux/HostInfoLinux.h
View File

@ -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);

7
lldb/source/Host/android/HostInfoAndroid.cpp
View File

@ -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()
{

6
lldb/source/Host/linux/HostInfoLinux.cpp
View File

@ -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