For Darwin on ARMv6 and newer, make register r9 available for use as a

[oota-llvm.git] / tools / Makefile

diff --git a/tools/Makefile b/tools/Makefile
index 519717ad98de81dc957797105b2454b5574466ec..5ed090ea0e0e12f560dc45fa88edc266b7d77f5d 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -15,19 +15,32 @@ OPTIONAL_PARALLEL_DIRS := clang
 # NOTE: The tools are organized into five groups of four consisting of one
 # large and three small executables. This is done to minimize memory load
 # in parallel builds.  Please retain this ordering.
-PARALLEL_DIRS := llvm-config  \
-                 opt llvm-as llvm-dis \
+DIRS := llvm-config
+PARALLEL_DIRS := opt llvm-as llvm-dis \
                  llc llvm-ranlib llvm-ar llvm-nm \
                  llvm-ld llvm-prof llvm-link \
-                lli gccas gccld llvm-extract llvm-db \
-                bugpoint llvm-bcanalyzer llvm-stub llvmc
+                 lli gccas gccld llvm-extract llvm-db \
+                 bugpoint llvm-bcanalyzer llvm-stub llvmc \
+                 llvm-mc
 
+# Let users override the set of tools to build from the command line.
+ifdef ONLY_TOOLS
+  OPTIONAL_PARALLEL_DIRS :=
+  PARALLEL_DIRS := $(ONLY_TOOLS)
+endif
 
 include $(LEVEL)/Makefile.config
 
-# only build new lto project on Darwin for now
-ifeq ($(OS),Darwin)
-PARALLEL_DIRS += lto
+ifeq ($(ENABLE_PIC),1)
+  DIRS += lto
+  ifdef BINUTILS_INCDIR
+    DIRS += gold
+  endif
+endif
+
+# No support for lto / gold on windows targets
+ifeq ($(OS), $(filter $(OS), Cygwin MingW))
+  DIRS := $(filter-out lto gold, $(DIRS))
 endif
 
 include $(LEVEL)/Makefile.common