bk commit into 5.0 tree (svoj:1.1958)

[svoj]

Below is the list of changes that have just been committed into a local
5.0 repository of svoj. When svoj does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1958 05/06/08 23:58:34 svoj@stripped +1 -0
  WL#2286 - Compile MySQL w/YASSL support
  Fix for yaSSL compilation failure on ia64 platform.

  extra/yassl/taocrypt/include/types.hpp
    1.3 05/06/08 23:58:29 svoj@stripped +3 -2
    Do not use assembler when yaSSL compiled with icc on ia64 platform.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	svoj
# Host:	svoj.pils.ru
# Root:	/home/svoj/devel/mysql/yassl-mysql-5.0

--- 1.2/extra/yassl/taocrypt/include/types.hpp	2005-06-06 15:27:55 +05:00
+++ 1.3/extra/yassl/taocrypt/include/types.hpp	2005-06-08 23:58:29 +05:00
@@ -68,8 +68,9 @@
 
 // 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