Remove support for Borland C++

Borland C++ 4.5 is very old and our "support" for it is already
non-existent, we might as well remove it.

Reviewed-by: Rich Salz <rsalz@openssl.org>
master
Richard Levitte 7 years ago
parent 4f59fd4d55
commit 8e56a4227b
  1. 3
      CHANGES
  2. 10
      Configurations/10-main.conf
  3. 6
      ms/bcb4.bat
  4. 1
      ms/do_nasm.bat
  5. 6
      util/mk1mf.pl
  6. 162
      util/pl/BC-32.pl

@ -4,6 +4,9 @@
Changes between 1.0.2g and 1.1.0 [xx XXX xxxx]
*) Removed the aged BC-32 config and all its supporting scripts
[Richard Levitte]
*) Add support for HKDF.
[Alessandro Ghedini]

@ -1369,16 +1369,6 @@ sub vc_wince_info {
build_scheme => add("VC-WCE", { separator => undef }),
},
###### Borland C++ 4.5
## "BC-32" => {
## inherit_from => [ "BASE_Windows" ],
## cc => "bcc32",
## sys_id => "WIN32",
## bn_ops => "BN_LLONG EXPORT_VAR_AS_FN",
## dso_scheme => "win32",
## build_scheme => add("BC", { separator => undef }),
## },
#### MinGW
"mingw" => {
inherit_from => [ "BASE_unix", asm("x86_asm"),

@ -1,6 +0,0 @@
perl Configure BC-32
perl util\mkfiles.pl > MINFO
@rem create make file
perl util\mk1mf.pl no-asm BC-NT > bcb.mak

@ -2,7 +2,6 @@
perl util\mkfiles.pl >MINFO
perl util\mk1mf.pl nasm VC-WIN32 >ms\nt.mak
perl util\mk1mf.pl dll nasm VC-WIN32 >ms\ntdll.mak
perl util\mk1mf.pl nasm BC-NT >ms\bcb.mak
perl util\mkdef.pl 32 libcrypto > ms\libcrypto32.def
perl util\mkdef.pl 32 libssl > ms\libssl32.def

@ -106,7 +106,6 @@ $infile="MINFO";
"VC-NT", "Microsoft Visual C++ [4-6] - Windows NT ONLY",
"Mingw32", "GNU C++ - Windows NT or 9x",
"Mingw32-files", "Create files with DOS copy ...",
"BC-NT", "Borland C++ 4.5 - Windows NT",
"linux-elf","Linux elf",
"ultrix-mips","DEC mips ultrix",
"FreeBSD","FreeBSD distribution",
@ -224,11 +223,6 @@ elsif ($platform eq "Mingw32-files")
{
require 'Mingw32f.pl';
}
elsif ($platform eq "BC-NT")
{
$bc=1;
require 'BC-32.pl';
}
elsif ($platform eq "FreeBSD")
{
require 'unix.pl';

@ -1,162 +0,0 @@
#!/usr/local/bin/perl
# Borland C++ builder 3 and 4 -- Janez Jere <jj@void.si>
#
$ssl= "libssl32";
$crypto="libcrypto32";
$o='\\';
$cp='copy';
$rm='del';
$mv='move /Y';
# C compiler stuff
$cc='bcc32';
$lflags="-ap -Tpe -x -Gn ";
$mlflags='';
$out_def="out32";
$tmp_def="tmp32";
$inc_def="inc32";
#enable max error messages, disable most common warnings
$cflags="-DWIN32_LEAN_AND_MEAN -q -w-ccc -w-rch -w-pia -w-aus -w-par -w-inl -c -tWC -tWM -DOPENSSL_SYS_WIN32 -DL_ENDIAN -DDSO_WIN32 -D_stricmp=stricmp -D_strnicmp=strnicmp ";
if ($debug)
{
$cflags.="-Od -y -v -vi- -D_DEBUG";
$mlflags.=' ';
}
else
{
$cflags.="-O2 -ff -fp";
}
$obj='.obj';
$ofile="-o";
# EXE linking stuff
$link="ilink32";
$efile="";
$exep='.exe';
if ($no_sock)
{ $ex_libs=""; }
else { $ex_libs="cw32mt.lib import32.lib crypt32.lib ws2_32.lib"; }
# static library stuff
$mklib='tlib /P64';
$ranlib='';
$plib="";
$libp=".lib";
$shlibp=($shlib)?".dll":".lib";
$lfile='';
$shlib_ex_obj="";
$app_ex_obj="c0x32.obj";
$asm=(`nasm -v 2>NUL` ge `nasmw -v 2>NUL`?"nasm":"nasmw")." -f obj -d__omf__";
$asm.=" -g" if $debug;
$afile='-o';
$bn_mulw_obj='';
$bn_mulw_src='';
$des_enc_obj='';
$des_enc_src='';
$bf_enc_obj='';
$bf_enc_src='';
if (!$no_asm)
{
$bn_mulw_obj='crypto\bn\asm\bn_win32.obj';
$bn_mulw_src='crypto\bn\asm\bn_win32.asm';
$des_enc_obj='crypto\des\asm\d_win32.obj crypto\des\asm\y_win32.obj';
$des_enc_src='crypto\des\asm\d_win32.asm crypto\des\asm\y_win32.asm';
$bf_enc_obj='crypto\bf\asm\b_win32.obj';
$bf_enc_src='crypto\bf\asm\b_win32.asm';
$cast_enc_obj='crypto\cast\asm\c_win32.obj';
$cast_enc_src='crypto\cast\asm\c_win32.asm';
$rc4_enc_obj='crypto\rc4\asm\r4_win32.obj';
$rc4_enc_src='crypto\rc4\asm\r4_win32.asm';
$rc5_enc_obj='crypto\rc5\asm\r5_win32.obj';
$rc5_enc_src='crypto\rc5\asm\r5_win32.asm';
$md5_asm_obj='crypto\md5\asm\m5_win32.obj';
$md5_asm_src='crypto\md5\asm\m5_win32.asm';
$sha1_asm_obj='crypto\sha\asm\s1_win32.obj';
$sha1_asm_src='crypto\sha\asm\s1_win32.asm';
$rmd160_asm_obj='crypto\ripemd\asm\rm_win32.obj';
$rmd160_asm_src='crypto\ripemd\asm\rm_win32.asm';
$cflags.=" -DBN_ASM -DMD5_ASM -DSHA1_ASM -DRMD160_ASM";
}
if ($shlib)
{
$mlflags.=" $lflags /dll";
# $cflags =~ s| /MD| /MT|;
$lib_cflag=" /GD -D_WINDLL -D_DLL";
$out_def="out32dll";
$tmp_def="tmp32dll";
}
sub do_rehash_rule {
my ($target, $deps) = @_;
my $ret = <<"EOF";
$target: $deps
echo off > $target
EOF
return $ret
}
sub do_test_rule {
my ($target, $deps, $test_cmd) = @_;
my $ret = <<"EOF";
$target: $deps force.$target
set TOP=.
set BIN_D=\$(BIN_D)
set TEST_D=\$(TEST_D)
set OPENSSL_ENGINES=\$(ENG_D)
set PERL=\$(PERL)
\$(PERL) test\\$test_cmd \$(TESTS)
force.$target:
EOF
}
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";
if (!$shlib)
{
$ret.=<<___;
-\$(RM) $lfile$target
\$(MKLIB) $lfile$target \@&&!
+\$(**: = &^
+)
!
___
}
else
{
local($ex)=($target =~ /O_SSL/)?' $(L_CRYPTO)':'';
$ex.=' ws2_32.lib gdi32.lib';
$ret.="\t\$(LINK_CMD) \$(MLFLAGS) $efile$target /def:ms/${Name}.def @<<\n \$(SHLIB_EX_OBJ) $objs $ex\n<<\n";
}
$ret.="\n";
return($ret);
}
sub do_link_rule
{
local($target,$files,$dep_libs,$libs)=@_;
local($ret,$_);
$file =~ s/\//$o/g if $o ne '/';
$n=&bname($target);
$ret.="$target: $files $dep_libs\n";
$ret.="\t\$(LINK_CMD) \$(LFLAGS) $files \$(APP_EX_OBJ), $target,, $libs\n\n";
return($ret);
}
1;
Loading…
Cancel
Save