Commit 85982899 authored by Ben Laurie's avatar Ben Laurie
Browse files

Correct asm exclusions.

parent 35dde748

crypto/des/des_locl.h

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ 


#if defined(OPENSSL_SYS_WIN32) && defined(_MSC_VER)

#define	ROTATE(a,n)	(_lrotr(a,n))

#elif defined(__GNUC__) && __GNUC__>=2 && !defined(__STRICT_ANSI__) && !defined(NO_ASM) && !defined(NO_INLINE_ASM)

#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;	\

				asm ("rorl %1,%0"	\

crypto/rc5/rc5_locl.h

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ 
#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(__GNUC__) && __GNUC__>=2 && !defined(__STRICT_ANSI__) && !defined(NO_ASM) && !defined(NO_INLINE_ASM)

#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;	\

					asm ("roll %%cl,%0"	\