Remove flags implied by -O3

[oota-llvm.git] / Makefile.rules

diff --git a/Makefile.rules b/Makefile.rules
index 51826d527f62a2f41aa713883ca348d420673406..c4148be9db81244fec26eea0cead9431ae0b838b 100644 (file)
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -200,7 +200,7 @@ install-bytecode:: install-bytecode-local
 
 ifdef ENABLE_PROFILING
   BuildMode := Profile
-  CXX.Flags := -O3 -felide-constructors -finline-functions -pg
+  CXX.Flags := -O3 -pg
   C.Flags   := -O3 -pg
   LD.Flags  := -O3 -pg 
 else
@@ -208,9 +208,12 @@ else
     BuildMode := Release
     # Don't use -fomit-frame-pointer on FreeBSD
     ifneq ($(OS),FreeBSD)
+    # Don't use -fomit-frame-pointer on Darwin, it breaks backtraces.
+    ifneq ($(OS),Darwin)
       OmitFramePointer := -fomit-frame-pointer
     endif
-    CXX.Flags := -O3 -finline-functions -felide-constructors $(OmitFramePointer)
+    endif
+    CXX.Flags := -O3 $(OmitFramePointer)
     C.Flags   := -O3 $(OmitFramePointer)
     LD.Flags  := -O3
   else
@@ -396,9 +399,9 @@ BCCompile.CXX = $(LLVMGXXWITHPATH) $(CPP.Flags) $(CompileCommonOpts) \
                 $(CXX.Flags)
 Preprocess.CXX= $(CXX) $(CPP.Flags) $(CompileCommonOpts) $(CXX.Flags) -E
 Link          = $(LIBTOOL) $(LibTool.Flags) --mode=link $(CXX) $(CPP.Flags) \
-               $(CompileCommonOpts) $(LD.Flags) $(Strip)
+               $(CXX.Flags) $(CompileCommonOpts) $(LD.Flags) $(Strip)
 Relink        = $(LIBTOOL) $(LibTool.Flags) --mode=link $(CXX) $(CPP.Flags) \
-                $(CompileCommonOpts) $(Relink.Flags)
+                $(CXX.Flags) $(CompileCommonOpts) $(Relink.Flags)
 LTInstall     = $(LIBTOOL) $(LibTool.Flags) --mode=install $(INSTALL) \
                $(Install.Flags)
 ProgInstall   = $(INSTALL) $(Install.StripFlag) -m 0755 
@@ -472,9 +475,7 @@ $(RecursiveTargets)::
            $(MKDIR) $$dir; \
            $(CP) $(PROJ_SRC_DIR)/$$dir/Makefile $$dir/Makefile; \
          fi; \
-         if [ ! -f $$dir/LLVM_DO_NOT_BUILD ]; then \
-           ($(MAKE) -C $$dir $@ ) || exit 1; \
-         fi ; \
+         ($(MAKE) -C $$dir $@ ) || exit 1; \
        done
 endif
 
@@ -489,9 +490,7 @@ $(RecursiveTargets)::
            $(MKDIR) $$dir; \
            $(CP) $(PROJ_SRC_DIR)/$$dir/Makefile $$dir/Makefile; \
          fi; \
-         if [ ! -f $$dir/LLVM_DO_NOT_BUILD ]; then \
-           ($(MAKE) -C $$dir $@ ) || exit 0; \
-         fi ; \
+         ($(MAKE) -C $$dir $@ ) || exit 0; \
        done
 endif
 
@@ -517,9 +516,7 @@ $(ParallelTargets) :
          $(MKDIR) $(@D); \
          $(CP) $(PROJ_SRC_DIR)/$(@D)/Makefile $(@D)/Makefile; \
        fi; \
-       if [ ! -f $$dir/LLVM_DO_NOT_BUILD ]; then \
-         $(MAKE) -C $(@D) $(subst $(@D)/.make,,$@) ; \
-       fi
+       $(MAKE) -C $(@D) $(subst $(@D)/.make,,$@) ;
 endif
 
 #---------------------------------------------------------
@@ -537,9 +534,7 @@ $(RecursiveTargets)::
              $(MKDIR) $$dir; \
              $(CP) $(PROJ_SRC_DIR)/$$dir/Makefile $$dir/Makefile; \
            fi; \
-           if [ ! -f $$dir/LLVM_DO_NOT_BUILD ]; then \
-             ($(MAKE) -C$$dir $@ ) || exit 1; \
-           fi ; \
+           ($(MAKE) -C$$dir $@ ) || exit 1; \
          fi \
        done
 endif