diff options
| author | Bodo Möller <bodo@openssl.org> | 1999-06-23 12:18:31 +0000 |
|---|---|---|
| committer | Bodo Möller <bodo@openssl.org> | 1999-06-23 12:18:31 +0000 |
| commit | 946cbf67afc5a76394008bcad9efa67deeefb172 (patch) | |
| tree | f4589cfc72f197cecd88e98424ba7734dc9e937d | |
| parent | 170afce58d5c9ffc399892e19a52c5559e2db801 (diff) | |
| download | openssl-new-946cbf67afc5a76394008bcad9efa67deeefb172.tar.gz | |
Don't use inline assembler when configured for "no-asm".
| -rwxr-xr-x | Configure | 5 | ||||
| -rw-r--r-- | crypto/md32_common.h | 4 | ||||
| -rw-r--r-- | crypto/sha/sha_locl.h | 2 |
3 files changed, 7 insertions, 4 deletions
@@ -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 e88d78c27b..2b91f9eef2 100644 --- 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 ac85029af2..6646a8915b 100644 --- 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) \ |