From 6751d9898be671d253d6f7b0806cd4b10daaaf85 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 31 Jan 2011 13:24:04 +0000
Subject: Enabled global optimisation in release build winmain :
 GetEnvironmentStrings return should be freed with FreeEnvironmentStrings

---
 openssl/util/mk1mf.pl    |  8 ++++++++
 openssl/util/pl/VC-32.pl | 25 +++++++++++++++----------
 2 files changed, 23 insertions(+), 10 deletions(-)

(limited to 'openssl')

diff --git a/openssl/util/mk1mf.pl b/openssl/util/mk1mf.pl
index d969618ac..2526c86f8 100644
--- a/openssl/util/mk1mf.pl
+++ b/openssl/util/mk1mf.pl
@@ -501,7 +501,11 @@ EX_LIBS=$ex_libs
 SRC_D=$src_dir
 
 LINK=$link
+!ifdef DEBUG
+LFLAGS=$lflagsd
+!else
 LFLAGS=$lflags
+!endif
 RSC=$rsc
 
 # The output directory for the header files
@@ -513,7 +517,11 @@ CP=$cp
 RM=$rm
 RANLIB=$ranlib
 MKDIR=$mkdir
+!ifdef DEBUG
+MKLIB=$bin_dir$mklibd
+!else
 MKLIB=$bin_dir$mklib
+!endif
 MLFLAGS=$mlflags
 ASM=$bin_dir$asm
 
diff --git a/openssl/util/pl/VC-32.pl b/openssl/util/pl/VC-32.pl
index b59d51fc7..99e748cad 100644
--- a/openssl/util/pl/VC-32.pl
+++ b/openssl/util/pl/VC-32.pl
@@ -37,7 +37,8 @@ if ($FLAVOR =~ /WIN64/)
     $lib_cflag='/Zl' if (!$shlib);	# remove /DEFAULTLIBs from static lib
     $opt_cflags=$f.' /Ox';
     $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG';
-    $lflags="/nologo /subsystem:console /opt:ref";
+    $lflags="/NOLOGO /SUBSYSTEM:CONSOLE /OPT:REF /OPT:ICF /LTCG:STATUS";
+    $lflagsd="/NOLOGO /SUBSYSTEM:CONSOLE";
 
     *::perlasm_compile_target = sub {
 	my ($target,$source,$bname)=@_;
@@ -109,7 +110,8 @@ elsif ($FLAVOR =~ /CE/)
     $base_cflags.=' -I$(PORTSDK_LIBPATH)/../../include'	if (defined($ENV{'PORTSDK_LIBPATH'}));
     $opt_cflags=' /MC /O1i';	# optimize for space, but with intrinsics...
     $dbg_clfags=' /MC /Od -DDEBUG -D_DEBUG';
-    $lflags="/nologo /opt:ref $wcelflag";
+    $lflags="/NOLOGO /OPT:REF /OPT:ICF /LTCG:STATUS $wcelflag";
+    $lflagsd="/NOLOGO $wcelflag";
     }
 else	# Win32
     {
@@ -117,9 +119,10 @@ else	# Win32
 
     my $f = ' /MD';
     $lib_cflag='/Zl' if (!$shlib);	# remove /DEFAULTLIBs from static lib
-    $opt_cflags=$f.' /O2 /Ob2 /Oi /Ox /Oy /Ot';     
-    $dbg_cflags=$f.'d /RTCc /RTC1 /Od /GS /GR /Zi';   
-    $lflags="/nologo /subsystem:console /opt:ref";
+    $opt_cflags=$f.' /O2 /Ob2 /Oi /Ox /Oy /Ot /GL /Gy /GF /Zi';     
+    $dbg_cflags=$f.'d /RTCc /RTC1 /Od /GS /GR /Gy /GF /Zi';   
+    $lflags="/NOLOGO /SUBSYSTEM:CONSOLE /OPT:REF /OPT:ICF /LTCG:STATUS";
+    $lflagsd="/NOLOGO /SUBSYSTEM:CONSOLE";
     }
 $mlflags='';
 
@@ -142,7 +145,8 @@ else
 # generate symbols.pdb unconditionally
 $app_cflag.=" /Zi /Fd\$(TMP_D)/app";
 $lib_cflag.=" /Zi /Fd\$(TMP_D)/lib";
-$lflags.=" /debug";
+$lflags.=" /DEBUG";
+$lflagsd.=" /DEBUG";
 
 $obj='.obj';
 $asm_suffix='.asm';
@@ -174,7 +178,8 @@ else
 
 	$cdflags.=" -DOPENSSL_SYSNAME_WINNT -DUNICODE -D_UNICODE";
 # static library stuff
-$mklib='lib /nologo';
+$mklib='lib /nologo /LTCG';
+$mklibd='lib /nologo';
 $ranlib='';
 $plib="";
 $libp=".lib";
@@ -234,7 +239,7 @@ if (!$no_asm)
 
 if ($shlib && $FLAVOR !~ /CE/)
 	{
-	$mlflags.=" $lflags /dll";
+	$mlflags.=" $lflags /DLL";
 	$lib_cflag.=" -D_WINDLL";
 	#
 	# Engage Applink...
@@ -263,8 +268,8 @@ ___
 	}
 elsif ($shlib && $FLAVOR =~ /CE/)
 	{
-	$mlflags.=" $lflags /dll";
-	$lflags.=' /entry:mainCRTstartup' if(defined($ENV{'PORTSDK_LIBPATH'}));
+	$mlflags.=" $lflags /DLL";
+	$lflags.=' /ENTRY:mainCRTstartup' if(defined($ENV{'PORTSDK_LIBPATH'}));
 	$lib_cflag.=" -D_WINDLL -D_DLL";
 	}
 
-- 
cgit v1.2.3