Update to VC++ in-core fingerprinting support.

diff --git a/ms/do_masm.bat b/ms/do_masm.bat
index 61c52562f7f95a35cc3d90eaaa3fe891469edc81..ce22a44305417993db1871b6a1252e3261d1bd8c 100755 (executable)
--- a/ms/do_masm.bat
+++ b/ms/do_masm.bat
@@ -1,4 +1,3 @@
-rem use "fips" as the first argument to make a proper FIPS build.\r
 \r
 @echo off\r
 echo Generating x86 for MASM assember\r
@@ -60,7 +59,7 @@ echo on
 perl util\mkfiles.pl >MINFO\r
 rem perl util\mk1mf.pl no-sock %1 VC-MSDOS >ms\msdos.mak\r
 rem perl util\mk1mf.pl %1 VC-W31-32 >ms\w31.mak\r
-perl util\mk1mf.pl dll %1 VC-W31-32 >ms\w31dll.mak\r
+rem perl util\mk1mf.pl dll %1 VC-W31-32 >ms\w31dll.mak\r
 perl util\mk1mf.pl %1 VC-WIN32 >ms\nt.mak\r
 perl util\mk1mf.pl dll %1 VC-WIN32 >ms\ntdll.mak\r
 \r

diff --git a/ms/do_ms.bat b/ms/do_ms.bat
index 72179708bf11350d63cd45bf134d75659be38e1d..4a769212981d657ff05037abd0d5a9847beb33a2 100755 (executable)
--- a/ms/do_ms.bat
+++ b/ms/do_ms.bat
@@ -2,7 +2,7 @@
 perl util\mkfiles.pl >MINFO\r
 rem perl util\mk1mf.pl no-sock %1 VC-MSDOS >ms\msdos.mak\r
 rem perl util\mk1mf.pl %1 VC-W31-32 >ms\w31.mak\r
-perl util\mk1mf.pl dll %1 VC-W31-32 >ms\w31dll.mak\r
+rem perl util\mk1mf.pl dll %1 VC-W31-32 >ms\w31dll.mak\r
 perl util\mk1mf.pl no-asm %1 VC-WIN32 >ms\nt.mak\r
 perl util\mk1mf.pl dll no-asm %1 VC-WIN32 >ms\ntdll.mak\r
 perl util\mk1mf.pl no-asm %1 VC-CE >ms\ce.mak\r

diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl
index 96889929b63bdae5254dd1d98dc257f9af480d9a..813aa08745d6abc54939c44dbb19b6b155069c7a 100644 (file)
--- a/util/pl/VC-32.pl
+++ b/util/pl/VC-32.pl
@@ -120,10 +120,10 @@ sub do_lib_rule
 
 
 #      $target="\$(LIB_D)$o$target";
-       $ret.="$target: $objs\n";
        if (!$shlib)
                {
 #              $ret.="\t\$(RM) \$(O_$Name)\n";
+               $ret.="$target: $objs\n";
                $ex =' advapi32.lib';
                $ret.="\t\$(MKLIB) $lfile$target @<<\n  $objs $ex\n<<\n";
                }
@@ -134,6 +134,7 @@ sub do_lib_rule
                $ex.=" $zlib_lib" if $zlib_opt == 1 && $target =~ /O_CRYPTO/;
                if (defined $fips_get_sig)
                        {
+                       $ret.="$target: $objs $fips_get_sig\n";
                        $ret.="\tSET FIPS_LINK=\$(LINK)\n";
                        $ret.="\tSET FIPS_CC=\$(CC)\n";
                        $ret.="\tSET FIPS_CC_ARGS=/Fo\$(OBJ_D)${o}fips_premain.obj \$(SHLIB_CFLAGS) -c \$(SRC_D)${o}fips${o}fips_premain.c\n";
@@ -145,6 +146,7 @@ sub do_lib_rule
                        }
                else
                        {
+                       $ret.="$target: $objs\n";
                        $ret.="\t\$(LINK) \$(MLFLAGS) $base_arg $efile$target /def:ms/${Name}.def @<<\n  \$(SHLIB_EX_OBJ) $objs $ex\n<<\n";
                        }
                }