Commit deb3b08f authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Add /fixed flag for FIPS links where appropriate. 

(cherry picked from commit c55fef76)

Conflicts:

	util/pl/VC-32.pl
parent b45b3efd

util/pl/VC-32.pl

+5 −2
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ $zlib_lib="zlib1.lib"; 
$l_flags =~ s/-L("\[^"]+")/\/libpath:$1/g;

$l_flags =~ s/-L(\S+)/\/libpath:$1/g;



my $ff = "";



# C compiler stuff

$cc='cl';

if ($FLAVOR =~ /WIN64/)
@@ -126,6 +128,7 @@ else # Win32 
    $base_cflags= " $mf_cflag";

    my $f = $shlib || $fips ?' /MD':' /MT';

    $lib_cflag='/Zl' if (!$shlib);	# remove /DEFAULTLIBs from static lib

    $ff = "/fixed";

    $opt_cflags=$f.' /Ox /O2 /Ob2';

    $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG';

    $lflags="/nologo /subsystem:console /opt:ref";
@@ -318,7 +321,7 @@ sub do_lib_rule 
			$ret.="\tSET FIPS_SHA1_EXE=\$(FIPS_SHA1_EXE)\n";

			$ret.="\tSET FIPS_TARGET=$target\n";

			$ret.="\tSET FIPSLIB_D=\$(FIPSLIB_D)\n";

			$ret.="\t\$(FIPSLINK) \$(MLFLAGS) /map $base_arg $efile$target ";

			$ret.="\t\$(FIPSLINK) \$(MLFLAGS) $ff /map $base_arg $efile$target ";

			$ret.="$name @<<\n  \$(SHLIB_EX_OBJ) $objs \$(EX_LIBS) ";

			$ret.="\$(OBJ_D)${o}fips_premain.obj $ex\n<<\n";

			}
@@ -355,7 +358,7 @@ sub do_link_rule 
		$ret.="\tSET FIPS_TARGET=$target\n";

		$ret.="\tSET FIPS_SHA1_EXE=\$(FIPS_SHA1_EXE)\n";

		$ret.="\tSET FIPSLIB_D=\$(FIPSLIB_D)\n";

		$ret.="\t\$(FIPSLINK) \$(LFLAGS) /map $efile$target @<<\n";

		$ret.="\t\$(FIPSLINK) \$(LFLAGS) $ff /map $efile$target @<<\n";

		$ret.="\t\$(APP_EX_OBJ) $files \$(OBJ_D)${o}fips_premain.obj $libs\n<<\n";

		}

	else