summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
Diffstat (limited to 'extra')
-rw-r--r--extra/yassl/taocrypt/include/types.hpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/extra/yassl/taocrypt/include/types.hpp b/extra/yassl/taocrypt/include/types.hpp
index 85e2f85d3dd..9c5d3e4b194 100644
--- a/extra/yassl/taocrypt/include/types.hpp
+++ b/extra/yassl/taocrypt/include/types.hpp
@@ -68,8 +68,9 @@ typedef unsigned int word32;
// TODO: FIXME, add asm multiply for x86_64 on Solaris and remove !__sun
-#if defined(__alpha__) || defined(__ia64__) || defined(_ARCH_PPC64) || \
- defined(__mips64) || (defined(__x86_64__) && !defined(__sun))
+#if defined(__alpha__) || (defined(__ia64__) && !defined(__INTEL_COMPILER)) || \
+ defined(_ARCH_PPC64) || defined(__mips64) || \
+ (defined(__x86_64__) && !defined(__sun))
// These platforms have 64-bit CPU registers. Unfortunately most C++ compilers
// don't allow any way to access the 64-bit by 64-bit multiply instruction
// without using assembly, so in order to use word64 as word, the assembly