3 files changed, 5 insertions, 3 deletions

diff --git a/configure.ac b/configure.ac
index 2d0ad63..e584113 100644
--- a/configure.ac
+++ b/configure.ac
@@ -111,6 +111,10 @@ AM_CONDITIONAL([HOST_ASM_ELF_X86_64],
     [test "x$HOST_ABI" = "xelf" -a "$host_cpu" = "x86_64" -a "x$enable_asm" != "xno"])
 AM_CONDITIONAL([HOST_ASM_MACOSX_X86_64],
     [test "x$HOST_ABI" = "xmacosx" -a "$host_cpu" = "x86_64" -a "x$enable_asm" != "xno"])
+AM_CONDITIONAL([HOST_ASM_MASM_X86_64],
+    [test "x$HOST_ABI" = "xmasm" -a "$host_cpu" = "x86_64" -a "x$enable_asm" != "xno"])
+AM_CONDITIONAL([HOST_ASM_MINGW64_X86_64],
+    [test "x$HOST_ABI" = "xmingw64" -a "$host_cpu" = "x86_64" -a "x$enable_asm" != "xno"])
 
 # Check if time_t is sized correctly
 AC_CHECK_SIZEOF([time_t], [time.h])
diff --git a/crypto/Makefile.am b/crypto/Makefile.am
index ce846b4..d2c7431 100644
--- a/crypto/Makefile.am
+++ b/crypto/Makefile.am
@@ -102,9 +102,6 @@ libcrypto_la_CPPFLAGS += -DOPENSSL_NO_HW_PADLOCK
 if OPENSSL_NO_ASM
 libcrypto_la_CPPFLAGS += -DOPENSSL_NO_ASM
 else
-if HOST_WIN
-libcrypto_la_CPPFLAGS += -DOPENSSL_NO_ASM
-endif
 endif
 
 if OPENSSLDIR_DEFINED
diff --git a/m4/check-os-options.m4 b/m4/check-os-options.m4
index 9fc0faf..445bd74 100644
--- a/m4/check-os-options.m4
+++ b/m4/check-os-options.m4
@@ -101,6 +101,7 @@ char buf[1]; getentropy(buf, 1);
                 ;;
         *mingw*)
                 HOST_OS=win
+                HOST_ABI=mingw64
                 BUILD_NC=no
                 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE -D_POSIX -D_POSIX_SOURCE -D__USE_MINGW_ANSI_STDIO"
                 CPPFLAGS="$CPPFLAGS -D_REENTRANT -D_POSIX_THREAD_SAFE_FUNCTIONS"