Don't use inline assembler on x86 Solaris (would need a different syntax).

diff --git a/crypto/bn/bn_div.c b/crypto/bn/bn_div.c
index 830da87f58e047f7156a0b2aacd2195bb3495480..36beea2296b822901cb27f47380704daa444eb9a 100644 (file)
--- a/crypto/bn/bn_div.c
+++ b/crypto/bn/bn_div.c
@@ -207,7 +207,7 @@ int BN_div(BIGNUM *dv, BIGNUM *rm, const BIGNUM *num, const BIGNUM *divisor,
 
 #if !defined(NO_ASM) && !defined(PEDANTIC)
 # if defined(__GNUC__) && __GNUC__>=2
 
 #if !defined(NO_ASM) && !defined(PEDANTIC)
 # if defined(__GNUC__) && __GNUC__>=2

-#  if defined(__i386)
+#  if defined(__i386) && !defined(__sun)

    /*
     * There were two reasons for implementing this template:
     * - GNU C generates a call to a function (__udivdi3 to be exact)
    /*
     * There were two reasons for implementing this template:
     * - GNU C generates a call to a function (__udivdi3 to be exact)

diff --git a/crypto/md32_common.h b/crypto/md32_common.h
index 5e62d405232a8bf12499e00c652f24bdde9e3657..e739da21217abff9f1bbec478790a8a0e6e4f9b2 100644 (file)
--- a/crypto/md32_common.h
+++ b/crypto/md32_common.h
@@ -191,7 +191,7 @@
    *
    *                                   <appro@fy.chalmers.se>
    */
    *
    *                                   <appro@fy.chalmers.se>
    */

-#  if defined(__i386)
+#  if defined(__i386) && !defined(__sun)

 #   define ROTATE(a,n) ({ register unsigned int ret;   \
                                asm volatile (          \
                                "roll %1,%0"            \
 #   define ROTATE(a,n) ({ register unsigned int ret;   \
                                asm volatile (          \
                                "roll %1,%0"            \