aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2000-02-15 17:20:52 +0000
committerAndy Polyakov <appro@openssl.org>2000-02-15 17:20:52 +0000
commit89cee61b45725a57cb45defca4ee014a70790fe1 (patch)
treefc016c5b5b66d65a1c5bb0a2f2a1384391d939f4
parentde469ef21e4117908cc770f9ca25a26a01f9be38 (diff)
downloadopenssl-89cee61b45725a57cb45defca4ee014a70790fe1.tar.gz
New NO_INLINE_ASM macro. Primary target for the moment is Solaris x86
which can't stand GNU C assembler templates.
-rw-r--r--crypto/bn/bn_div.c2
-rw-r--r--crypto/bn/bn_lcl.h2
-rw-r--r--crypto/md32_common.h4
3 files changed, 4 insertions, 4 deletions
diff --git a/crypto/bn/bn_div.c b/crypto/bn/bn_div.c
index 31062b7db2..07af1d3b44 100644
--- a/crypto/bn/bn_div.c
+++ b/crypto/bn/bn_div.c
@@ -126,7 +126,7 @@ int BN_div(BIGNUM *dv, BIGNUM *rem, const BIGNUM *m, const BIGNUM *d,
#else
-#if !defined(NO_ASM) && !defined(PEDANTIC) && !defined(BN_DIV3W)
+#if !defined(NO_ASM) && !defined(NO_INLINE_ASM) && !defined(PEDANTIC) && !defined(BN_DIV3W)
# if defined(__GNUC__) && __GNUC__>=2
# if defined(__i386)
/*
diff --git a/crypto/bn/bn_lcl.h b/crypto/bn/bn_lcl.h
index fa347ee6f8..fc0b5b762b 100644
--- a/crypto/bn/bn_lcl.h
+++ b/crypto/bn/bn_lcl.h
@@ -86,7 +86,7 @@ extern "C" {
#endif
#endif
-#if !defined(NO_ASM) && !defined(PEDANTIC)
+#if !defined(NO_ASM) && !defined(NO_INLINE_ASM) && !defined(PEDANTIC)
/*
* BN_UMULT_HIGH section.
*
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);\