linux-elf bugfix
Submitted by: Reviewed by: PR:
This commit is contained in:
parent
3973628ea6
commit
b222eb6443
2 changed files with 15 additions and 0 deletions
|
@ -273,6 +273,8 @@ LFLAGS=$lflags
|
|||
|
||||
BN_ASM_OBJ=$bn_asm_obj
|
||||
BN_ASM_SRC=$bn_asm_src
|
||||
BNCO_ASM_OBJ=$bnco_asm_obj
|
||||
BNCO_ASM_SRC=$bnco_asm_src
|
||||
DES_ENC_OBJ=$des_enc_obj
|
||||
DES_ENC_SRC=$des_enc_src
|
||||
BF_ENC_OBJ=$bf_enc_obj
|
||||
|
@ -360,6 +362,10 @@ all: banner \$(TMP_D) \$(BIN_D) \$(TEST_D) \$(LIB_D) \$(INCO_D) headers lib exe
|
|||
banner:
|
||||
$banner
|
||||
|
||||
# Generate perlasm output files
|
||||
%.cpp:
|
||||
(cd \$(\@D)/..; PERL=perl make -f Makefile.ssl asm/\$(\@F))
|
||||
|
||||
\$(TMP_D):
|
||||
\$(MKDIR) \$(TMP_D)
|
||||
# NB: uncomment out these lines if BIN_D, TEST_D and LIB_D are different
|
||||
|
@ -379,6 +385,7 @@ $banner
|
|||
\$(MKDIR) \$(INC_D)
|
||||
|
||||
headers: \$(HEADER) \$(EXHEADER)
|
||||
@
|
||||
|
||||
lib: \$(LIBS_DEP)
|
||||
|
||||
|
@ -539,6 +546,11 @@ foreach (values %lib_nam)
|
|||
$lib_obj =~ s/\s\S*\/bn_asm\S*/ \$(BN_ASM_OBJ)/;
|
||||
$rules.=&do_asm_rule($bn_asm_obj,$bn_asm_src);
|
||||
}
|
||||
if (($bnco_asm_obj ne "") && ($_ eq "CRYPTO"))
|
||||
{
|
||||
$lib_obj .= "\$(BNCO_ASM_OBJ)";
|
||||
$rules.=&do_asm_rule($bnco_asm_obj,$bnco_asm_src);
|
||||
}
|
||||
if (($des_enc_obj ne "") && ($_ eq "CRYPTO"))
|
||||
{
|
||||
$lib_obj =~ s/\s\S*des_enc\S*/ \$(DES_ENC_OBJ)/;
|
||||
|
@ -717,6 +729,7 @@ sub do_defs
|
|||
{ $pf=".c"; }
|
||||
else { $pf=$postfix; }
|
||||
if ($_ =~ /BN_ASM/) { $t="$_ "; }
|
||||
elsif ($_ =~ /BNCO_ASM/){ $t="$_ "; }
|
||||
elsif ($_ =~ /DES_ENC/) { $t="$_ "; }
|
||||
elsif ($_ =~ /BF_ENC/) { $t="$_ "; }
|
||||
elsif ($_ =~ /CAST_ENC/){ $t="$_ "; }
|
||||
|
|
|
@ -19,6 +19,8 @@ if (!$no_asm)
|
|||
{
|
||||
$bn_asm_obj='$(OBJ_D)/bn86-elf.o';
|
||||
$bn_asm_src='crypto/bn/asm/bn86unix.cpp';
|
||||
$bnco_asm_obj='$(OBJ_D)/co86-elf.o';
|
||||
$bnco_asm_src='crypto/bn/asm/co86unix.cpp';
|
||||
$des_enc_obj='$(OBJ_D)/dx86-elf.o $(OBJ_D)/yx86-elf.o';
|
||||
$des_enc_src='crypto/des/asm/dx86unix.cpp crypto/des/asm/yx86unix.cpp';
|
||||
$bf_enc_obj='$(OBJ_D)/bx86-elf.o';
|
||||
|
|
Loading…
Reference in a new issue