Some non-GNU compilers (such as Sun C) define __i386.

diff --git a/crypto/engine/eng_padlock.c b/crypto/engine/eng_padlock.c
index 4f64a06fb08a7c5df15473512ccc4138b1b0f32e..87e62d0d5df8a9f0a39208388981ef3cf5204c19 100644 (file)
--- a/crypto/engine/eng_padlock.c
+++ b/crypto/engine/eng_padlock.c
@@ -97,7 +97,8 @@
    compiler choice is limited to GCC and Microsoft C. */
 #undef COMPILE_HW_PADLOCK
 #if !defined(I386_ONLY) && !defined(OPENSSL_NO_INLINE_ASM)
-# if defined(__i386__) || defined(__i386) || defined(_M_IX86)
+# if (defined(__GNUC__) && (defined(__i386__) || defined(__i386))) || \
+     (defined(_MSC_VER) && defined(_M_IX86))
 #  define COMPILE_HW_PADLOCK
 static ENGINE *ENGINE_padlock (void);
 # endif