[Libreoffice-commits] .: Branch 'libreoffice-3-3' - solenv/inc

[Caolán McNamara]

 solenv/inc/settings.mk |   11 ++++++-----
 solenv/inc/unxlng.mk   |    8 ++++++--
 2 files changed, 12 insertions(+), 7 deletions(-)

New commits:
commit 2460c89b2bb618eaded5ca0ac07749ff914f3b34
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Nov 5 12:37:23 2010 +0000

    extra optimization unsafe for earlier gccs
    (cherry picked from commit 30ee54453389af148ea6ac4df1c54b8f404ea559)

diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 5bdffba..fa7b32e 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -1008,6 +1008,12 @@ LNT=$(DEVROOT)/lint/lint
 LNTFLAGS=+v -i$(DEVROOT)/lint/ -mL options.lnt -u
 LNTFLAGSOUTOBJ=-os
 
+.IF "$(DISABLE_ENHANCED_COMID)"==""
+.INCLUDE : tg_compv.mk
+.ELSE          # "$(DISABLE_ENHANCED_COMID)"==""
+COMID=$(COM)
+.ENDIF          # "$(DISABLE_ENHANCED_COMID)"==""
+
 .IF "$(GUI)"=="WNT"
 .INCLUDE : wnt.mk
 .ENDIF
@@ -1087,11 +1093,6 @@ SCPLINK=$(PERL) $(SOLARENV)/bin/par2script.pl
 LZIP*=lzip
 CPPLCC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/cpplcc
 
-.IF "$(DISABLE_ENHANCED_COMID)"==""
-.INCLUDE : tg_compv.mk
-.ELSE          # "$(DISABLE_ENHANCED_COMID)"==""
-COMID=$(COM)
-.ENDIF          # "$(DISABLE_ENHANCED_COMID)"==""
 .IF "$(SOLAR_JAVA)"=="TRUE"
 .IF "$(USE_JAVAVER)"!=""
 .INCLUDE : tg_javav.mk
diff --git a/solenv/inc/unxlng.mk b/solenv/inc/unxlng.mk
index 3602c0b..8a2f075 100644
--- a/solenv/inc/unxlng.mk
+++ b/solenv/inc/unxlng.mk
@@ -112,8 +112,12 @@ CFLAGSDBGUTIL=
 # Compiler flags for enabling optimizations
 .IF "$(PRODUCT)"!=""
 CFLAGSOPT=$(CDEFAULTOPT) # optimizing for products
-.IF "$(USE_SYSTEM_STL)"!="YES"
-CFLAGSOPT+=-fno-strict-aliasing #STLPort headers are full of aliasing warnings
+.IF "$(USE_SYSTEM_STL)"!="YES" || "$(CCNUMVER)" <= "000400050000"
+#STLPort headers are full of aliasing warnings and
+#At least SLED 10.2 gcc 4.3 overly agressively optimizes
+#uno::Sequence into junk, so only strict-alias on compiler
+#later than 4.5.1
+CFLAGSOPT+=-fno-strict-aliasing
 .ENDIF
 .ELSE 	# "$(PRODUCT)"!=""
 CFLAGSOPT=   							# no optimizing for non products