[Libreoffice-commits] core.git: 3 commits - solenv/gbuild

[Tor Lillqvist]

 solenv/gbuild/platform/com_MSC_class.mk |    9 +++++----
 solenv/gbuild/platform/com_MSC_defs.mk  |    2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 3105e301c4f6dc008f0532ba051ee158a28c58a7
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Sep 3 22:37:15 2013 +0300

    Need the gb_LTOFLAGS (-GL) also when precompiling headers
    
    Change-Id: I558c2b5429c3f6e361e0a8e44f32f7f2e74833a5

diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
index e68bac1..28c19460 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -104,6 +104,7 @@ $(call gb_Helper_abbreviate_dirs,\
 	unset INCLUDE && \
 	$(gb_CXX) \
 		$(4) $(5) -Fd$(PDBFILE) \
+		$(gb_LTOFLAGS) \
 		$(gb_COMPILERDEPFLAGS) \
 		-I$(dir $(3)) \
 		$(6) \
commit c4587bce6d4eeb4379f17760b31d79b9448198fa
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Sep 3 22:10:26 2013 +0300

    Use -LTCG also when linking executables in the LTO case
    
    Change-Id: I63113ed7e4a477d1ea7cd7f59a8647f4edf62d70

diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
index db288d9..e68bac1 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -216,6 +216,10 @@ gb_Windows_PE_TARGETTYPEFLAGS := \
 	-dynamicbase \
 	-manifest
 
+ifeq ($(ENABLE_LTO),TRUE)
+gb_Windows_PE_TARGETTYPEFLAGS += -LTCG
+endif
+
 # Library class
 
 
@@ -224,10 +228,6 @@ gb_Library_TARGETTYPEFLAGS := \
 	-DLL \
 	$(gb_Windows_PE_TARGETTYPEFLAGS)
 
-ifeq ($(ENABLE_LTO),TRUE)
-gb_Library_TARGETTYPEFLAGS += -LTCG
-endif
-
 gb_Library_get_rpath :=
 
 gb_Library_SYSPRE := i
commit 32d9dd3008867199f56ab1dbb192aa3f49a2779b
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Sep 3 22:09:45 2013 +0300

    Just use simple -O2
    
    Change-Id: Ibaa3f11651d15e9848ab25192bbd6718259cd162

diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk
index 2cca886..aaf1a55 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -253,7 +253,7 @@ gb_CFLAGS+=$(gb_DEBUG_CFLAGS)
 gb_CXXFLAGS+=$(gb_DEBUG_CFLAGS)
 endif
 
-gb_COMPILEROPTFLAGS := -Ob1 -Oxs -Oy-
+gb_COMPILEROPTFLAGS := -O2
 gb_COMPILERNOOPTFLAGS := -Od
 
 ifeq ($(gb_FULLDEPS),$(true))