diff options
author | Caolán McNamara <caolanm@redhat.com> | 2010-12-05 11:34:38 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2010-12-05 11:34:38 +0000 |
commit | 43234c625bb8cb8b33fdaeaf466477bc0c96689e (patch) | |
tree | 90d653c607f10cdc937c0b3785af60778d42af0c | |
parent | b52248f7c0397cc4d9d096f28d03f527f2018594 (diff) |
-matom only available with gcc 4.5.0 or above
-rw-r--r-- | solenv/inc/unxgcc.mk | 7 | ||||
-rw-r--r-- | solenv/inc/unxlngi.mk | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk index 63475e71a..78b14fc73 100644 --- a/solenv/inc/unxgcc.mk +++ b/solenv/inc/unxgcc.mk @@ -110,13 +110,13 @@ CFLAGSPROF= # Compiler flags for debugging CFLAGSDEBUG=-g CFLAGSDBGUTIL= -# Compiler flags for enabling optimizations -.IF "$(PRODUCT)"!="" -CFLAGSOPT=$(CDEFAULTOPT) # optimizing for products GCCNUMVERSION_CMD=-dumpversion $(PIPEERROR) $(AWK) -v num=true -f $(SOLARENV)/bin/getcompver.awk GCCNUMVER:=$(shell @-$(CXX) $(GCCNUMVERSION_CMD)) +# Compiler flags for enabling optimizations +.IF "$(PRODUCT)"!="" +CFLAGSOPT=$(CDEFAULTOPT) # optimizing for products .IF "$(USE_SYSTEM_STL)"!="YES" || "$(GCCNUMVER)" <= "000400050000" #STLPort headers are full of aliasing warnings and #At least SLED 10.2 gcc 4.3 overly agressively optimizes @@ -127,6 +127,7 @@ CFLAGSOPT+=-fno-strict-aliasing .ELSE # "$(PRODUCT)"!="" CFLAGSOPT= # no optimizing for non products .ENDIF # "$(PRODUCT)"!="" + # Compiler flags for disabling optimizations CFLAGSNOOPT=-O0 # Compiler flags for describing the output path diff --git a/solenv/inc/unxlngi.mk b/solenv/inc/unxlngi.mk index d86aab185..8c6c540e8 100644 --- a/solenv/inc/unxlngi.mk +++ b/solenv/inc/unxlngi.mk @@ -27,7 +27,11 @@ # mk file for Unix Linux Intel (X86) using GCC, please make generic modifications to unxlng.mk CDEFAULTOPT=-Os +.IF "$(GCCNUMVER)" >= "000400050000" +ARCH_FLAGS*=-mtune=atom +.ELSE ARCH_FLAGS*=-mtune=pentiumpro +.ENDIF .INCLUDE : unxlng.mk CDEFS+=-DX86 DLLPOST=.so |