Commit 946cbf67 authored by Bodo Möller's avatar Bodo Möller
Browse files

Don't use inline assembler when configured for "no-asm".

parent 170afce5

Configure

+4 −1
Original line number Diff line number Diff line
@@ -330,7 +330,10 @@ my $options=""; 
foreach (@ARGV)

	{

	if (/^no-asm$/)

		{ $no_asm=1; }

	 	{

		$no_asm=1;

		$flags .= "-DNO_ASM ";

		}

	elsif (/^no-threads$/)

		{ $no_threads=1; }

	elsif (/^threads$/)

crypto/md32_common.h

+2 −2
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ 
#ifndef PEDANTIC

# if defined(_MSC_VER)

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

# elif defined(__GNUC__) && __GNUC__>=2

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

  /*

   * Some GNU C inline assembler templates. Note that these are

   * rotates by *constant* number of bits! But that's exactly
@@ -211,7 +211,7 @@ 
 * Engage compiler specific "fetch in reverse byte order"

 * intrinsic function if available.

 */

# if defined(__GNUC__) && __GNUC__>=2

# if defined(__GNUC__) && __GNUC__>=2 && !defined(NO_ASM)

  /* some GNU C inline assembler templates by <appro@fy.chalmers.se> */

#  if defined(__i386) && !defined(I386_ONLY)

#   define BE_FETCH32(a)	({ register unsigned int l=(a);\

crypto/sha/sha_locl.h

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ 
#define ROTATE(a,n)     _lrotl(a,n)

#elif defined(__GNUC__) && !defined(PEDANTIC)

/* some inline assembler templates by <appro@fy.chalmers.se> */

#if defined(__i386)

#if defined(__i386) && !defined(NO_ASM)

#define ROTATE(a,n)	({ register unsigned int ret;	\

				asm ("roll %1,%0"	\

				: "=r"(ret)		\