Pull up Win64 support from 0.9.8.

[openssl.git] / util / mk1mf.pl

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index b519210b45368f7dc1f22e5821c91675d239d7d9..6090a2b5a61bf0976cefd60ded899332b6c2534e 100755 (executable)
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -24,23 +24,20 @@ $infile="MINFO";
 
 %ops=(
        "VC-WIN32",   "Microsoft Visual C++ [4-6] - Windows NT or 9X",
+       "VC-WIN64I",  "Microsoft C/C++ - Win64/IA-64",
+       "VC-WIN64A",  "Microsoft C/C++ - Win64/x64",
        "VC-CE",   "Microsoft eMbedded Visual C++ 3.0 - Windows CE ONLY",
        "VC-NT",   "Microsoft Visual C++ [4-6] - Windows NT ONLY",
-       "VC-W31-16",  "Microsoft Visual C++ 1.52 - Windows 3.1 - 286",
-       "VC-WIN16",   "Alias for VC-W31-32",
-       "VC-W31-32",  "Microsoft Visual C++ 1.52 - Windows 3.1 - 386+",
-       "VC-MSDOS","Microsoft Visual C++ 1.52 - MSDOS",
        "Mingw32", "GNU C++ - Windows NT or 9x",
        "Mingw32-files", "Create files with DOS copy ...",
        "BC-NT",   "Borland C++ 4.5 - Windows NT",
-       "BC-W31",  "Borland C++ 4.5 - Windows 3.1 - PROBABLY NOT WORKING",
-       "BC-MSDOS","Borland C++ 4.5 - MSDOS",
        "linux-elf","Linux elf",
        "ultrix-mips","DEC mips ultrix",
        "FreeBSD","FreeBSD distribution",
        "OS2-EMX", "EMX GCC OS/2",
-       "netware-clib", "CodeWarrior for NetWare - CLib",
-       "netware-libc", "CodeWarrior for NetWare - LibC",
+       "netware-clib", "CodeWarrior for NetWare - CLib - with WinSock Sockets",
+       "netware-libc", "CodeWarrior for NetWare - LibC - with WinSock Sockets",
+       "netware-libc-bsdsock", "CodeWarrior for NetWare - LibC - with BSD Sockets",
        "default","cc under unix",
        );
 
@@ -125,27 +122,10 @@ $bin_dir=(defined($VARS{'BIN'}))?$VARS{'BIN'}:'';
 $NT=0;
 
 push(@INC,"util/pl","pl");
-if ($platform eq "VC-MSDOS")
+if (($platform =~ /VC-(.+)/))
        {
-       $asmbits=16;
-       $msdos=1;
-       require 'VC-16.pl';
-       }
-elsif ($platform eq "VC-W31-16")
-       {
-       $asmbits=16;
-       $msdos=1; $win16=1;
-       require 'VC-16.pl';
-       }
-elsif (($platform eq "VC-W31-32") || ($platform eq "VC-WIN16"))
-       {
-       $asmbits=32;
-       $msdos=1; $win16=1;
-       require 'VC-16.pl';
-       }
-elsif (($platform eq "VC-WIN32") || ($platform eq "VC-NT"))
-       {
-       $NT = 1 if $platform eq "VC-NT";
+       $FLAVOR=$1;
+       $NT = 1 if $1 eq "NT";
        require 'VC-32.pl';
        }
 elsif ($platform eq "VC-CE")
@@ -165,23 +145,6 @@ elsif ($platform eq "BC-NT")
        $bc=1;
        require 'BC-32.pl';
        }
-elsif ($platform eq "BC-W31")
-       {
-       $bc=1;
-       $msdos=1; $w16=1;
-       require 'BC-16.pl';
-       }
-elsif ($platform eq "BC-Q16")
-       {
-       $msdos=1; $w16=1; $shlib=0; $qw=1;
-       require 'BC-16.pl';
-       }
-elsif ($platform eq "BC-MSDOS")
-       {
-       $asmbits=16;
-       $msdos=1;
-       require 'BC-16.pl';
-       }
 elsif ($platform eq "FreeBSD")
        {
        require 'unix.pl';
@@ -204,9 +167,11 @@ elsif ($platform eq "OS2-EMX")
        $wc=1;
        require 'OS2-EMX.pl';
        }
-elsif (($platform eq "netware-clib") || ($platform eq "netware-libc"))
+elsif (($platform eq "netware-clib") || ($platform eq "netware-libc") ||
+       ($platform eq "netware-libc-bsdsock"))
        {
-   $LIBC=1 if $platform eq "netware-libc";
+       $LIBC=1 if $platform eq "netware-libc" || $platform eq "netware-libc-bsdsock";
+       $BSDSOCK=1 if $platform eq "netware-libc-bsdsock";
        require 'netware.pl';
        }
 else