diff options
Diffstat (limited to 'util/pl')
| -rw-r--r-- | util/pl/BC-32.pl | 2 | ||||
| -rw-r--r-- | util/pl/Mingw32.pl | 25 | ||||
| -rw-r--r-- | util/pl/linux.pl | 2 |
3 files changed, 2 insertions, 27 deletions
diff --git a/util/pl/BC-32.pl b/util/pl/BC-32.pl index 7f57809a165..df6e2c742e4 100644 --- a/util/pl/BC-32.pl +++ b/util/pl/BC-32.pl @@ -109,7 +109,7 @@ sub do_lib_rule { # $ret.="\t\$(RM) \$(O_$Name)\n"; $ret.="\techo LIB $<\n"; - $ret.="\t&\$(MKLIB) $lfile$target -+\$**\n"; + $ret.="\t\$(MKLIB) $lfile$target \$(addprefix +, $objs)\n"; } else { diff --git a/util/pl/Mingw32.pl b/util/pl/Mingw32.pl index c687d9b1185..585cacd8203 100644 --- a/util/pl/Mingw32.pl +++ b/util/pl/Mingw32.pl @@ -21,30 +21,6 @@ if ($debug) else { $cflags="-DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall"; } -if ($gaswin and !$no_asm) - { - $bn_asm_obj='$(OBJ_D)/bn-win32.o'; - $bn_asm_src='crypto/bn/asm/bn-win32.s'; - $des_enc_obj='$(OBJ_D)/d-win32.o $(OBJ_D)/y-win32.o'; - $des_enc_src='crypto/des/asm/d-win32.s crypto/des/asm/y-win32.s'; - $bf_enc_obj='$(OBJ_D)/b-win32.o'; - $bf_enc_src='crypto/bf/asm/b-win32.s'; -# $cast_enc_obj='$(OBJ_D)/c-win32.o'; -# $cast_enc_src='crypto/cast/asm/c-win32.s'; - $rc4_enc_obj='$(OBJ_D)/r4-win32.o'; - $rc4_enc_src='crypto/rc4/asm/r4-win32.s'; - $rc5_enc_obj='$(OBJ_D)/r5-win32.o'; - $rc5_enc_src='crypto/rc5/asm/r5-win32.s'; - $md5_asm_obj='$(OBJ_D)/m5-win32.o'; - $md5_asm_src='crypto/md5/asm/m5-win32.s'; - $rmd160_asm_obj='$(OBJ_D)/rm-win32.o'; - $rmd160_asm_src='crypto/ripemd/asm/rm-win32.s'; - $sha1_asm_obj='$(OBJ_D)/s1-win32.o'; - $sha1_asm_src='crypto/sha/asm/s1-win32.s'; - $cflags.=" -DBN_ASM -DMD5_ASM -DSHA1_ASM"; - } - - $obj='.o'; $ofile='-o '; @@ -100,3 +76,4 @@ sub do_link_rule return($ret); } 1; + diff --git a/util/pl/linux.pl b/util/pl/linux.pl index 3e497553265..a8cfdc578ad 100644 --- a/util/pl/linux.pl +++ b/util/pl/linux.pl @@ -19,8 +19,6 @@ 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'; |