[Libreoffice-commits] core.git: Branch 'feature/fixes14' - include/tools

[Tor Lillqvist]

 include/tools/cpuid.hxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6760edb2482d562a657381cbf8e7ea7314e2f5df
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Feb 2 16:36:10 2016 +0200

    Test for SSE2 at run-time on Windows
    
    To run on ancient CPUs, we compile for Windows with -arch:SSE since
    8bd6bf93b7711a7ac7c5cbd7c3bb980481570ebd (August 2014). Thus
    _M_IX86_FP gets defined as 1. This meant that LO_SSE2_AVAILABLE did
    not get defined, and that we hardcoded tools::cpuid::hasSSE2() as
    always returning false. That was hardly the intent.
    
    Change-Id: I7ee34510a774dab865c8990b74b91a5284218a96
    (cherry picked from commit 4f68c279e4d81cd44ab14bcaf6da7d596a741971)

diff --git a/include/tools/cpuid.hxx b/include/tools/cpuid.hxx
index f058f23..d7aa07d 100644
--- a/include/tools/cpuid.hxx
+++ b/include/tools/cpuid.hxx
@@ -16,7 +16,7 @@
 
 #if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) && defined(__SSE2__)
 #define LO_SSE2_AVAILABLE 1
-#elif defined(_MSC_VER) && (defined(_M_AMD64) || (defined(_M_IX86) && defined(_M_IX86_FP) && _M_IX86_FP >= 2))
+#elif defined(_MSC_VER)
 #define LO_SSE2_AVAILABLE 1
 #endif