summaryrefslogtreecommitdiff
path: root/extra/yassl
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.(none)>2005-09-01 14:07:45 +0200
committerunknown <msvensson@neptunus.(none)>2005-09-01 14:07:45 +0200
commite4cfbaed518f98b2ee3f5a9e0a4edef485240221 (patch)
treec355f0df41c7985515415a20f2bd5fc025868090 /extra/yassl
parentef5cafdf6dc42051a3eb51851fe969f4507a92ab (diff)
downloadmariadb-git-e4cfbaed518f98b2ee3f5a9e0a4edef485240221.tar.gz
Bug #12717 yassl: Crashes in "integer.cpp" when compiled with icc
- Temporary fix, disable x86 assembler. BUILD/compile-pentium-icc: Cleanup build script for icc extra/yassl/taocrypt/include/misc.hpp: Disable x86 assembler when compiling with icc BUILD/compile-pentium-icc-yassl: New BitKeeper file ``BUILD/compile-pentium-icc-yassl''
Diffstat (limited to 'extra/yassl')
-rw-r--r--extra/yassl/taocrypt/include/misc.hpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/extra/yassl/taocrypt/include/misc.hpp b/extra/yassl/taocrypt/include/misc.hpp
index 187d5cc6769..5a31510911e 100644
--- a/extra/yassl/taocrypt/include/misc.hpp
+++ b/extra/yassl/taocrypt/include/misc.hpp
@@ -96,6 +96,13 @@ public:
#endif
+// Disable assmebler when compiling with icc
+// Temporary workaround for bug12717
+#if defined(__INTEL_COMPILER)
+ #define TAOCRYPT_DISABLE_X86ASM
+#endif
+
+
// CodeWarrior defines _MSC_VER
#if !defined(TAOCRYPT_DISABLE_X86ASM) && ((defined(_MSC_VER) && \