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

[Matúš Kukan]

 solenv/gbuild/platform/android.mk      |    1 -
 solenv/gbuild/platform/com_GCC_defs.mk |    4 ++++
 solenv/gbuild/platform/macosx.mk       |    1 -
 solenv/gbuild/platform/solaris.mk      |    5 -----
 solenv/gbuild/platform/unxgcc.mk       |    8 +-------
 5 files changed, 5 insertions(+), 14 deletions(-)

New commits:
commit 3c7b65c171eeade3272cc766b813b99a35a6ef7d
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Tue Feb 18 22:25:06 2014 +0100

    Remove hopefully now unneeded workaround for --enable-lto build.
    
    Change-Id: Iaffcc0825415e6aee62029fbc380954449b8bcbf

diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index ee93a164..c743dcb 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -162,7 +162,7 @@ define gb_LinkTarget__command_dynamiclink
 $(call gb_Helper_abbreviate_dirs,\
 	$(if $(CXXOBJECTS)$(GENCXXOBJECTS)$(EXTRAOBJECTLISTS),$(gb_CXX),$(gb_CC)) \
 		$(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
-		$(if $(filter-out $(foreach lib,frm scfilt wpftdraw,$(call gb_Library__get_workdir_linktargetname,$(lib))),$(2)),$(gb_LTOFLAGS)) \
+		$(gb_LTOFLAGS) \
 		$(if $(SOVERSIONSCRIPT),-Wl$(COMMA)--soname=$(notdir $(1)) \
 			-Wl$(COMMA)--version-script=$(SOVERSIONSCRIPT)) \
 		$(subst \d,$$,$(RPATH)) \
commit 0d26fc8fd0d3f52366403cec46efa0e7ccb2755d
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Tue Feb 18 22:23:48 2014 +0100

    Tweak lto flags for gcc.
    
    Change-Id: I490029f0727e060fdfdfc6e9adccd058b24e6b86

diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
index 41c2d44..761765f 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -103,7 +103,11 @@ gb_CXXFLAGS_COMMON += -DLIBO_MERGELIBS
 endif
 
 ifeq ($(ENABLE_LTO),TRUE)
+ifeq ($(COM_GCC_IS_CLANG),TRUE)
 gb_LTOFLAGS := -flto
+else
+gb_LTOFLAGS := -flto -fuse-linker-plugin -O2
+endif
 endif
 
 gb_LinkTarget_EXCEPTIONFLAGS := \
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 151cc86..ee93a164 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -96,12 +96,6 @@ gb_CXXFLAGS += -Wno-deprecated-declarations
 endif
 endif
 
-ifeq ($(ENABLE_LTO),TRUE)
-ifneq ($(COM_GCC_IS_CLANG),TRUE)
-gb_LTOFLAGS += -fuse-linker-plugin $(gb_COMPILERDEFAULTOPTFLAGS)
-endif
-endif
-
 ifneq ($(strip $(SYSBASE)),)
 gb_CXXFLAGS += --sysroot=$(SYSBASE)
 gb_CFLAGS += --sysroot=$(SYSBASE)
commit cc493da6fe395b5948f2578b13d65fa04d8dc15d
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Tue Feb 18 21:48:44 2014 +0100

    There is no gb_Library_LTOFLAGS.
    
    Change-Id: I3b6b18e45aaf88d1cc6038226f6984090163bdee

diff --git a/solenv/gbuild/platform/android.mk b/solenv/gbuild/platform/android.mk
index b3ed340..4dbb29f 100644
--- a/solenv/gbuild/platform/android.mk
+++ b/solenv/gbuild/platform/android.mk
@@ -38,7 +38,6 @@ $(call gb_Helper_abbreviate_dirs,\
 	$(if $(CXXOBJECTS)$(GENCXXOBJECTS)$(EXTRAOBJECTLISTS),$(gb_CXX),$(gb_CC)) \
 		-shared \
 		$(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
-		$(if $(filter Library,$(TARGETTYPE)),$(gb_Library_LTOFLAGS)) \
 		$(subst \d,$$,$(RPATH)) \
 		$(T_LDFLAGS) \
 		$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 96f56c2..211be4c 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -131,7 +131,6 @@ $(call gb_Helper_abbreviate_dirs,\
 		$(if $(filter Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \
 		$(if $(filter Bundle,$(TARGETTYPE)),$(gb_Bundle_TARGETTYPEFLAGS)) \
 		$(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
-		$(if $(filter Library,$(TARGETTYPE)),$(gb_Library_LTOFLAGS)) \
 		$(subst \d,$$,$(RPATH)) \
 		$(T_LDFLAGS) \
 		$(patsubst lib%.dylib,-l%,$(patsubst %.$(gb_Library_UDK_MAJORVER),%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib))))) \
commit df4a2c7425412df7757afcfd48f0f8f9aa8d5535
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Tue Feb 18 21:47:19 2014 +0100

    Remove lto bits from solaris makefile.
    
    Change-Id: I5ff79fddce0140791e367fb44afffe3250574efa

diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index 2311ab6..c8254f6 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -100,10 +100,6 @@ gb_CXXFLAGS += -Wno-deprecated-declarations
 endif
 endif
 
-ifeq ($(ENABLE_LTO),TRUE)
-gb_LinkTarget_LDFLAGS += -fuse-linker-plugin $(gb_COMPILERDEFAULTOPTFLAGS)
-endif
-
 ifneq ($(strip $(SYSBASE)),)
 gb_CXXFLAGS += --sysroot=$(SYSBASE)
 gb_CFLAGS += --sysroot=$(SYSBASE)
@@ -166,7 +162,6 @@ define gb_LinkTarget__command_dynamiclink
 $(call gb_Helper_abbreviate_dirs,\
 	$(if $(CXXOBJECTS)$(GENCXXOBJECTS)$(EXTRAOBJECTLISTS),$(gb_CXX),$(gb_CC)) \
 		$(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
-		$(if $(filter-out $(foreach lib,frm scfilt wpftdraw,$(call gb_Library__get_workdir_linktargetname,$(lib))),$(2)),$(gb_LTOFLAGS)) \
 		$(if $(SOVERSIONSCRIPT),-Wl$(COMMA)--soname=$(notdir $(1)) \
 			-Wl$(COMMA)--version-script=$(SOVERSIONSCRIPT)) \
 		$(subst \d,$$,$(RPATH)) \