[llvm-commits] [llvm] r69630 - in /llvm/trunk: Makefile.rules utils/buildit/build_llvm

[Evan Cheng]

Author: evancheng
Date: Mon Apr 20 17:16:40 2009
New Revision: 69630

URL: http://llvm.org/viewvc/llvm-project?rev=69630&view=rev
Log:
One Mac OS X, just build with -O3 but without -fstrict-aliasing (which is kinda broken).

Modified:
    llvm/trunk/Makefile.rules
    llvm/trunk/utils/buildit/build_llvm

Modified: llvm/trunk/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/Makefile.rules?rev=69630&r1=69629&r2=69630&view=diff

==============================================================================
--- llvm/trunk/Makefile.rules (original)
+++ llvm/trunk/Makefile.rules Mon Apr 20 17:16:40 2009
@@ -229,12 +229,12 @@
 CPP.Defines :=
 # OPTIMIZE_OPTION - The optimization level option we want to build LLVM with
 # this can be overridden on the make command line.
-# Avoid -O3 on Darwin, there are unresolved issues with
-# -fstrict-aliasing and ipa-type-escape radr://6756684
-ifeq ($(OS), $(filter $(OS), MingW Darwin))
-  OPTIMIZE_OPTION := -O2
-else
-  OPTIMIZE_OPTION := -O3
+ifndef OPTIMIZE_OPTION
+  ifneq ($(OS),MingW)
+    OPTIMIZE_OPTION := -O3
+  else
+    OPTIMIZE_OPTION := -O2
+  endif
 endif
 
 ifeq ($(ENABLE_OPTIMIZED),1)
@@ -247,9 +247,11 @@
   endif
 
   # Darwin requires -fstrict-aliasing to be explicitly enabled.
-  ifeq ($(OS),Darwin)
-    EXTRA_OPTIONS += -fstrict-aliasing -Wstrict-aliasing
-  endif
+  # Avoid -O3 on Darwin for now, there are unresolved issues with
+  # -fstrict-aliasing and ipa-type-escape radr://6756684
+  #ifeq ($(OS),Darwin)
+  #  EXTRA_OPTIONS += -fstrict-aliasing -Wstrict-aliasing
+  #endif
   CXX.Flags += $(OPTIMIZE_OPTION) $(OmitFramePointer)
   C.Flags   += $(OPTIMIZE_OPTION) $(OmitFramePointer)
   LD.Flags  += $(OPTIMIZE_OPTION)

Modified: llvm/trunk/utils/buildit/build_llvm
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/buildit/build_llvm?rev=69630&r1=69629&r2=69630&view=diff

==============================================================================
--- llvm/trunk/utils/buildit/build_llvm (original)
+++ llvm/trunk/utils/buildit/build_llvm Mon Apr 20 17:16:40 2009
@@ -161,7 +161,7 @@
 make $LOCAL_MAKEFLAGS $OPTIMIZE_OPTS UNIVERSAL=1 UNIVERSAL_ARCH="$TARGETS" \
     LLVM_SUBMIT_VERSION=$LLVM_SUBMIT_VERSION \
     LLVM_SUBMIT_SUBVERSION=$LLVM_SUBMIT_SUBVERSION \
-    OPTIMIZE_OPTION='-O2' VERBOSE=1 install
+    OPTIMIZE_OPTION='-O3' VERBOSE=1 install
 
 if ! test $? == 0 ; then
     echo "error: LLVM 'make install' failed!"