Explorar o código

Unconditionally disable the x86 syscall prologs / epilogs on GCC, since the assembler error related to cfi instructions could also happen on newer versions.

Lasse Öörni %!s(int64=9) %!d(string=hai) anos
pai
achega
da8a39cf5a
Modificáronse 1 ficheiros con 4 adicións e 2 borrados
  1. 4 2
      Source/ThirdParty/AngelScript/source/as_callfunc_x86.cpp

+ 4 - 2
Source/ThirdParty/AngelScript/source/as_callfunc_x86.cpp

@@ -51,8 +51,10 @@
 #include "as_tokendef.h"
 #include "as_context.h"
 
-// Urho3D: work around Clang crash and error on old GCC
-#if defined(__clang__) || (__GNUC__ == 4 && __GNUC_MINOR__ < 7) || __GNUC__ < 4
+// Urho3D: work around Clang crash and assembler error on GCC
+// Because Urho3D's AngelScript API convention forbids C++ exceptions leaking to syscalls,
+// the lack of prologs / epilogs should not be critical
+#if defined(__clang__) || defined(__GNUC__)
 #undef __OPTIMIZE__
 #endif