summaryrefslogtreecommitdiffstats
path: root/crypto/md32_common.h
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2000-02-15 18:20:52 +0100
committerAndy Polyakov <appro@openssl.org>2000-02-15 18:20:52 +0100
commit89cee61b45725a57cb45defca4ee014a70790fe1 (patch)
treefc016c5b5b66d65a1c5bb0a2f2a1384391d939f4 /crypto/md32_common.h
parentFix for Netscape "hang" bug. (diff)
downloadopenssl-89cee61b45725a57cb45defca4ee014a70790fe1.tar.xz
openssl-89cee61b45725a57cb45defca4ee014a70790fe1.zip
New NO_INLINE_ASM macro. Primary target for the moment is Solaris x86
which can't stand GNU C assembler templates.
Diffstat (limited to 'crypto/md32_common.h')
-rw-r--r--crypto/md32_common.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/md32_common.h b/crypto/md32_common.h
index 9a6a27512f..d7c0084c4e 100644
--- a/crypto/md32_common.h
+++ b/crypto/md32_common.h
@@ -190,7 +190,7 @@
# else
# define ROTATE(a,n) __rol(a,n)
# endif
-# elif defined(__GNUC__) && __GNUC__>=2 && !defined(NO_ASM)
+# elif defined(__GNUC__) && __GNUC__>=2 && !defined(NO_ASM) && !defined(NO_INLINE_ASM)
/*
* Some GNU C inline assembler templates. Note that these are
* rotates by *constant* number of bits! But that's exactly
@@ -222,7 +222,7 @@
* Engage compiler specific "fetch in reverse byte order"
* intrinsic function if available.
*/
-# if defined(__GNUC__) && __GNUC__>=2 && !defined(NO_ASM)
+# if defined(__GNUC__) && __GNUC__>=2 && !defined(NO_ASM) && !defined(NO_INLINE_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);\