Win64 placeholder targets. This is merely naming suggestion. As we know

Win64 comes in two flavors, IA-64/Itanium and AMD64/Opteron. The
suggestion is to refer to former as WIN64I and latter - WIN64A

diff --git a/Configure b/Configure
index 6b61af33226992cc27a312b1a8228806a78ad3a4..ceb13f19e02a78428b6db426569cc76c7b31274e 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -463,9 +463,11 @@ my %table=(
 #
 "OS390-Unix","c89.sh:-O -DB_ENDIAN -DCHARSET_EBCDIC -DNO_SYS_PARAM_H  -D_ALL_SOURCE::(unknown):::THIRTY_TWO_BIT DES_PTR DES_UNROLL MD2_CHAR RC4_INDEX RC4_CHAR BF_PTR:::",
 
-# Windows NT, Microsoft Visual C++ 4.0
+# Win64 targets, WIN64I denotes IA-64 and WIN64A - AMD64
+"VC-WIN64I","cl::::WIN64I::SIXTY_FOUR_BIT EXPORT_VAR_AS_FN:${no_asm}:win32",
+"VC-WIN64A","cl::::WIN64A::SIXTY_FOUR_BIT EXPORT_VAR_AS_FN:${no_asm}:win32",
 
-"VC-NT","cl::::WINNT::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${no_asm}:win32",
+# Visual C targets
 "VC-CE","cl::::WINCE::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${no_asm}:win32",
 "VC-WIN32","cl::::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${no_asm}:win32",
 "VC-WIN16","cl:::(unknown):WIN16::MD2_CHAR DES_UNROLL DES_PTR RC4_INDEX THIRTY_TWO_BIT:::",
@@ -533,7 +535,8 @@ my %table=(
 
 );
 
-my @MK1MF_Builds=qw(VC-NT VC-CE VC-WIN32 VC-WIN16 VC-W31-16 VC-W31-32 VC-MSDOS
+my @MK1MF_Builds=qw(VC-WIN64I VC-WIN64A VC-CE VC-WIN32
+       VC-WIN16 VC-W31-16 VC-W31-32 VC-MSDOS
        BC-32 BC-16 OS2-EMX netware-clib netware-libc);
 
 my $idx = 0;

diff --git a/TABLE b/TABLE
index 1d22a26ae4009963895a7082e1542937c2ffff38..eaa08d7585097946896bafabf83c8b41b7feff89 100644 (file)
--- a/TABLE
+++ b/TABLE
@@ -936,14 +936,40 @@ $shared_extension =
 $ranlib       = 
 $arflags      = 
 
-*** VC-NT
+*** VC-W31-16
+$cc           = cl
+$cflags       = 
+$unistd       = 
+$thread_cflag = (unknown)
+$sys_id       = WIN16
+$lflags       = 
+$bn_ops       = BN_LLONG MD2_CHAR DES_UNROLL DES_PTR RC4_INDEX SIXTEEN_BIT
+$bn_obj       = 
+$des_obj      = 
+$aes_obj      = 
+$bf_obj       = 
+$md5_obj      = 
+$sha1_obj     = 
+$cast_obj     = 
+$rc4_obj      = 
+$rmd160_obj   = 
+$rc5_obj      = 
+$dso_scheme   = 
+$shared_target= 
+$shared_cflag = 
+$shared_ldflag = 
+$shared_extension = 
+$ranlib       = 
+$arflags      = 
+
+*** VC-W31-32
 $cc           = cl
 $cflags       = 
 $unistd       = 
 $thread_cflag = 
-$sys_id       = WINNT
+$sys_id       = WIN16
 $lflags       = 
-$bn_ops       = BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN RC4_INDEX MD2_INT
+$bn_ops       = BN_LLONG MD2_CHAR DES_UNROLL DES_PTR RC4_INDEX THIRTY_TWO_BIT
 $bn_obj       = 
 $des_obj      = 
 $aes_obj      = 
@@ -954,7 +980,7 @@ $cast_obj     =
 $rc4_obj      = 
 $rmd160_obj   = 
 $rc5_obj      = 
-$dso_scheme   = win32
+$dso_scheme   = 
 $shared_target= 
 $shared_cflag = 
 $shared_ldflag = 
@@ -962,14 +988,14 @@ $shared_extension =
 $ranlib       = 
 $arflags      = 
 
-*** VC-W31-16
+*** VC-WIN16
 $cc           = cl
 $cflags       = 
 $unistd       = 
 $thread_cflag = (unknown)
 $sys_id       = WIN16
 $lflags       = 
-$bn_ops       = BN_LLONG MD2_CHAR DES_UNROLL DES_PTR RC4_INDEX SIXTEEN_BIT
+$bn_ops       = MD2_CHAR DES_UNROLL DES_PTR RC4_INDEX THIRTY_TWO_BIT
 $bn_obj       = 
 $des_obj      = 
 $aes_obj      = 
@@ -988,14 +1014,14 @@ $shared_extension =
 $ranlib       = 
 $arflags      = 
 
-*** VC-W31-32
+*** VC-WIN32
 $cc           = cl
 $cflags       = 
 $unistd       = 
 $thread_cflag = 
-$sys_id       = WIN16
+$sys_id       = WIN32
 $lflags       = 
-$bn_ops       = BN_LLONG MD2_CHAR DES_UNROLL DES_PTR RC4_INDEX THIRTY_TWO_BIT
+$bn_ops       = BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN RC4_INDEX MD2_INT
 $bn_obj       = 
 $des_obj      = 
 $aes_obj      = 
@@ -1006,7 +1032,7 @@ $cast_obj     =
 $rc4_obj      = 
 $rmd160_obj   = 
 $rc5_obj      = 
-$dso_scheme   = 
+$dso_scheme   = win32
 $shared_target= 
 $shared_cflag = 
 $shared_ldflag = 
@@ -1014,14 +1040,14 @@ $shared_extension =
 $ranlib       = 
 $arflags      = 
 
-*** VC-WIN16
+*** VC-WIN64A
 $cc           = cl
 $cflags       = 
 $unistd       = 
-$thread_cflag = (unknown)
-$sys_id       = WIN16
+$thread_cflag = 
+$sys_id       = WIN64A
 $lflags       = 
-$bn_ops       = MD2_CHAR DES_UNROLL DES_PTR RC4_INDEX THIRTY_TWO_BIT
+$bn_ops       = SIXTY_FOUR_BIT EXPORT_VAR_AS_FN
 $bn_obj       = 
 $des_obj      = 
 $aes_obj      = 
@@ -1032,7 +1058,7 @@ $cast_obj     =
 $rc4_obj      = 
 $rmd160_obj   = 
 $rc5_obj      = 
-$dso_scheme   = 
+$dso_scheme   = win32
 $shared_target= 
 $shared_cflag = 
 $shared_ldflag = 
@@ -1040,14 +1066,14 @@ $shared_extension =
 $ranlib       = 
 $arflags      = 
 
-*** VC-WIN32
+*** VC-WIN64I
 $cc           = cl
 $cflags       = 
 $unistd       = 
 $thread_cflag = 
-$sys_id       = WIN32
+$sys_id       = WIN64I
 $lflags       = 
-$bn_ops       = BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN RC4_INDEX MD2_INT
+$bn_ops       = SIXTY_FOUR_BIT EXPORT_VAR_AS_FN
 $bn_obj       = 
 $des_obj      = 
 $aes_obj      =