diff options
Diffstat (limited to 'src/lib/libcrypto/util/pl/Mingw32.pl')
-rw-r--r-- | src/lib/libcrypto/util/pl/Mingw32.pl | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/lib/libcrypto/util/pl/Mingw32.pl b/src/lib/libcrypto/util/pl/Mingw32.pl index 8f0483fb93..b9bb24d21d 100644 --- a/src/lib/libcrypto/util/pl/Mingw32.pl +++ b/src/lib/libcrypto/util/pl/Mingw32.pl | |||
@@ -19,9 +19,9 @@ $cc='gcc'; | |||
19 | if ($debug) | 19 | if ($debug) |
20 | { $cflags="-DL_ENDIAN -DDSO_WIN32 -g2 -ggdb"; } | 20 | { $cflags="-DL_ENDIAN -DDSO_WIN32 -g2 -ggdb"; } |
21 | else | 21 | else |
22 | { $cflags="-DL_ENDIAN -DDSO_WIN32 -fomit-frame-pointer -O3 -march=i486 -Wall"; } | 22 | { $cflags="-DL_ENDIAN -DDSO_WIN32 -fomit-frame-pointer -O3 -mcpu=i486 -Wall"; } |
23 | 23 | ||
24 | if ($gaswin and !$no_asm) | 24 | if ($gaswin and !$no_asm and !$fips) |
25 | { | 25 | { |
26 | $bn_asm_obj='$(OBJ_D)\bn-win32.o'; | 26 | $bn_asm_obj='$(OBJ_D)\bn-win32.o'; |
27 | $bn_asm_src='crypto/bn/asm/bn-win32.s'; | 27 | $bn_asm_src='crypto/bn/asm/bn-win32.s'; |
@@ -43,9 +43,7 @@ if ($gaswin and !$no_asm) | |||
43 | $rmd160_asm_src='crypto/ripemd/asm/rm-win32.s'; | 43 | $rmd160_asm_src='crypto/ripemd/asm/rm-win32.s'; |
44 | $sha1_asm_obj='$(OBJ_D)\s1-win32.o'; | 44 | $sha1_asm_obj='$(OBJ_D)\s1-win32.o'; |
45 | $sha1_asm_src='crypto/sha/asm/s1-win32.s'; | 45 | $sha1_asm_src='crypto/sha/asm/s1-win32.s'; |
46 | $cpuid_asm_obj='$(OBJ_D)\cpu-win32.o'; | 46 | $cflags.=" -DBN_ASM -DMD5_ASM -DSHA1_ASM"; |
47 | $cpuid_asm_src='crypto/cpu-win32.s'; | ||
48 | $cflags.=" -DBN_ASM -DMD5_ASM -DSHA1_ASM -DOPENSSL_BN_ASM_PART_WORDS"; | ||
49 | } | 47 | } |
50 | 48 | ||
51 | 49 | ||
@@ -94,13 +92,18 @@ sub do_lib_rule | |||
94 | 92 | ||
95 | sub do_link_rule | 93 | sub do_link_rule |
96 | { | 94 | { |
97 | local($target,$files,$dep_libs,$libs)=@_; | 95 | local($target,$files,$dep_libs,$libs,$sha1file,$openssl)=@_; |
98 | local($ret,$_); | 96 | local($ret,$_); |
99 | 97 | ||
100 | $file =~ s/\//$o/g if $o ne '/'; | 98 | $file =~ s/\//$o/g if $o ne '/'; |
101 | $n=&bname($target); | 99 | $n=&bname($target); |
102 | $ret.="$target: $files $dep_libs\n"; | 100 | $ret.="$target: $files $dep_libs\n"; |
103 | $ret.="\t\$(LINK) ${efile}$target \$(LFLAGS) $files $libs\n\n"; | 101 | $ret.="\t\$(LINK) ${efile}$target \$(LFLAGS) $files $libs\n"; |
102 | if (defined $sha1file) | ||
103 | { | ||
104 | $ret.="\t$openssl sha1 -hmac etaonrishdlcupfm -binary $target > $sha1file"; | ||
105 | } | ||
106 | $ret.="\n"; | ||
104 | return($ret); | 107 | return($ret); |
105 | } | 108 | } |
106 | 1; | 109 | 1; |