echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'upstream-KWSys' into update-kwsys

Browse Source 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2024-05-06 (307037cf)
This commit is contained in:
Brad King 2024-05-06 09:27:52 -04:00
commit 8d29d3c79b
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/kwsys/SystemInformation.cxx
View File

@ -4646,7 +4646,7 @@ bool SystemInformationImplementation::ParseSysCtl()
err = sysctlbyname("hw.machine", &tempBuff, &len, nullptr, 0); err = sysctlbyname("hw.machine", &tempBuff, &len, nullptr, 0);
if (err == 0) { if (err == 0) {
std::string machineBuf(tempBuff); std::string machineBuf(tempBuff);
if (machineBuf.find_first_of("Power") != std::string::npos) { if (machineBuf.find("Power") != std::string::npos) {
this->ChipID.Vendor = "IBM"; this->ChipID.Vendor = "IBM";
err = kw_sysctlbyname_int32("hw.cputype", &tempInt32); err = kw_sysctlbyname_int32("hw.cputype", &tempInt32);
@ -4660,10 +4660,15 @@ bool SystemInformationImplementation::ParseSysCtl()
} }
this->FindManufacturer(); this->FindManufacturer();
} else if (machineBuf.find_first_of("arm64") != std::string::npos) { } else if (machineBuf.find("arm64") != std::string::npos) {
this->ChipID.Vendor = "Apple"; this->ChipID.Vendor = "Apple";
this->FindManufacturer(); this->FindManufacturer();
err = kw_sysctlbyname_int32("hw.optional.floatingpoint", &tempInt32);
if (err == 0) {
this->Features.HasFPU = static_cast<bool>(tempInt32);
}
} }
} }
} else { } else {