[llvm-branch-commits] [llvm-branch] r69632 - in /llvm/branches/Apple/Dib: Makefile.rules utils/buildit/build_llvm

[Bill Wendling]

Author: void
Date: Mon Apr 20 17:25:36 2009
New Revision: 69632

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

Modified:
    llvm/branches/Apple/Dib/Makefile.rules
    llvm/branches/Apple/Dib/utils/buildit/build_llvm

Modified: llvm/branches/Apple/Dib/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Dib/Makefile.rules?rev=69632&r1=69631&r2=69632&view=diff

==============================================================================
--- llvm/branches/Apple/Dib/Makefile.rules (original)
+++ llvm/branches/Apple/Dib/Makefile.rules Mon Apr 20 17:25:36 2009
@@ -229,10 +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.
-ifneq ($(OS),MingW)
-  OPTIMIZE_OPTION := -O3
-else
-  OPTIMIZE_OPTION := -O2
+ifndef OPTIMIZE_OPTION
+  ifneq ($(OS),MingW)
+    OPTIMIZE_OPTION := -O3
+  else
+    OPTIMIZE_OPTION := -O2
+  endif
 endif
 
 ifdef ENABLE_PROFILING
@@ -252,9 +254,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)

Modified: llvm/branches/Apple/Dib/utils/buildit/build_llvm
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Dib/utils/buildit/build_llvm?rev=69632&r1=69631&r2=69632&view=diff

==============================================================================
--- llvm/branches/Apple/Dib/utils/buildit/build_llvm (original)
+++ llvm/branches/Apple/Dib/utils/buildit/build_llvm Mon Apr 20 17:25:36 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!"