-@@ -51,7 +52,11 @@
- #define _commode (* __MINGW_IMP_SYMBOL(_commode))
- extern int _dowildcard;
-
-+#if defined(__GNUC__)
- int _MINGW_INSTALL_DEBUG_MATHERR __attribute__((weak)) = 0;
-+#else
-+int _MINGW_INSTALL_DEBUG_MATHERR = 0;
-+#endif
- extern int __defaultmatherr;
- extern _CRTIMP void __cdecl _initterm(_PVFV *, _PVFV *);
-
-Index: gs_support.c
-===================================================================
---- gs_support.c (Revision 43956)
-+++ gs_support.c (Arbeitskopie)
-@@ -112,6 +112,7 @@
- else
- #endif
- {
-+#ifdef __GNUC__
- #ifdef _WIN64
- GS_ContextRecord.Rip = (ULONGLONG) __builtin_return_address (0);
- GS_ContextRecord.Rsp = (ULONGLONG) __builtin_frame_address (0) + 8;
-@@ -119,6 +120,15 @@
- GS_ContextRecord.Eip = (DWORD) __builtin_return_address (0);
- GS_ContextRecord.Esp = (DWORD) __builtin_frame_address (0) + 4;
- #endif
-+#else
-+#ifdef _WIN64
-+ GS_ContextRecord.Rip = (ULONGLONG) _ReturnAddress();
-+ GS_ContextRecord.Rsp = (ULONGLONG) _AddressOfReturnAddress();
-+#else
-+ GS_ContextRecord.Eip = (DWORD) _ReturnAddress();
-+ GS_ContextRecord.Esp = (DWORD) _AddressOfReturnAddress();
-+#endif
-+#endif
- }
-
- #ifdef _WIN64