diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-09-01 14:09:23 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-09-01 14:09:23 +0200 |
| commit | 944666ef1d883413fac1721f58e002f3fe83cfc7 (patch) | |
| tree | d8234e00d70ddfb49287ee754cf4b29a64ae777b /extra | |
| parent | b5f87344879b501a05758a2c72d38c3f378e9a40 (diff) | |
| parent | e4cfbaed518f98b2ee3f5a9e0a4edef485240221 (diff) | |
| download | mariadb-git-944666ef1d883413fac1721f58e002f3fe83cfc7.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/bug12526/my50-bug12526
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/yassl/taocrypt/include/misc.hpp | 7 |
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) && \ |