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

[Noel Grandin (via logerrit)]

 solenv/gbuild/platform/com_GCC_defs.mk |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit f4acb2a916de9762dfe7fe1b4120ea758e234d34
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Wed May 27 09:22:27 2020 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed May 27 10:05:02 2020 +0200

    Revert "bloaty: use -ffunction-sections and --gc-sections for linking"
    
    This reverts commit bd39ec554f90badccfb26c843fd0d43237f1b622.
    
    Reason for revert:
    For -ffunction-sections and -fdata-sections, <https://gcc.gnu.org/onlinedocs/gcc-10.1.0/gcc/Optimize-Options.html#Optimize-Options> warns:  "Only use these options when there are significant benefits from doing so.  When you specify these options, the assembler and linker create larger object and executable files and are also slower.  These options affect code generation.  They prevent optimizations by the compiler and assembler using relative locations inside a translation unit since the locations are unknown until link time.  An example of such an optimization is relaxing calls to short call instructions."
    
    Change-Id: I84225ca94de9afff23bdd2913c77095d5d26f7ee
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94950
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
index 766d53c07526..1707a7481ee6 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -106,9 +106,7 @@ gb_LinkTarget_LDFLAGS += -fprofile-arcs -lgcov
 gb_COMPILEROPTFLAGS := -O0
 endif
 
-# Strip out duplicates, which happen a lot with e.g. UNO
-# functions declared in UNO header files.
-ifneq ($(OS_FOR_BUILD),MACOSX)
+ifeq ($(DISABLE_DYNLOADING),TRUE)
 gb_CFLAGS_COMMON += -ffunction-sections -fdata-sections
 gb_CXXFLAGS_COMMON += -ffunction-sections -fdata-sections
 gb_LinkTarget_LDFLAGS += -Wl,--gc-sections