Make one of the AttributeSet ctors maintain the invariant that the

[oota-llvm.git] / tools / Makefile

diff --git a/tools/Makefile b/tools/Makefile
index 278546bc1625b7e02c7d6bcf44a1d2da0712422f..b7375c9970ba406c28453eb479dff36544fc0bfc 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -28,13 +28,19 @@ OPTIONAL_DIRS := lldb
 # in parallel builds.  Please retain this ordering.
 DIRS := llvm-config
 PARALLEL_DIRS := opt llvm-as llvm-dis \
-                 llc llvm-ranlib llvm-ar llvm-nm \
-                 llvm-ld llvm-prof llvm-link \
+                 llc llvm-ar llvm-nm \
+                 llvm-prof llvm-link \
                  lli llvm-extract llvm-mc \
-                 bugpoint llvm-bcanalyzer llvm-stub \
-                 llvm-diff macho-dump llvm-objdump \
+                 bugpoint llvm-bcanalyzer \
+                 llvm-diff macho-dump llvm-objdump llvm-readobj \
                 llvm-rtdyld llvm-dwarfdump llvm-cov \
-                llvm-size llvm-config-2
+                llvm-size llvm-stress llvm-mcmarkup \
+                llvm-symbolizer obj2yaml yaml2obj
+
+# If Intel JIT Events support is configured, build an extra tool to test it.
+ifeq ($(USE_INTEL_JITEVENTS), 1)
+  PARALLEL_DIRS += llvm-jitlistener
+endif
 
 # Let users override the set of tools to build from the command line.
 ifdef ONLY_TOOLS
@@ -56,14 +62,6 @@ ifeq ($(ENABLE_PIC),1)
   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 += edis
-    endif
-  endif
 endif
 
 ifdef LLVM_HAS_POLLY