From 32b1843ec608f156e2910dd807dcf1960ff9502d Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Tue, 17 May 2005 13:51:36 +0000 Subject: [PATCH] Keep disclaming 16-bit support. --- bugs/VC16.bug | 18 ----- ms/16all.bat | 15 ----- ms/README | 5 -- ms/speed16.bat | 38 ----------- util/mk1mf.pl | 43 +----------- util/pl/BC-16.pl | 146 ---------------------------------------- util/pl/VC-16.pl | 172 ----------------------------------------------- 7 files changed, 1 insertion(+), 436 deletions(-) delete mode 100644 bugs/VC16.bug delete mode 100755 ms/16all.bat delete mode 100755 ms/speed16.bat delete mode 100644 util/pl/BC-16.pl delete mode 100644 util/pl/VC-16.pl diff --git a/bugs/VC16.bug b/bugs/VC16.bug deleted file mode 100644 index 7815bb5c77..0000000000 --- a/bugs/VC16.bug +++ /dev/null @@ -1,18 +0,0 @@ -Microsoft (R) C/C++ Optimizing Compiler Version 8.00c - -Compile with /O2 chokes the compiler on these files - -crypto\md\md5_dgst.c warning '@(#)reg86.c:1.26', line 1110 -crypto\des\ofb64ede.c warning '@(#)grammar.c:1.147', line 168 -crypto\des\ofb64enc.c warning '@(#)grammar.c:1.147', line 168 -crypto\des\qud_cksm.c warning '@(#)grammar.c:1.147', line 168 -crypto\rc2\rc2ofb64.c warning '@(#)grammar.c:1.147', line 168 -crypto\objects\obj_dat.c warning '@(#)grammar.c:1.147', line 168 - fatal '@(#)grammar.c:1.147', line 168 -crypto\objects\obj_lib.c warning '@(#)grammar.c:1.147', line 168 - fatal '@(#)grammar.c:1.147', line 168 -ssl\ssl_auth.c warning '@(#)grammar.c:1.147', line 168 - fatal '@(#)grammar.c:1.147', line 168 - -Turning on /G3 with build flags that worked fine for /G2 came up with -divide by zero errors in 'normal' code in speed.c :-( diff --git a/ms/16all.bat b/ms/16all.bat deleted file mode 100755 index 62ccf78963..0000000000 --- a/ms/16all.bat +++ /dev/null @@ -1,15 +0,0 @@ -set OPTS=no_asm - -perl Configure VC-WIN16 -perl util\mkfiles.pl >MINFO -perl util\mk1mf.pl %OPTS% debug VC-WIN16 >d16.mak -perl util\mk1mf.pl %OPTS% VC-WIN16 >16.mak -perl util\mk1mf.pl %OPTS% debug dll VC-WIN16 >d16dll.mak -perl util\mk1mf.pl %OPTS% dll VC-WIN16 >16dll.mak -perl util\mkdef.pl 16 libeay > ms\libeay32.def -perl util\mkdef.pl 16 ssleay > ms\ssleay32.def - -nmake -f d16.mak -nmake -f 16.mak -nmake -f d16dll.mak -nmake -f 16dll.mak diff --git a/ms/README b/ms/README index 5804a2d84a..7a45db1081 100644 --- a/ms/README +++ b/ms/README @@ -6,13 +6,8 @@ The results will be in the out directory. These makefiles and def files were generated my typing -perl util\mk1mf.pl VC-MSDOS no-sock >ms/msdos.mak -perl util\mk1mf.pl VC-W31-32 >ms/w31.mak -perl util\mk1mf.pl VC-W31-32 dll >ms/w31dll.mak perl util\mk1mf.pl VC-NT >ms/nt.mak perl util\mk1mf.pl VC-NT dll >ms/ntdll.mak -perl util\mkdef.pl 16 crypto > ms/crypto16.def perl util\mkdef.pl 32 crypto > ms/crypto32.def -perl util\mkdef.pl 16 ssl > ms/ssl16.def perl util\mkdef.pl 32 ssl > ms/ssl32.def diff --git a/ms/speed16.bat b/ms/speed16.bat deleted file mode 100755 index 7ff08851a2..0000000000 --- a/ms/speed16.bat +++ /dev/null @@ -1,38 +0,0 @@ -set makefile=ms\dos.bat - -perl Configure b -del tmp\*.obj -nmake -f %makefile% -nmake -f %makefile% -nmake -f %makefile% -out\ssleay version -v -b -f >speed.1 -out\ssleay speed >speed.1l - -perl Configure bl-4c-2c -del tmp\rc4*.obj tmp\bn*.obj tmp\md2_dgst.obj -nmake -f %makefile% -nmake -f %makefile% -nmake -f %makefile% -out\ssleay speed rc4 rsa md2 >speed.2l - -perl Configure bl-4c-ri -del tmp\rc4*.obj -nmake -f %makefile% -nmake -f %makefile% -nmake -f %makefile% -out\ssleay speed rc4 >speed.3l - -perl Configure b2-is-ri-dp -perl util\mk1mf.pl VC-MSDOS no-asm >m2 -del tmp\i_*.obj tmp\rc4*.obj tmp\ecb_enc.obj tmp\bn*.obj -nmake -f m2 -nmake -f m2 -nmake -f m2 -out\ssleay speed rsa rc4 idea des >speed.4l - -type speed.1 >speed.log -type speed.1l >>speed.log -perl util\sp-diff.pl speed.1l speed.2l >>speed.log -perl util\sp-diff.pl speed.1l speed.3l >>speed.log -perl util\sp-diff.pl speed.1l speed.4l >>speed.log - diff --git a/util/mk1mf.pl b/util/mk1mf.pl index b519210b45..5d16b5839e 100755 --- a/util/mk1mf.pl +++ b/util/mk1mf.pl @@ -26,15 +26,9 @@ $infile="MINFO"; "VC-WIN32", "Microsoft Visual C++ [4-6] - Windows NT or 9X", "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", @@ -125,25 +119,7 @@ $bin_dir=(defined($VARS{'BIN'}))?$VARS{'BIN'}:''; $NT=0; push(@INC,"util/pl","pl"); -if ($platform eq "VC-MSDOS") - { - $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")) +if (($platform eq "VC-WIN32") || ($platform eq "VC-NT")) { $NT = 1 if $platform eq "VC-NT"; require 'VC-32.pl'; @@ -165,23 +141,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'; diff --git a/util/pl/BC-16.pl b/util/pl/BC-16.pl deleted file mode 100644 index 2033f524ca..0000000000 --- a/util/pl/BC-16.pl +++ /dev/null @@ -1,146 +0,0 @@ -#!/usr/local/bin/perl -# VCw16lib.pl - the file for Visual C++ 1.52b for windows, static libraries -# - -$o='\\'; -$cp='copy'; -$rm='del'; - -# C compiler stuff -$cc='bcc'; - -if ($debug) - { $op="-v "; } -else { $op="-O "; } - -$cflags="-d -ml $op -DL_ENDIAN"; -# I add the stack opt -$base_lflags="/c /C"; -$lflags="$base_lflags"; - -if ($win16) - { - $shlib=1; - $cflags.=" -DOPENSSL_SYSNAME_WIN16"; - $app_cflag="-W"; - $lib_cflag="-WD"; - $lflags.="/Twe"; - } -else - { - $cflags.=" -DOENSSL_SYSNAME_MSDOS"; - $lflags.=" /Tde"; - } - -if ($shlib) - { - $mlflags=" /Twd $base_lflags"; # stack if defined in .def file - $libs="libw ldllcew"; - $no_asm=1; - } -else - { $mlflags=''; } - -$obj='.obj'; -$ofile="-o"; - -# EXE linking stuff -$link="tlink"; -$efile=""; -$exep='.exe'; -$ex_libs="CL"; -$ex_libs.=$no_sock?"":" winsock.lib"; - -$app_ex_obj="C0L.obj "; -$shlib_ex_obj="" if ($shlib); - -# static library stuff -$mklib='tlib'; -$ranlib='echo no ranlib'; -$plib=""; -$libp=".lib"; -$shlibp=($shlib)?".dll":".lib"; -$lfile=''; - -$asm='bcc -c -B -Tml'; -$afile='/o'; -if ($no_asm) - { - $bn_asm_obj=''; - $bn_asm_src=''; - } -elsif ($asmbits == 32) - { - $bn_asm_obj='crypto\bn\asm\x86w32.obj'; - $bn_asm_src='crypto\bn\asm\x86w32.asm'; - } -else - { - $bn_asm_obj='crypto\bn\asm\x86w16.obj'; - $bn_asm_src='crypto\bn\asm\x86w16.asm'; - } - -sub do_lib_rule - { - local($target,$name,$shlib)=@_; - local($ret,$Name); - - $taget =~ s/\//$o/g if $o ne '/'; - ($Name=$name) =~ tr/a-z/A-Z/; - - $ret.="$target: \$(${Name}OBJ)\n"; - $ret.="\t\$(RM) \$(O_$Name)\n"; - - # Due to a pathetic line length limit, I unwrap the args. - local($lib_names)=""; - local($dll_names)=""; - foreach $_ (sort split(/\s+/,$Vars{"${Name}OBJ"})) - { - $lib_names.=" +$_ &\n"; - $dll_names.=" $_\n"; - } - - if (!$shlib) - { - $ret.="\t\$(MKLIB) $target & <<|\n$lib_names\n,\n|\n"; - } - else - { - local($ex)=($Name eq "SSL")?' $(L_CRYPTO) winsock':""; - $ret.="\t\$(LINK) \$(MLFLAGS) @&&|\n"; - $ret.=$dll_names; - $ret.="\n $target\n\n $ex $libs\nms$o${name}16.def;\n|\n"; - ($out_lib=$target) =~ s/O_/L_/; - $ret.="\timplib /nowep $out_lib $target\n\n"; - } - $ret.="\n"; - return($ret); - } - -sub do_link_rule - { - local($target,$files,$dep_libs,$libs)=@_; - local($ret,$f,$_,@f); - - $file =~ s/\//$o/g if $o ne '/'; - $n=&bname($targer); - $ret.="$target: $files $dep_libs\n"; - $ret.=" \$(LINK) @&&|"; - - # Due to a pathetic line length limit, I have to unwrap the args. - $ret.=" \$(LFLAGS) "; - if ($files =~ /\(([^)]*)\)$/) - { - $ret.=" \$(APP_EX_OBJ)"; - foreach $_ (sort split(/\s+/,$Vars{$1})) - { $ret.="\n $r $_ +"; } - chop($ret); - $ret.="\n"; - } - else - { $ret.="\n $r \$(APP_EX_OBJ) $files\n"; } - $ret.=" $target\n\n $libs\n\n|\n\n"; - return($ret); - } - -1; diff --git a/util/pl/VC-16.pl b/util/pl/VC-16.pl deleted file mode 100644 index ab97c4c9b8..0000000000 --- a/util/pl/VC-16.pl +++ /dev/null @@ -1,172 +0,0 @@ -#!/usr/local/bin/perl -# VCw16lib.pl - the file for Visual C++ 1.52b for windows, static libraries -# - -$ssl= "ssleay16"; -$crypto="libeay16"; - -$o='\\'; -$cp='copy'; -$rm='del'; - -# C compiler stuff -$cc='cl'; - -$out_def="out16"; -$tmp_def="tmp16"; -$inc_def="inc16"; - -if ($debug) - { - $op="/Od /Zi /Zd"; - $base_lflags="/CO"; - } -else { - $op="/G2 /f- /Ocgnotb2"; - } -$base_lflags.=" /FARCALL /NOLOGO /NOD /SEG:1024 /ONERROR:NOEXE /NOE /PACKC:60000"; -if ($win16) { $base_lflags.=" /PACKD:60000"; } - -$cflags="/ALw /Gx- /Gt256 /Gf $op /W3 /WX -DL_ENDIAN /nologo"; -# I add the stack opt -$lflags="$base_lflags /STACK:20000"; - -if ($win16) - { - $cflags.=" -DOPENSSL_SYSNAME_WIN16"; - $app_cflag="/Gw /FPi87"; - $lib_cflag="/Gw"; - $lib_cflag.=" -D_WINDLL -D_DLL" if $shlib; - $lib_cflag.=" -DWIN16TTY" if !$shlib; - $lflags.=" /ALIGN:256"; - $ex_libs.="oldnames llibcewq libw"; - } -else - { - $no_sock=1; - $cflags.=" -DOPENSSL_SYSNAME_MSDOS"; - $lflags.=" /EXEPACK"; - $ex_libs.="oldnames.lib llibce.lib"; - } - -if ($shlib) - { - $mlflags="$base_lflags"; - $libs="oldnames ldllcew libw"; - $shlib_ex_obj=""; -# $no_asm=1; - $out_def="out16dll"; - $tmp_def="tmp16dll"; - } -else - { $mlflags=''; } - -$app_ex_obj="setargv.obj"; - -$obj='.obj'; -$ofile="/Fo"; - -# EXE linking stuff -$link="link"; -$efile=""; -$exep='.exe'; -$ex_libs.=$no_sock?"":" winsock"; - -# static library stuff -$mklib='lib /PAGESIZE:1024'; -$ranlib=''; -$plib=""; -$libp=".lib"; -$shlibp=($shlib)?".dll":".lib"; -$lfile=''; - -$asm='ml /Cp /c /Cx'; -$afile='/Fo'; - -$bn_asm_obj=''; -$bn_asm_src=''; -$des_enc_obj=''; -$des_enc_src=''; -$bf_enc_obj=''; -$bf_enc_src=''; - -if (!$no_asm) - { - if ($asmbits == 32) - { - $bn_asm_obj='crypto\bn\asm\x86w32.obj'; - $bn_asm_src='crypto\bn\asm\x86w32.asm'; - } - else - { - $bn_asm_obj='crypto\bn\asm\x86w16.obj'; - $bn_asm_src='crypto\bn\asm\x86w16.asm'; - } - } - -sub do_lib_rule - { - local($objs,$target,$name,$shlib)=@_; - local($ret,$Name); - - $taget =~ s/\//$o/g if $o ne '/'; - ($Name=$name) =~ tr/a-z/A-Z/; - -# $target="\$(LIB_D)$o$target"; - $ret.="$target: $objs\n"; -# $ret.="\t\$(RM) \$(O_$Name)\n"; - - # Due to a pathetic line length limit, I unwrap the args. - local($lib_names)=""; - local($dll_names)=" \$(SHLIB_EX_OBJ) +\n"; - ($obj)= ($objs =~ /\((.*)\)/); - foreach $_ (sort split(/\s+/,$Vars{$obj})) - { - $lib_names.="+$_ &\n"; - $dll_names.=" $_ +\n"; - } - - if (!$shlib) - { - $ret.="\tdel $target\n"; - $ret.="\t\$(MKLIB) @<<\n$target\ny\n$lib_names\n\n<<\n"; - } - else - { - local($ex)=($target =~ /O_SSL/)?'$(L_CRYPTO)':""; - $ex.=' winsock'; - $ret.="\t\$(LINK) \$(MLFLAGS) @<<\n"; - $ret.=$dll_names; - $ret.="\n $target\n\n $ex $libs\nms$o${name}.def;\n<<\n"; - ($out_lib=$target) =~ s/O_/L_/; - $ret.="\timplib /noignorecase /nowep $out_lib $target\n"; - } - $ret.="\n"; - return($ret); - } - -sub do_link_rule - { - local($target,$files,$dep_libs,$libs)=@_; - local($ret,$f,$_,@f); - - $file =~ s/\//$o/g if $o ne '/'; - $n=&bname($targer); - $ret.="$target: $files $dep_libs\n"; - $ret.=" \$(LINK) \$(LFLAGS) @<<\n"; - - # Due to a pathetic line length limit, I have to unwrap the args. - if ($files =~ /\(([^)]*)\)$/) - { - @a=('$(APP_EX_OBJ)'); - push(@a,sort split(/\s+/,$Vars{$1})); - for $_ (@a) - { $ret.=" $_ +\n"; } - } - else - { $ret.=" \$(APP_EX_OBJ) $files"; } - $ret.="\n $target\n\n $libs\n\n<<\n\n"; - return($ret); - } - -1; -- 2.25.1