[Libreoffice-commits] core.git: include/osl tools/source

[Jan-Marek Glogowski (via logerrit)]

 include/osl/endian.h        |    2 +-
 tools/source/misc/cpuid.cxx |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 8babcdb9c995b6c0e20a16e237f5e9cadd1f83ce
Author:     Jan-Marek Glogowski <glogow at fbihome.de>
AuthorDate: Fri Jul 17 22:26:12 2020 +0200
Commit:     Jan-Marek Glogowski <glogow at fbihome.de>
CommitDate: Thu Sep 17 06:38:23 2020 +0200

    osl+tools: fix Windows Arm64 build
    
    Change-Id: I17cbc1c8474880024921f476aa602d61978da868
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102851
    Tested-by: Jenkins
    Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>

diff --git a/include/osl/endian.h b/include/osl/endian.h
index 43d0162b55df..766178a7eefc 100644
--- a/include/osl/endian.h
+++ b/include/osl/endian.h
@@ -31,7 +31,7 @@ extern "C" {
 
 #if defined _WIN32
 #   if defined _M_ALPHA || defined _M_AMD64 || defined _M_IX86 \
-            || defined _M_MRX000 || defined _M_PPC
+            || defined _M_MRX000 || defined _M_PPC || defined _M_ARM64
 #       define OSL_LITENDIAN
 #   endif
 #elif defined ANDROID || defined LINUX || defined HAIKU
diff --git a/tools/source/misc/cpuid.cxx b/tools/source/misc/cpuid.cxx
index 41791be27897..e2a8e20a762a 100644
--- a/tools/source/misc/cpuid.cxx
+++ b/tools/source/misc/cpuid.cxx
@@ -15,7 +15,7 @@ namespace cpuid {
 
 namespace {
 
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_AMD64))
 #include <intrin.h>
 void getCpuId(uint32_t array[4], uint32_t nInfoType)
 {
@@ -38,7 +38,7 @@ void getCpuId(uint32_t array[4], uint32_t /*nInfoType*/)
 bool checkAVXSupportInOS()
 {
     uint32_t xcr0 = 0;
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_AMD64))
     xcr0 = uint32_t(_xgetbv(0));
 #elif (defined(__i386__) || defined(__x86_64__))
     __asm__("xgetbv" : "=a" (xcr0) : "c" (0) : "%edx");