From 247ecf1b16d657186aab426a46312058054bd19d Mon Sep 17 00:00:00 2001
From: kgv <kgv@opencascade.com>
Date: Thu, 2 Apr 2020 15:38:46 +0300
Subject: [PATCH] 0031483: Configuration - __asm keyword not supported on ARM
 within Windows target

_M_IX86 is now checked before using _asm fot TBB workaround.
---
 src/Standard/Standard.cxx | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Standard/Standard.cxx b/src/Standard/Standard.cxx
index 6d300adb62..a188ff11f6 100644
--- a/src/Standard/Standard.cxx
+++ b/src/Standard/Standard.cxx
@@ -101,14 +101,14 @@ Standard_MMgrFactory::Standard_MMgrFactory()
   aVar = getenv ("MMGT_OPT");
   Standard_Integer anAllocId   = (aVar ?  atoi (aVar): OCCT_MMGT_OPT_DEFAULT);
 
-#if defined(_WIN32) && !defined(_WIN64) && !defined(__MINGW32__)
-  static const DWORD _SSE2_FEATURE_BIT(0x04000000);
-  if ( anAllocId == 2 )
+#if defined(HAVE_TBB) && defined(_M_IX86)
+  if (anAllocId == 2)
   {
-    // CR25396: Check if SSE2 instructions are supported, if not then use MMgrRaw
-    // instead of MMgrTBBalloc. It is to avoid runtime crash when running on a 
-    // CPU that supports SSE but does not support SSE2 (some modifications of
-    // AMD Sempron).
+    // CR25396: Check if SSE2 instructions are supported on 32-bit x86 processor on Windows platform,
+    // if not then use MMgrRaw instead of MMgrTBBalloc.
+    // It is to avoid runtime crash when running on a CPU
+    // that supports SSE but does not support SSE2 (some modifications of AMD Sempron).
+    static const DWORD _SSE2_FEATURE_BIT(0x04000000);
     DWORD volatile dwFeature;
     _asm
     {