diff options
| author | Andy Polyakov <appro@openssl.org> | 2012-11-28 13:05:13 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2012-11-28 13:05:13 +0000 |
| commit | cf5ecc3e1fd112dd8a544bfb26bfb96c96b604c7 (patch) | |
| tree | 1906fb73108770060c65dd8189e67261b2f84ca2 /crypto | |
| parent | 2c340864be11a523507f71d8be144f9c593b2be6 (diff) | |
| download | openssl-cf5ecc3e1fd112dd8a544bfb26bfb96c96b604c7.tar.gz | |
Update support for Intel compiler: add linux-x86_64-icc and fix problems.
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/aes/aes_x86core.c | 4 | ||||
| -rw-r--r-- | crypto/des/des_locl.h | 4 | ||||
| -rw-r--r-- | crypto/md32_common.h | 4 | ||||
| -rw-r--r-- | crypto/rc5/rc5_locl.h | 5 |
4 files changed, 13 insertions, 4 deletions
diff --git a/crypto/aes/aes_x86core.c b/crypto/aes/aes_x86core.c index d323e265c0..e438580b22 100644 --- a/crypto/aes/aes_x86core.c +++ b/crypto/aes/aes_x86core.c @@ -89,8 +89,10 @@ typedef unsigned long long u64; #endif #undef ROTATE -#if defined(_MSC_VER) || defined(__ICC) +#if defined(_MSC_VER) # define ROTATE(a,n) _lrotl(a,n) +#elif defined(__ICC) +# define ROTATE(a,n) _rotl(a,n) #elif defined(__GNUC__) && __GNUC__>=2 # if defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__) # define ROTATE(a,n) ({ register unsigned int ret; \ diff --git a/crypto/des/des_locl.h b/crypto/des/des_locl.h index a3b512e9b0..5b53da96ef 100644 --- a/crypto/des/des_locl.h +++ b/crypto/des/des_locl.h @@ -160,8 +160,10 @@ } \ } -#if (defined(OPENSSL_SYS_WIN32) && defined(_MSC_VER)) || defined(__ICC) +#if (defined(OPENSSL_SYS_WIN32) && defined(_MSC_VER)) #define ROTATE(a,n) (_lrotr(a,n)) +#elif defined(__ICC) +#define ROTATE(a,n) (_rotr(a,n)) #elif defined(__GNUC__) && __GNUC__>=2 && !defined(__STRICT_ANSI__) && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM) && !defined(PEDANTIC) # if defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__) # define ROTATE(a,n) ({ register unsigned int ret; \ diff --git a/crypto/md32_common.h b/crypto/md32_common.h index bb7381952a..d7f7a26e70 100644 --- a/crypto/md32_common.h +++ b/crypto/md32_common.h @@ -142,8 +142,10 @@ */ #undef ROTATE #ifndef PEDANTIC -# if defined(_MSC_VER) || defined(__ICC) +# if defined(_MSC_VER) # define ROTATE(a,n) _lrotl(a,n) +# elif defined(__ICC) +# define ROTATE(a,n) _rotl(a,n) # elif defined(__MWERKS__) # if defined(__POWERPC__) # define ROTATE(a,n) __rlwinm(a,n,0,31) diff --git a/crypto/rc5/rc5_locl.h b/crypto/rc5/rc5_locl.h index d337f73fad..d3e8001160 100644 --- a/crypto/rc5/rc5_locl.h +++ b/crypto/rc5/rc5_locl.h @@ -146,9 +146,12 @@ *((c)++)=(unsigned char)(((l)>> 8L)&0xff), \ *((c)++)=(unsigned char)(((l) )&0xff)) -#if (defined(OPENSSL_SYS_WIN32) && defined(_MSC_VER)) || defined(__ICC) +#if (defined(OPENSSL_SYS_WIN32) && defined(_MSC_VER)) #define ROTATE_l32(a,n) _lrotl(a,n) #define ROTATE_r32(a,n) _lrotr(a,n) +#elif defined(__ICC) +#define ROTATE_l32(a,n) _rotl(a,n) +#define ROTATE_r32(a,n) _rotr(a,n) #elif defined(__GNUC__) && __GNUC__>=2 && !defined(__STRICT_ANSI__) && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM) && !defined(PEDANTIC) # if defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__) # define ROTATE_l32(a,n) ({ register unsigned int ret; \ |