intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-24 00:20:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

[lldb] Fix build errors from 8b8070e23

Browse Source 
I missed windows and openbsd.
This commit is contained in:
Pavel Labath
2021-10-22 14:28:52 +02:00
parent e1db72703f
commit 43f8845dd3
2 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lldb/source/Host/openbsd/HostInfoOpenBSD.cpp
View File

@@ -29,20 +29,16 @@ llvm::VersionTuple HostInfoOpenBSD::GetOSVersion() {
return llvm::VersionTuple();
}
bool HostInfoOpenBSD::GetOSBuildString(std::string &s) {
llvm::Optional<std::string> HostInfoOpenBSD::GetOSBuildString() {
int mib[2] = {CTL_KERN, KERN_OSREV};
char osrev_str[12];
uint32_t osrev = 0;
size_t osrev_len = sizeof(osrev);
if (::sysctl(mib, 2, &osrev, &osrev_len, NULL, 0) == 0) {
::snprintf(osrev_str, sizeof(osrev_str), "%-8.8u", osrev);
s.assign(osrev_str);
return true;
}
if (::sysctl(mib, 2, &osrev, &osrev_len, NULL, 0) == 0)
return llvm::formatv("{0,8:8}", osrev).str();
s.clear();
return false;
return llvm::None;
}
bool HostInfoOpenBSD::GetOSKernelDescription(std::string &s) {

13
lldb/source/Host/windows/HostInfoWindows.cpp
View File

@@ -74,19 +74,18 @@ llvm::VersionTuple HostInfoWindows::GetOSVersion() {
info.wServicePackMajor);
}
bool HostInfoWindows::GetOSBuildString(std::string &s) {
s.clear();
llvm::Optional<std::string> HostInfoWindows::GetOSBuildString() {
llvm::VersionTuple version = GetOSVersion();
if (version.empty())
return false;
return llvm::None;
llvm::raw_string_ostream stream(s);
stream << "Windows NT " << version.getAsString();
return true;
return "Windows NT " + version.getAsString();
}
bool HostInfoWindows::GetOSKernelDescription(std::string &s) {
return GetOSBuildString(s);
llvm::Optional<std::string> build = GetOSBuildString();
s = build.getValueOr("");
return build.hasValue();
}
bool HostInfoWindows::GetHostname(std::string &s) {