Re-apply r110655 with fixes. Epilogue must restore sp from fp if the function stack...

[oota-llvm.git] / tools / Makefile

diff --git a/tools/Makefile b/tools/Makefile
index 7f0f1df71467f38cf96426f2740bbce09074599f..e6d9207a1dc066e8c69d3eacdea682cb229065fc 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -16,7 +16,7 @@ OPTIONAL_PARALLEL_DIRS := clang
 # large and three small executables. This is done to minimize memory load
 # in parallel builds.  Please retain this ordering.
 DIRS := llvm-config 
-PARALLEL_DIRS := opt llvm-as llvm-dis edis \
+PARALLEL_DIRS := opt llvm-as llvm-dis \
                  llc llvm-ranlib llvm-ar llvm-nm \
                  llvm-ld llvm-prof llvm-link \
                  lli llvm-extract llvm-mc \
@@ -45,11 +45,13 @@ ifeq ($(ENABLE_PIC),1)
       PARALLEL_DIRS += lto
     endif
 
+    PARALLEL_DIRS += bugpoint-passes
+
     # The edis library is only supported if ARM and/or X86 are enabled, and if
     # LLVM is being built PIC on platforms that support dylibs.
     ifneq ($(DISABLE_EDIS),1)
     ifneq ($(filter $(TARGETS_TO_BUILD), X86 ARM),)
-      PARALLEL_DIRS := $(filter-out edis, $(PARALLEL_DIRS))
+      PARALLEL_DIRS += edis
     endif
     endif
   endif