Recognise fipscheck option and call fipsas for WIN64 builds.

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index f00909a0a34fad5d7268a333b8b5fd559df8ce76..4bf4a1aea283c4524761c3ecc20a4f30ce9e0558 100755 (executable)
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -1375,6 +1375,7 @@ sub read_options
                "fips" => \$fips,
                "fipscanisterbuild" => [\$fips, \$fipscanisterbuild],
                "fipscanisteronly" => [\$fips, \$fipscanisterbuild, \$fipscanisteronly],
+               "fipscheck" => [\$fips, \$fipscanisterbuild, \$fipscanisteronly],
                );
 
        if (exists $valid_options{$_})

diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl
index 693adae6e4778b5b2148e1a0e233ab9d243bef83..6918e8898d1e0b3df3636d3b469b0695b1d2a130 100644 (file)
--- a/util/pl/VC-32.pl
+++ b/util/pl/VC-32.pl
@@ -64,6 +64,10 @@ if ($FLAVOR =~ /WIN64/)
 \$(TMP_D)$o$bname.asm: $source
        set ASM=\$(ASM)
        \$(PERL) $source \$\@
+___
+       $ret .= "\t\$(PERL) util\\fipsas.pl . \$@ norunasm \$(CFLAG)\n" if $fipscanisterbuild;
+
+       $ret.=<<___;
 
 $target: \$(TMP_D)$o$bname.asm
        \$(ASM) $afile\$\@ \$(TMP_D)$o$bname.asm