X-Git-Url: https://git.openssl.org/?a=blobdiff_plain;ds=sidebyside;f=config;h=3c7c4adb2e5a2e2346eea1fa35176015fde7363a;hb=1dea1f45097b044a59dbfeae6c667775410b24b0;hp=ea61d82ba153a99ec1811db22272b833d5343e77;hpb=95f8c7195c13dfdeab64b99044e33af44ef37b79;p=openssl.git

diff --git a/config b/config
index ea61d82ba1..3c7c4adb2e 100755
--- a/config
+++ b/config
@@ -333,7 +333,15 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
 	;;
 
     CYGWIN*)
-	echo "${MACHINE}-whatever-cygwin32"; exit 0
+	case "$RELEASE" in
+	    [bB]*|1.0|1.[12].*)
+		echo "${MACHINE}-whatever-cygwin_pre1.3"
+		;;
+	    *)
+		echo "${MACHINE}-whatever-cygwin"
+		;;
+	esac
+	exit 0
 	;;
 
 esac
@@ -546,6 +554,7 @@ EOF
 	OUT="linux-parisc" ;;
   arm*-*-linux2) OUT="linux-elf-arm" ;;
   s390-*-linux2) OUT="linux-s390" ;;
+  s390x-*-linux?) OUT="linux-s390x" ;;
   *-*-linux2) OUT="linux-elf"
 	if [ "$GCCVER" -gt 28 ]; then
           if grep '^model.*Pentium' /proc/cpuinfo >/dev/null ; then
@@ -669,8 +678,8 @@ EOF
   # *-aix) OUT="aix-$CC" ;;
   # *-dgux) OUT="dgux" ;;
   mips-sony-newsos4) OUT="newsos4-gcc" ;;
-  *-*-cygwin32) OUT="CygWin32"
-		options="$options no-threads no-asm" ;;
+  *-*-cygwin_pre1.3) OUT="Cygwin-pre1.3" ;;
+  *-*-cygwin) OUT="Cygwin" ;;
   *) OUT=`echo $GUESSOS | awk -F- '{print $3}'`;;
 esac