Revert 54821. It's miscompiling 252.eon and 447.dealII

[oota-llvm.git] / Makefile

diff --git a/Makefile b/Makefile
index d9786d2ac051cdd61f25df5115684557a4d5e254..83b789fa2245b0246286ee91a5aeee05fb52c966 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -77,9 +77,9 @@ debug-opt-prof:
 dist-hook::
        $(Echo) Eliminating files constructed by configure
        $(Verb) $(RM) -f \
-         $(TopDistDir)/include/llvm/ADT/hash_map  \
-         $(TopDistDir)/include/llvm/ADT/hash_set  \
-         $(TopDistDir)/include/llvm/ADT/iterator  \
+         $(TopDistDir)/include/llvm/ADT/hash_map.h  \
+         $(TopDistDir)/include/llvm/ADT/hash_set.h  \
+         $(TopDistDir)/include/llvm/ADT/iterator.h  \
          $(TopDistDir)/include/llvm/Config/config.h  \
          $(TopDistDir)/include/llvm/Support/DataTypes.h  \
          $(TopDistDir)/include/llvm/Support/ThreadSupport.h
@@ -95,9 +95,9 @@ install-libs: install
 FilesToConfig := \
   include/llvm/Config/config.h \
   include/llvm/Support/DataTypes.h \
-  include/llvm/ADT/hash_map \
-  include/llvm/ADT/hash_set \
-  include/llvm/ADT/iterator
+  include/llvm/ADT/hash_map.h \
+  include/llvm/ADT/hash_set.h \
+  include/llvm/ADT/iterator.h
 FilesToConfigPATH  := $(addprefix $(LLVM_OBJ_ROOT)/,$(FilesToConfig))
 
 all-local:: $(FilesToConfigPATH)
@@ -113,7 +113,8 @@ all::
 ifeq ($(BuildMode),Debug)
        $(Echo) '*****' Note: Debug build can be 10 times slower than an
        $(Echo) '*****' optimized build. Use 'make ENABLE_OPTIMIZED=1' to
-       $(Echo) '*****' make an optimized build.
+       $(Echo) '*****' make an optimized build. Alternatively you can
+       $(Echo) '*****' configure with --enable-optimized.
 endif
 
 check-llvm2cpp:
@@ -141,5 +142,22 @@ build-for-llvm-top:
        fi
        $(Verb) $(MAKE) tools-only
 
-.PHONY: srpm rpm
+SVN = svn
+SVN-UPDATE-OPTIONS =
+AWK = awk
+SUB-SVN-DIRS = $(AWK) '/\?\ \ \ \ \ \ / {print $$2}'   \
+               | LANG=C xargs $(SVN) info 2>/dev/null \
+               | $(AWK) '/Path:\ / {print $$2}'
+
+update:
+       $(SVN) $(SVN-UPDATE-OPTIONS) update $(LLVM_SRC_ROOT)
+       @ $(SVN) status $(LLVM_SRC_ROOT) | $(SUB-SVN-DIRS) | xargs $(SVN) $(SVN-UPDATE-OPTIONS) update
+
+happiness: update all check
+
+.PHONY: srpm rpm update happiness
+
+# declare all targets at this level to be serial:
+
+.NOTPARALLEL: