bk commit into 5.0 tree (kent:1.1890)

[kent]

Below is the list of changes that have just been committed into a local
5.0 repository of kent. When kent 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.1890 05/05/22 04:19:54 kent@stripped +1 -0
  misc.hpp:
    Check _LONGLONG_TYPE as well, to define 'word64', to make it
    work on Solaris 10 x86_64.
    Can't assume all x86_64 share the same assembler syntax.
    For now disabled assembler for x86_64 and Solaris.

  extra/yassl/taocrypt/include/misc.hpp
    1.3 05/05/22 04:16:35 kent@stripped +4 -2
    Check _LONGLONG_TYPE as well, to define 'word64', to make it
    work on Solaris 10 x86_64.
    Can't assume all x86_64 share the same assembler syntax.
    For now disabled assembler for x86_64 and Solaris.

# 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:	kent
# Host:	g4.boortz.dyndns.org
# Root:	/Users/kent/mysql/bk/mysql-5.0-build

--- 1.2/extra/yassl/taocrypt/include/misc.hpp	2005-05-19 22:44:00 +02:00
+++ 1.3/extra/yassl/taocrypt/include/misc.hpp	2005-05-22 04:16:35 +02:00
@@ -59,7 +59,7 @@
 typedef unsigned short word16;
 typedef unsigned int   word32;
 
-#if defined(__GNUC__) || defined(__MWERKS__)
+#if defined(__GNUC__) || defined(__MWERKS__) || defined(_LONGLONG_TYPE)
     #define WORD64_AVAILABLE
     typedef unsigned long long word64;
     #define W64LIT(x) x##LL
@@ -79,8 +79,10 @@
     typedef word32 lword;
 #endif
 
+// FIXME the !defined(__sun) is a temporarely solution until asm for
+// __x86_64__ and Solaris is written
 #if defined(__alpha__) || defined(__ia64__) || defined(_ARCH_PPC64) || \
-    defined(__x86_64__) || defined(__mips64)
+    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