diff options
Diffstat (limited to 'src/lib/libcrypto/util/pl/VC-32.pl')
-rw-r--r-- | src/lib/libcrypto/util/pl/VC-32.pl | 79 |
1 files changed, 10 insertions, 69 deletions
diff --git a/src/lib/libcrypto/util/pl/VC-32.pl b/src/lib/libcrypto/util/pl/VC-32.pl index c503bd52b9..5f25fc41bf 100644 --- a/src/lib/libcrypto/util/pl/VC-32.pl +++ b/src/lib/libcrypto/util/pl/VC-32.pl | |||
@@ -6,16 +6,6 @@ | |||
6 | $ssl= "ssleay32"; | 6 | $ssl= "ssleay32"; |
7 | $crypto="libeay32"; | 7 | $crypto="libeay32"; |
8 | 8 | ||
9 | if ($fips && !$shlib) | ||
10 | { | ||
11 | $crypto="libeayfips32"; | ||
12 | $crypto_compat = "libeaycompat32.lib"; | ||
13 | } | ||
14 | else | ||
15 | { | ||
16 | $crypto="libeay32"; | ||
17 | } | ||
18 | |||
19 | $o='\\'; | 9 | $o='\\'; |
20 | $cp='$(PERL) util/copy.pl'; | 10 | $cp='$(PERL) util/copy.pl'; |
21 | $mkdir='$(PERL) util/mkdir-p.pl'; | 11 | $mkdir='$(PERL) util/mkdir-p.pl'; |
@@ -43,7 +33,7 @@ if ($FLAVOR =~ /WIN64/) | |||
43 | # considered safe to ignore. | 33 | # considered safe to ignore. |
44 | # | 34 | # |
45 | $base_cflags= " $mf_cflag"; | 35 | $base_cflags= " $mf_cflag"; |
46 | my $f = $shlib || $fips ?' /MD':' /MT'; | 36 | my $f = $shlib?' /MD':' /MT'; |
47 | $lib_cflag='/Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib | 37 | $lib_cflag='/Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib |
48 | $opt_cflags=$f.' /Ox'; | 38 | $opt_cflags=$f.' /Ox'; |
49 | $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG'; | 39 | $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG'; |
@@ -124,7 +114,7 @@ elsif ($FLAVOR =~ /CE/) | |||
124 | else # Win32 | 114 | else # Win32 |
125 | { | 115 | { |
126 | $base_cflags= " $mf_cflag"; | 116 | $base_cflags= " $mf_cflag"; |
127 | my $f = $shlib || $fips ?' /MD':' /MT'; | 117 | my $f = $shlib?' /MD':' /MT'; |
128 | $lib_cflag='/Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib | 118 | $lib_cflag='/Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib |
129 | $opt_cflags=$f.' /Ox /O2 /Ob2'; | 119 | $opt_cflags=$f.' /Ox /O2 /Ob2'; |
130 | $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG'; | 120 | $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG'; |
@@ -276,19 +266,10 @@ elsif ($shlib && $FLAVOR =~ /CE/) | |||
276 | 266 | ||
277 | sub do_lib_rule | 267 | sub do_lib_rule |
278 | { | 268 | { |
279 | my($objs,$target,$name,$shlib,$ign,$base_addr) = @_; | 269 | local($objs,$target,$name,$shlib)=@_; |
280 | local($ret); | 270 | local($ret); |
281 | 271 | ||
282 | $taget =~ s/\//$o/g if $o ne '/'; | 272 | $taget =~ s/\//$o/g if $o ne '/'; |
283 | my $base_arg; | ||
284 | if ($base_addr ne "") | ||
285 | { | ||
286 | $base_arg= " /base:$base_addr"; | ||
287 | } | ||
288 | else | ||
289 | { | ||
290 | $base_arg = ""; | ||
291 | } | ||
292 | if ($name ne "") | 273 | if ($name ne "") |
293 | { | 274 | { |
294 | $name =~ tr/a-z/A-Z/; | 275 | $name =~ tr/a-z/A-Z/; |
@@ -296,37 +277,17 @@ sub do_lib_rule | |||
296 | } | 277 | } |
297 | 278 | ||
298 | # $target="\$(LIB_D)$o$target"; | 279 | # $target="\$(LIB_D)$o$target"; |
299 | # $ret.="$target: $objs\n"; | 280 | $ret.="$target: $objs\n"; |
300 | if (!$shlib) | 281 | if (!$shlib) |
301 | { | 282 | { |
302 | # $ret.="\t\$(RM) \$(O_$Name)\n"; | 283 | # $ret.="\t\$(RM) \$(O_$Name)\n"; |
303 | $ret.="$target: $objs\n"; | ||
304 | $ret.="\t\$(MKLIB) $lfile$target @<<\n $objs\n<<\n"; | 284 | $ret.="\t\$(MKLIB) $lfile$target @<<\n $objs\n<<\n"; |
305 | } | 285 | } |
306 | else | 286 | else |
307 | { | 287 | { |
308 | local($ex)=($target =~ /O_CRYPTO/)?'':' $(L_CRYPTO)'; | 288 | local($ex)=($target =~ /O_CRYPTO/)?'':' $(L_CRYPTO)'; |
309 | $ex.=" $zlib_lib" if $zlib_opt == 1 && $target =~ /O_CRYPTO/; | 289 | $ex.=" $zlib_lib" if $zlib_opt == 1 && $target =~ /O_CRYPTO/; |
310 | 290 | $ret.="\t\$(LINK) \$(MLFLAGS) $efile$target $name @<<\n \$(SHLIB_EX_OBJ) $objs $ex \$(EX_LIBS)\n<<\n"; | |
311 | if ($fips && $target =~ /O_CRYPTO/) | ||
312 | { | ||
313 | $ret.="$target: $objs \$(PREMAIN_DSO_EXE)"; | ||
314 | $ret.="\n\tSET FIPS_LINK=\$(LINK)\n"; | ||
315 | $ret.="\tSET FIPS_CC=\$(CC)\n"; | ||
316 | $ret.="\tSET FIPS_CC_ARGS=/Fo\$(OBJ_D)${o}fips_premain.obj \$(SHLIB_CFLAGS) -c\n"; | ||
317 | $ret.="\tSET PREMAIN_DSO_EXE=\$(PREMAIN_DSO_EXE)\n"; | ||
318 | $ret.="\tSET FIPS_SHA1_EXE=\$(FIPS_SHA1_EXE)\n"; | ||
319 | $ret.="\tSET FIPS_TARGET=$target\n"; | ||
320 | $ret.="\tSET FIPSLIB_D=\$(FIPSLIB_D)\n"; | ||
321 | $ret.="\t\$(FIPSLINK) \$(MLFLAGS) /map $base_arg $efile$target "; | ||
322 | $ret.="$name @<<\n \$(SHLIB_EX_OBJ) $objs \$(EX_LIBS) "; | ||
323 | $ret.="\$(OBJ_D)${o}fips_premain.obj $ex\n<<\n"; | ||
324 | } | ||
325 | else | ||
326 | { | ||
327 | $ret.="$target: $objs"; | ||
328 | $ret.="\n\t\$(LINK) \$(MLFLAGS) $efile$target $name @<<\n \$(SHLIB_EX_OBJ) $objs $ex \$(EX_LIBS)\n<<\n"; | ||
329 | } | ||
330 | $ret.="\tIF EXIST \$@.manifest mt -nologo -manifest \$@.manifest -outputresource:\$@;2\n\n"; | 291 | $ret.="\tIF EXIST \$@.manifest mt -nologo -manifest \$@.manifest -outputresource:\$@;2\n\n"; |
331 | } | 292 | } |
332 | $ret.="\n"; | 293 | $ret.="\n"; |
@@ -335,35 +296,15 @@ sub do_lib_rule | |||
335 | 296 | ||
336 | sub do_link_rule | 297 | sub do_link_rule |
337 | { | 298 | { |
338 | my($target,$files,$dep_libs,$libs,$standalone)=@_; | 299 | local($target,$files,$dep_libs,$libs)=@_; |
339 | local($ret,$_); | 300 | local($ret,$_); |
301 | |||
340 | $file =~ s/\//$o/g if $o ne '/'; | 302 | $file =~ s/\//$o/g if $o ne '/'; |
341 | $n=&bname($targer); | 303 | $n=&bname($targer); |
342 | $ret.="$target: $files $dep_libs\n"; | 304 | $ret.="$target: $files $dep_libs\n"; |
343 | if ($standalone == 1) | 305 | $ret.="\t\$(LINK) \$(LFLAGS) $efile$target @<<\n"; |
344 | { | 306 | $ret.=" \$(APP_EX_OBJ) $files $libs\n<<\n"; |
345 | $ret.=" \$(LINK) \$(LFLAGS) $efile$target @<<\n\t"; | 307 | $ret.="\tIF EXIST \$@.manifest mt -nologo -manifest \$@.manifest -outputresource:\$@;1\n\n"; |
346 | $ret.= "\$(EX_LIBS) " if ($files =~ /O_FIPSCANISTER/ && !$fipscanisterbuild); | ||
347 | $ret.="$files $libs\n<<\n"; | ||
348 | } | ||
349 | elsif ($standalone == 2) | ||
350 | { | ||
351 | $ret.="\tSET FIPS_LINK=\$(LINK)\n"; | ||
352 | $ret.="\tSET FIPS_CC=\$(CC)\n"; | ||
353 | $ret.="\tSET FIPS_CC_ARGS=/Fo\$(OBJ_D)${o}fips_premain.obj \$(SHLIB_CFLAGS) -c\n"; | ||
354 | $ret.="\tSET PREMAIN_DSO_EXE=\n"; | ||
355 | $ret.="\tSET FIPS_TARGET=$target\n"; | ||
356 | $ret.="\tSET FIPS_SHA1_EXE=\$(FIPS_SHA1_EXE)\n"; | ||
357 | $ret.="\tSET FIPSLIB_D=\$(FIPSLIB_D)\n"; | ||
358 | $ret.="\t\$(FIPSLINK) \$(LFLAGS) /map $efile$target @<<\n"; | ||
359 | $ret.="\t\$(APP_EX_OBJ) $files \$(OBJ_D)${o}fips_premain.obj $libs\n<<\n"; | ||
360 | } | ||
361 | else | ||
362 | { | ||
363 | $ret.="\t\$(LINK) \$(LFLAGS) $efile$target @<<\n"; | ||
364 | $ret.="\t\$(APP_EX_OBJ) $files $libs\n<<\n"; | ||
365 | } | ||
366 | $ret.="\tIF EXIST \$@.manifest mt -nologo -manifest \$@.manifest -outputresource:\$@;1\n\n"; | ||
367 | return($ret); | 308 | return($ret); |
368 | } | 309 | } |
369 | 310 | ||