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

diff --git a/Configure b/Configure
index c3e546bc1a264c373cd9c0a116b45a3ce5fb8e95..c8749f79441050c58f907723a93cd0f045a25515 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -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$/)

diff --git a/crypto/md32_common.h b/crypto/md32_common.h
index e88d78c27baece7d7bdf912b7d9092778964f180..2b91f9eef2a59dd8b31f87d52f75601d3df71749 100644 (file)
--- a/crypto/md32_common.h
+++ b/crypto/md32_common.h
@@ -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);\

diff --git a/crypto/sha/sha_locl.h b/crypto/sha/sha_locl.h
index ac85029af2b96300eeb0816d0996c02e3939b45a..6646a8915b757291e8b840329761018381e75aa7 100644 (file)
--- a/crypto/sha/sha_locl.h
+++ b/crypto/sha/sha_locl.h
@@ -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)             \