From 94afca11a0b4f604494489f9ff5acd7f41d26f79 Mon Sep 17 00:00:00 2001
From: kgv <kgv@opencascade.com>
Date: Tue, 23 Aug 2016 15:00:50 +0300
Subject: [PATCH] 0027801: Configuration - fix compilation of Standard.cxx when
 using MinGW-W64

---
 src/OSD/OSD_signal.cxx    | 26 ++++++--------------------
 src/Standard/Standard.cxx |  6 +++---
 2 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/src/OSD/OSD_signal.cxx b/src/OSD/OSD_signal.cxx
index 31e407ee3d..3c57948155 100644
--- a/src/OSD/OSD_signal.cxx
+++ b/src/OSD/OSD_signal.cxx
@@ -60,10 +60,11 @@
 #include <signal.h>
 #include <float.h>
 
+static Standard_Boolean fCtrlBrk;
+#if !defined(__CYGWIN32__) && !defined(__MINGW32__)
 static Standard_Boolean fMsgBox;
 static Standard_Boolean fFltExceptions;
 static Standard_Boolean fDbgLoaded;
-static Standard_Boolean fCtrlBrk;
 
 // used to forbid simultaneous execution of setting / executing handlers
 static Standard_Mutex THE_SIGNAL_MUTEX;
@@ -84,9 +85,6 @@ static LONG CallHandler (DWORD dwExceptionCode,
                          ptrdiff_t ExceptionInformation1,
                          ptrdiff_t ExceptionInformation0)
 {
-
-#if !defined(__CYGWIN32__) && !defined(__MINGW32__)
-
   Standard_Mutex::Sentry aSentry (THE_SIGNAL_MUTEX); // lock the mutex to prevent simultaneous handling
   static char          buffer[ 2048 ];
   int                  flterr = 0;
@@ -240,9 +238,6 @@ static LONG CallHandler (DWORD dwExceptionCode,
 //     cout << "OSD::WntHandler _controlfp( 0, _OSD_FPX ) " << hex << _controlfp(0,0) << dec << endl ;
   }
   return _osd_raise ( dwExceptionCode, buffer );
-#else
-  return 0;
-#endif
 }
 
 //=======================================================================
@@ -253,7 +248,6 @@ static LONG CallHandler (DWORD dwExceptionCode,
 //=======================================================================
 static void SIGWntHandler (int signum, int sub_code)
 {
-#if !defined(__CYGWIN32__) && !defined(__MINGW32__)
   Standard_Mutex::Sentry aSentry (THE_SIGNAL_MUTEX); // lock the mutex to prevent simultaneous handling
   switch( signum ) {
     case SIGFPE :
@@ -299,8 +293,8 @@ static void SIGWntHandler (int signum, int sub_code)
       break ;
   }
   DebugBreak ();
-#endif
 }
+#endif
 
 //=======================================================================
 //function : TranslateSE
@@ -333,6 +327,7 @@ static void TranslateSE( unsigned int theCode, EXCEPTION_POINTERS* theExcPtr )
 //           option and unless user sets his own exception handler with
 //           ::SetUnhandledExceptionFilter().
 //=======================================================================
+#if !defined(__CYGWIN32__) && !defined(__MINGW32__)
 static LONG WINAPI WntHandler (EXCEPTION_POINTERS *lpXP)
 {
   DWORD               dwExceptionCode = lpXP->ExceptionRecord->ExceptionCode;
@@ -341,6 +336,7 @@ static LONG WINAPI WntHandler (EXCEPTION_POINTERS *lpXP)
                       lpXP->ExceptionRecord->ExceptionInformation[1],
                       lpXP->ExceptionRecord->ExceptionInformation[0]);
 }
+#endif
 
 //=======================================================================
 //function : SetSignal
@@ -409,6 +405,7 @@ void OSD::ControlBreak () {
   }
 }  // end OSD :: ControlBreak
 
+#if !defined(__MINGW32__) && !defined(__CYGWIN32__)
 //============================================================================
 //==== _osd_ctrl_break_handler
 //============================================================================
@@ -490,12 +487,6 @@ static LONG __fastcall _osd_raise ( DWORD dwCode, LPSTR msg )
 //============================================================================
 //==== _osd_debug
 //============================================================================
-#if defined(__CYGWIN32__) || defined(__MINGW32__)
-#define __try
-#define __finally
-#define __leave return 0
-#endif
-
 LONG _osd_debug ( void ) {
 
   LONG action ;
@@ -578,11 +569,6 @@ LONG _osd_debug ( void ) {
   return action ;
 
 }  // end _osd_debug
-
-#if defined(__CYGWIN32__) || defined(__MINGW32__)
-#undef __try
-#undef __finally
-#undef __leave
 #endif
 
 #else
diff --git a/src/Standard/Standard.cxx b/src/Standard/Standard.cxx
index bfc3280715..cf2ee42b40 100644
--- a/src/Standard/Standard.cxx
+++ b/src/Standard/Standard.cxx
@@ -30,7 +30,7 @@
 
 #if defined(_MSC_VER) || defined(__ANDROID__) || defined(__QNX__)
   #include <malloc.h>
-#elif (defined(__GNUC__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 1 && defined(__i386))
+#elif (defined(__GNUC__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 1 && (defined(__i386) || defined(__x86_64)))
   #include <mm_malloc.h>
 #else
   extern "C" int posix_memalign (void** thePtr, size_t theAlign, size_t theSize);
@@ -274,7 +274,7 @@ Standard_Address Standard::AllocateAligned (const Standard_Size theSize,
   return _aligned_malloc (theSize, theAlign);
 #elif defined(__ANDROID__) || defined(__QNX__)
   return memalign (theAlign, theSize);
-#elif (defined(__GNUC__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 1 && defined(__i386))
+#elif (defined(__GNUC__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 1 && (defined(__i386) || defined(__x86_64)))
   return _mm_malloc (theSize, theAlign);
 #else
   void* aPtr;
@@ -297,7 +297,7 @@ void Standard::FreeAligned (Standard_Address thePtrAligned)
   _aligned_free (thePtrAligned);
 #elif defined(__ANDROID__) || defined(__QNX__)
   free (thePtrAligned);
-#elif (defined(__GNUC__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 1 && defined(__i386))
+#elif (defined(__GNUC__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 1 && (defined(__i386) || defined(__x86_64)))
   _mm_free (thePtrAligned);
 #else
   free (thePtrAligned);