From bafcc7e060100bc3a2c8fb51c0ac6d87dc74a91a Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Fri, 23 Jul 2004 19:18:20 +0000 Subject: [PATCH] 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 --- Configure | 9 ++++--- TABLE | 78 ++++++++++++++++++++++++++++++++++++------------------- 2 files changed, 58 insertions(+), 29 deletions(-) diff --git a/Configure b/Configure index 6b61af332..ceb13f19e 100755 --- 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 1d22a26ae..eaa08d758 100644 --- a/TABLE +++ b/TABLE @@ -936,32 +936,6 @@ $shared_extension = $ranlib = $arflags = -*** VC-NT -$cc = cl -$cflags = -$unistd = -$thread_cflag = -$sys_id = WINNT -$lflags = -$bn_ops = BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN RC4_INDEX MD2_INT -$bn_obj = -$des_obj = -$aes_obj = -$bf_obj = -$md5_obj = -$sha1_obj = -$cast_obj = -$rc4_obj = -$rmd160_obj = -$rc5_obj = -$dso_scheme = win32 -$shared_target= -$shared_cflag = -$shared_ldflag = -$shared_extension = -$ranlib = -$arflags = - *** VC-W31-16 $cc = cl $cflags = @@ -1066,6 +1040,58 @@ $shared_extension = $ranlib = $arflags = +*** VC-WIN64A +$cc = cl +$cflags = +$unistd = +$thread_cflag = +$sys_id = WIN64A +$lflags = +$bn_ops = SIXTY_FOUR_BIT EXPORT_VAR_AS_FN +$bn_obj = +$des_obj = +$aes_obj = +$bf_obj = +$md5_obj = +$sha1_obj = +$cast_obj = +$rc4_obj = +$rmd160_obj = +$rc5_obj = +$dso_scheme = win32 +$shared_target= +$shared_cflag = +$shared_ldflag = +$shared_extension = +$ranlib = +$arflags = + +*** VC-WIN64I +$cc = cl +$cflags = +$unistd = +$thread_cflag = +$sys_id = WIN64I +$lflags = +$bn_ops = SIXTY_FOUR_BIT EXPORT_VAR_AS_FN +$bn_obj = +$des_obj = +$aes_obj = +$bf_obj = +$md5_obj = +$sha1_obj = +$cast_obj = +$rc4_obj = +$rmd160_obj = +$rc5_obj = +$dso_scheme = win32 +$shared_target= +$shared_cflag = +$shared_ldflag = +$shared_extension = +$ranlib = +$arflags = + *** aix-cc $cc = cc $cflags = -q32 -O -DB_ENDIAN -qmaxmem=16384