From d843779ddf77aec75bcbc4666bc1fdeb9b120fe4 Mon Sep 17 00:00:00 2001
From: Richard Levitte <levitte@openssl.org>
Date: Mon, 13 Mar 2017 21:25:37 +0100
Subject: [PATCH] Better way to recognise mingw64 in config script

Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2922)
(cherry picked from commit 41bee3e8fb749504f21f78dbf3eca85e5b84820b)
---
 config | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/config b/config
index 4781bf5645..21534e00ba 100755
--- a/config
+++ b/config
@@ -344,6 +344,15 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
 	echo "mips-sony-newsos4"; exit 0;
 	;;
 
+    # The following combinations are supported
+    # MINGW64* on x86_64 => mingw64
+    # MINGW32* on x86_64 => mingw
+    # MINGW32* on i?86 => mingw
+    #
+    # MINGW64* on i?86 isn't expected to work...
+    MINGW64*:*:*:x86_64)
+	echo "${MACHINE}-whatever-mingw64"; exit 0;
+	;;
     MINGW*)
 	echo "${MACHINE}-whatever-mingw"; exit 0;
 	;;
@@ -848,8 +857,6 @@ case "$GUESSOS" in
 	    options="$options no-asm"
 	fi
 	;;
-  i[3456]86-*-mingw) OUT="mingw" ;;
-  x86_64-*-mingw) OUT="mingw64" ;;
   # these are all covered by the catchall below
   # *-dgux) OUT="dgux" ;;
   mips-sony-newsos4) OUT="newsos4-gcc" ;;
-- 
2.25.1