Expand ParameterAttributes to 32 bits (in preparation

[oota-llvm.git] / tools / Makefile

diff --git a/tools/Makefile b/tools/Makefile
index e2e4f6911d9cfbf79cfd7d814bc455af04e28cfa..9f62ff74dc5e5c20446e2f8e056268065d7439b0 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -2,24 +2,28 @@
 # 
 #                     The LLVM Compiler Infrastructure
 #
-# This file was developed by the LLVM research group and is distributed under
-# the University of Illinois Open Source License. See LICENSE.TXT for details.
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
 # 
 ##===----------------------------------------------------------------------===##
 
 LEVEL := ..
-PARALLEL_DIRS := llvm-as llvm-dis opt gccas llc llvm-link lli gccld llvm-stub \
-                 analyze extract llvm-nm llvm-prof llvm-ar llvm-ranlib \
-                 llvm-bcanalyzer llvmc llvm-ld llvm-db bugpoint
+# 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 llvm-upgrade \
+                 llc llvm-ranlib llvm-ar llvm-nm \
+                 llvm-ld llvmc llvm-prof llvm-link \
+                lli gccas gccld llvm-extract llvm-db llvm2cpp \
+                bugpoint llvm-bcanalyzer llvm-stub
+
 
 include $(LEVEL)/Makefile.config
 
-# The bugpoint and llvm-db tools are not portable to Win32 because they depend
-# on fork(2) behavior that Win32 doesn't have. At some point they'll be 
-# rewritten to not depend on fork at which time they should be added back to
-# the list above.
-ifneq ($(LLVM_ON_UNIX),1)
-PARALLEL_DIRS := $(filter-out bugpoint llvm-db,$(PARALLEL_DIRS))
+# Disable liblto on Windows until compatability is determined.
+ifneq ($(OS), MingW)
+PARALLEL_DIRS += lto
 endif
 
-include $(LLVM_SRC_ROOT)/Makefile.rules
+include $(LEVEL)/Makefile.common