diff options
author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2022-08-16 20:19:21 +0200 |
---|---|---|
committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2022-08-18 16:06:46 +0200 |
commit | de3fcf4bea142fa376b043862ef2bde1db32098f (patch) | |
tree | b4ae35ca807276cc85dda826d8a3bf3e2f24e169 /desktop | |
parent | 64c60a67930ebf9a1b19b4396c9fea3c4c973e62 (diff) |
crashreport: __cpuid/__cpuidex are not available on arm64
…and from a quick glance similar features are not exposed to userland
applications on arm64:
https://docs.kernel.org/arm64/cpu-feature-registers.html
"The ARM architecture defines a set of feature registers, which describe
the capabilities of the CPU/system. Access to these system registers is
restricted from EL0 and there is no reliable way for an application to
extract this information to make better decisions at runtime.[…]"
Thus the CPU information would have to be gathered from the OS, probably
from the Windows registry, at least it should be possible to read the
name/model that way…
Change-Id: I39e3679a7c4c581d8e3e4f71842d7ea7cdc2ba67
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138380
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'desktop')
-rw-r--r-- | desktop/source/app/crashreport.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/desktop/source/app/crashreport.cxx b/desktop/source/app/crashreport.cxx index a14527c621e2..0458edf9793a 100644 --- a/desktop/source/app/crashreport.cxx +++ b/desktop/source/app/crashreport.cxx @@ -346,6 +346,7 @@ void CrashReporter::writeSystemInfo() #elif defined _WIN32 void CrashReporter::writeSystemInfo() { +#if !defined(_ARM64_) // Get CPU model name and flags. // See https://docs.microsoft.com/en-us/cpp/intrinsics/cpuid-cpuidex // and https://en.wikipedia.org/wiki/CPUID . @@ -456,6 +457,7 @@ void CrashReporter::writeSystemInfo() } if( !flags.isEmpty()) addKeyValue( "CPUFlags", flags.makeStringAndClear(), AddItem ); +#endif // Get total memory. MEMORYSTATUSEX memoryStatus; memoryStatus.dwLength = sizeof( memoryStatus ); |