Merge from 5.1

f6d0cf91 · unknown · 69931b14 · 036937cc · f6d0cf91
Commit f6d0cf91 authored Sep 27, 2012 by unknown
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

extra/yassl/taocrypt/include/misc.hpp extra/yassl/taocrypt/include/misc.hpp +6 -2

No files found.
--- a/extra/yassl/taocrypt/include/misc.hpp
+++ b/extra/yassl/taocrypt/include/misc.hpp
@@ -136,9 +136,13 @@ void CleanUp();
 // Turn on ia32 ASM for Big Integer
 // CodeWarrior defines _MSC_VER
+//
+// Do not use assembler with GCC, as the implementation for it is broken;
+// it does not use proper GCC asm contraints and makes assumptions about
+// frame pointers and so on, which breaks depending on GCC version and
+// optimization level.
 #if !defined(TAOCRYPT_DISABLE_X86ASM) && ((defined(_MSC_VER) && \
-   !defined(__MWERKS__) && defined(_M_IX86)) || \
+   !defined(__MWERKS__) && defined(_M_IX86)))
-   (defined(__GNUC__) && defined(__i386__)))
    #define TAOCRYPT_X86ASM_AVAILABLE
 #endif