diff options
author | beck <> | 2000-04-15 06:18:51 +0000 |
---|---|---|
committer | beck <> | 2000-04-15 06:18:51 +0000 |
commit | b608c7f2b175e121f2c22d53341a317153afdc8e (patch) | |
tree | e94b160b3fcd8180df79e4251d68d24d665f0195 /src/lib/libcrypto/util/pl | |
parent | c8d6701c396cebdcd0d45eac73b762e9498f6b01 (diff) | |
download | openbsd-b608c7f2b175e121f2c22d53341a317153afdc8e.tar.gz openbsd-b608c7f2b175e121f2c22d53341a317153afdc8e.tar.bz2 openbsd-b608c7f2b175e121f2c22d53341a317153afdc8e.zip |
OpenSSL 0.9.5a merge
Diffstat (limited to 'src/lib/libcrypto/util/pl')
-rw-r--r-- | src/lib/libcrypto/util/pl/BC-32.pl | 2 | ||||
-rw-r--r-- | src/lib/libcrypto/util/pl/Mingw32.pl | 25 |
2 files changed, 25 insertions, 2 deletions
diff --git a/src/lib/libcrypto/util/pl/BC-32.pl b/src/lib/libcrypto/util/pl/BC-32.pl index df6e2c742e..7f57809a16 100644 --- a/src/lib/libcrypto/util/pl/BC-32.pl +++ b/src/lib/libcrypto/util/pl/BC-32.pl | |||
@@ -109,7 +109,7 @@ sub do_lib_rule | |||
109 | { | 109 | { |
110 | # $ret.="\t\$(RM) \$(O_$Name)\n"; | 110 | # $ret.="\t\$(RM) \$(O_$Name)\n"; |
111 | $ret.="\techo LIB $<\n"; | 111 | $ret.="\techo LIB $<\n"; |
112 | $ret.="\t\$(MKLIB) $lfile$target \$(addprefix +, $objs)\n"; | 112 | $ret.="\t&\$(MKLIB) $lfile$target -+\$**\n"; |
113 | } | 113 | } |
114 | else | 114 | else |
115 | { | 115 | { |
diff --git a/src/lib/libcrypto/util/pl/Mingw32.pl b/src/lib/libcrypto/util/pl/Mingw32.pl index 585cacd820..c687d9b118 100644 --- a/src/lib/libcrypto/util/pl/Mingw32.pl +++ b/src/lib/libcrypto/util/pl/Mingw32.pl | |||
@@ -21,6 +21,30 @@ if ($debug) | |||
21 | else | 21 | else |
22 | { $cflags="-DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall"; } | 22 | { $cflags="-DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall"; } |
23 | 23 | ||
24 | if ($gaswin and !$no_asm) | ||
25 | { | ||
26 | $bn_asm_obj='$(OBJ_D)/bn-win32.o'; | ||
27 | $bn_asm_src='crypto/bn/asm/bn-win32.s'; | ||
28 | $des_enc_obj='$(OBJ_D)/d-win32.o $(OBJ_D)/y-win32.o'; | ||
29 | $des_enc_src='crypto/des/asm/d-win32.s crypto/des/asm/y-win32.s'; | ||
30 | $bf_enc_obj='$(OBJ_D)/b-win32.o'; | ||
31 | $bf_enc_src='crypto/bf/asm/b-win32.s'; | ||
32 | # $cast_enc_obj='$(OBJ_D)/c-win32.o'; | ||
33 | # $cast_enc_src='crypto/cast/asm/c-win32.s'; | ||
34 | $rc4_enc_obj='$(OBJ_D)/r4-win32.o'; | ||
35 | $rc4_enc_src='crypto/rc4/asm/r4-win32.s'; | ||
36 | $rc5_enc_obj='$(OBJ_D)/r5-win32.o'; | ||
37 | $rc5_enc_src='crypto/rc5/asm/r5-win32.s'; | ||
38 | $md5_asm_obj='$(OBJ_D)/m5-win32.o'; | ||
39 | $md5_asm_src='crypto/md5/asm/m5-win32.s'; | ||
40 | $rmd160_asm_obj='$(OBJ_D)/rm-win32.o'; | ||
41 | $rmd160_asm_src='crypto/ripemd/asm/rm-win32.s'; | ||
42 | $sha1_asm_obj='$(OBJ_D)/s1-win32.o'; | ||
43 | $sha1_asm_src='crypto/sha/asm/s1-win32.s'; | ||
44 | $cflags.=" -DBN_ASM -DMD5_ASM -DSHA1_ASM"; | ||
45 | } | ||
46 | |||
47 | |||
24 | $obj='.o'; | 48 | $obj='.o'; |
25 | $ofile='-o '; | 49 | $ofile='-o '; |
26 | 50 | ||
@@ -76,4 +100,3 @@ sub do_link_rule | |||
76 | return($ret); | 100 | return($ret); |
77 | } | 101 | } |
78 | 1; | 102 | 1; |
79 | |||