diff options
| author | unknown <kent@mysql.com> | 2005-05-22 04:19:54 +0200 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2005-05-22 04:19:54 +0200 |
| commit | 6f3718e4e882b66e681d88b3dd795156b7953456 (patch) | |
| tree | a95ba4c07ff56f2c4fc33f358af1eb154a7b022a /extra | |
| parent | 05e658235b3dff6a52ccf980ee3ae37e0c8d1af2 (diff) | |
| download | mariadb-git-6f3718e4e882b66e681d88b3dd795156b7953456.tar.gz | |
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:
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.
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/yassl/taocrypt/include/misc.hpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/extra/yassl/taocrypt/include/misc.hpp b/extra/yassl/taocrypt/include/misc.hpp index b9cc9a6fe71..b5b0a4575fc 100644 --- a/extra/yassl/taocrypt/include/misc.hpp +++ b/extra/yassl/taocrypt/include/misc.hpp @@ -59,7 +59,7 @@ typedef unsigned char byte; 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 unsigned int word32; 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 |