root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Cumulative updates from HEAD.

This commit is contained in:
Andy Polyakov 2012-10-29 22:29:29 +00:00
parent 74daafaa94
commit 02620cfcd5
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
e_os.h
View File

@ -306,7 +306,7 @@ static unsigned int _strlen31(const char *str)
# undef isupper # undef isupper
# undef isxdigit # undef isxdigit
# endif # endif
# if defined(_MSC_VER) && !defined(_DLL) && defined(stdin) # if defined(_MSC_VER) && !defined(_WIN32_WCE) && !defined(_DLL) && defined(stdin)
# if _MSC_VER>=1300 # if _MSC_VER>=1300
# undef stdin # undef stdin
# undef stdout # undef stdout

2
util/mk1mf.pl
View File

@ -662,7 +662,7 @@ if ($fips)
{ {
$rules.=&cc_compile_target("\$(OBJ_D)${o}\$(E_PREMAIN_DSO)$obj", $rules.=&cc_compile_target("\$(OBJ_D)${o}\$(E_PREMAIN_DSO)$obj",
"\$(FIPS_PREMAIN_SRC)", "\$(FIPS_PREMAIN_SRC)",
"-DFINGERPRINT_PREMAIN_DSO_LOAD \$(SHLIB_CFLAGS)", ""); "-DFINGERPRINT_PREMAIN_DSO_LOAD \$(APP_CFLAGS)", "");
$rules.=&do_link_rule("\$(PREMAIN_DSO_EXE)","\$(OBJ_D)${o}\$(E_PREMAIN_DSO)$obj \$(CRYPTOOBJ) \$(O_FIPSCANISTER)","","\$(EX_LIBS)", 1); $rules.=&do_link_rule("\$(PREMAIN_DSO_EXE)","\$(OBJ_D)${o}\$(E_PREMAIN_DSO)$obj \$(CRYPTOOBJ) \$(O_FIPSCANISTER)","","\$(EX_LIBS)", 1);
} }

16
util/pl/VC-32.pl
View File

@ -43,8 +43,7 @@ if ($FLAVOR =~ /WIN64/)
# considered safe to ignore. # considered safe to ignore.
# #
$base_cflags= " $mf_cflag"; $base_cflags= " $mf_cflag";
my $f = $shlib || $fips ?' /MD':' /MT'; my $f = $shlib?' /MD':' /MT';
$lib_cflag='/Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib
$opt_cflags=$f.' /Ox'; $opt_cflags=$f.' /Ox';
$dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG'; $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG';
$lflags="/nologo /subsystem:console /opt:ref"; $lflags="/nologo /subsystem:console /opt:ref";
@ -117,19 +116,24 @@ elsif ($FLAVOR =~ /CE/)
$base_cflags.=" $wcecdefs"; $base_cflags.=" $wcecdefs";
$base_cflags.=' -I$(WCECOMPAT)/include' if (defined($ENV{'WCECOMPAT'})); $base_cflags.=' -I$(WCECOMPAT)/include' if (defined($ENV{'WCECOMPAT'}));
$base_cflags.=' -I$(PORTSDK_LIBPATH)/../../include' if (defined($ENV{'PORTSDK_LIBPATH'})); $base_cflags.=' -I$(PORTSDK_LIBPATH)/../../include' if (defined($ENV{'PORTSDK_LIBPATH'}));
$opt_cflags=' /MC /O1i'; # optimize for space, but with intrinsics... if (`cl 2>&1` =~ /Version 1[4-9]\./) {
$dbg_clfags=' /MC /Od -DDEBUG -D_DEBUG'; $base_cflags.=($shlib and !$fipscanisterbuild)?' /MD':' /MT';
} else {
$base_cflags.=' /MC';
}
$opt_cflags=' /O1i'; # optimize for space, but with intrinsics...
$dbg_clfags=' /Od -DDEBUG -D_DEBUG';
$lflags="/nologo /opt:ref $wcelflag"; $lflags="/nologo /opt:ref $wcelflag";
} }
else # Win32 else # Win32
{ {
$base_cflags= " $mf_cflag"; $base_cflags= " $mf_cflag";
my $f = $shlib || $fips ?' /MD':' /MT'; my $f = $shlib?' /MD':' /MT';
$lib_cflag='/Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib
$opt_cflags=$f.' /Ox /O2 /Ob2'; $opt_cflags=$f.' /Ox /O2 /Ob2';
$dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG'; $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG';
$lflags="/nologo /subsystem:console /opt:ref"; $lflags="/nologo /subsystem:console /opt:ref";
} }
$lib_cflags='/Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib
$mlflags=''; $mlflags='';
$out_def ="out32"; $out_def.="dll" if ($shlib); $out_def ="out32"; $out_def.="dll" if ($shlib);