Commit 6c1fc273 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

Eliminate false preprocessor dependencies introduced with VOS support.

parent aa8b03b4

crypto/md32_common.h

+2 −0
Original line number Diff line number Diff line
@@ -288,6 +288,7 @@ 
# if defined(__GNUC__) && __GNUC__>=2 && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM)

#  if ((defined(__i386) || defined(__i386__)) && !defined(I386_ONLY)) || \

      (defined(__x86_64) || defined(__x86_64__))

#   if !defined(B_ENDIAN)

    /*

     * This gives ~30-40% performance improvement in SHA-256 compiled

     * with gcc [on P4]. Well, first macro to be frank. We can pull
@@ -303,6 +304,7 @@ 
#   endif

#  endif

# endif

#endif



#ifndef HOST_c2l

#define HOST_c2l(c,l)	(l =(((unsigned long)(*((c)++)))<<24),		\

crypto/md4/md4_locl.h

+2 −1
Original line number Diff line number Diff line
@@ -68,7 +68,8 @@ 
void md4_block_host_order (MD4_CTX *c, const void *p,size_t num);

void md4_block_data_order (MD4_CTX *c, const void *p,size_t num);



#if defined(__i386) || defined(__i386__) || defined(_M_IX86) || defined(__INTEL__)

#if defined(__i386) || defined(__i386__) || defined(_M_IX86) || defined(__INTEL__) || \

    defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64)

# if !defined(B_ENDIAN)

/*

 * *_block_host_order is expected to handle aligned data while

crypto/md5/md5_locl.h

+5 −5
Original line number Diff line number Diff line
@@ -66,10 +66,9 @@ 
#endif



#ifdef MD5_ASM

# if defined(__i386) || defined(__i386__) || defined(_M_IX86) || defined(__INTEL__) || defined(__x86_64) || defined(__x86_64__)

#  if !defined(B_ENDIAN)

# if defined(__i386) || defined(__i386__) || defined(_M_IX86) || defined(__INTEL__) || \

     defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64)

#  define md5_block_host_order md5_block_asm_host_order

#  endif

# elif defined(__sparc) && defined(OPENSSL_SYS_ULTRASPARC)

   void md5_block_asm_data_order_aligned (MD5_CTX *c, const MD5_LONG *p,size_t num);

#  define HASH_BLOCK_DATA_ORDER_ALIGNED md5_block_asm_data_order_aligned
@@ -82,7 +81,8 @@ 
void md5_block_host_order (MD5_CTX *c, const void *p,size_t num);

void md5_block_data_order (MD5_CTX *c, const void *p,size_t num);



#if defined(__i386) || defined(__i386__) || defined(_M_IX86) || defined(__INTEL__) || defined(__x86_64) || defined(__x86_64__)

#if defined(__i386) || defined(__i386__) || defined(_M_IX86) || defined(__INTEL__) || \

    defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64)

# if !defined(B_ENDIAN)

/*

 * *_block_host_order is expected to handle aligned data while

crypto/ripemd/rmd_locl.h

+3 −4
Original line number Diff line number Diff line
@@ -72,16 +72,15 @@ 
 */

#ifdef RMD160_ASM

# if defined(__i386) || defined(__i386__) || defined(_M_IX86) || defined(__INTEL__)

#  if !defined(B_ENDIAN)

#  define ripemd160_block_host_order ripemd160_block_asm_host_order

# endif

#endif

#endif



void ripemd160_block_host_order (RIPEMD160_CTX *c, const void *p,size_t num);

void ripemd160_block_data_order (RIPEMD160_CTX *c, const void *p,size_t num);



#if defined(__i386) || defined(__i386__) || defined(_M_IX86) || defined(__INTEL__)

#if defined(__i386) || defined(__i386__) || defined(_M_IX86) || defined(__INTEL__) || \

    defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64)

# if !defined(B_ENDIAN)

#  define ripemd160_block_data_order ripemd160_block_host_order

# endif

crypto/sha/sha_locl.h

+5 −7
Original line number Diff line number Diff line
@@ -116,13 +116,11 @@ 


# ifdef SHA1_ASM

#  if defined(__i386) || defined(__i386__) || defined(_M_IX86) || defined(__INTEL__)

#   if !defined(B_ENDIAN)

#   define sha1_block_host_order		sha1_block_asm_host_order

#   define DONT_IMPLEMENT_BLOCK_HOST_ORDER

#   define sha1_block_data_order		sha1_block_asm_data_order

#   define DONT_IMPLEMENT_BLOCK_DATA_ORDER

#   define HASH_BLOCK_DATA_ORDER_ALIGNED	sha1_block_asm_data_order

#   endif

#  elif defined(__ia64) || defined(__ia64__) || defined(_M_IA64)

#   define sha1_block_host_order		sha1_block_asm_host_order

#   define DONT_IMPLEMENT_BLOCK_HOST_ORDER