Use LINK_COMPONENTS to specify *components* to link against instead of

using USED_LIBS to specify *libraries* to link against.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@30090 91177308-0d34-0410-b5e6-96231b3b80d8

18 files changed, 21 insertions, 64 deletions

diff --git a/tools/bugpoint/Makefile b/tools/bugpoint/Makefile
index b713650983d..4c4aa0cb0ce 100644
--- a/tools/bugpoint/Makefile
+++ b/tools/bugpoint/Makefile
@@ -10,13 +10,8 @@ LEVEL = ../..
 
 TOOLNAME = bugpoint
 
-OPTLIBS  = LLVMTransforms.a LLVMInstrumentation.a
-ANALIBS  = LLVMDataStructure LLVMipa.a LLVMTarget.a 
-
-USEDLIBS = LLVMipo.a LLVMScalarOpts.a $(OPTLIBS) $(ANALIBS) LLVMAnalysis.a \
-	   LLVMTransformUtils.a \
-	   LLVMAsmParser.a LLVMLinker.a LLVMBCReader.a LLVMBCWriter.a \
-	   LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
+LINK_COMPONENTS := bcreader bcwriter asmparser instrumentation scalaropts ipo \
+                   datastructure transforms linker
 REQUIRES_EH := 1
 
 include $(LEVEL)/Makefile.common
diff --git a/tools/gccas/Makefile b/tools/gccas/Makefile
index 1f62ade4ed2..8664354195a 100644
--- a/tools/gccas/Makefile
+++ b/tools/gccas/Makefile
@@ -9,9 +9,7 @@
 LEVEL = ../..
 
 TOOLNAME = gccas
-USEDLIBS = LLVMAsmParser.a LLVMBCWriter.a LLVMTransforms.a LLVMipo.a LLVMipa.a \
-           LLVMScalarOpts.a LLVMAnalysis.a LLVMTarget.a LLVMTransformUtils.a \
-           LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
+LINK_COMPONENTS = asmparser bcwriter scalaropts ipo ipa transforms
 REQUIRES_EH := 1
 
 include $(LEVEL)/Makefile.common
diff --git a/tools/gccld/Makefile b/tools/gccld/Makefile
index 7638f7fb25d..38261d913a5 100644
--- a/tools/gccld/Makefile
+++ b/tools/gccld/Makefile
@@ -10,10 +10,7 @@
 LEVEL = ../..
 
 TOOLNAME = gccld
-USEDLIBS = LLVMipo.a LLVMTransforms.a LLVMScalarOpts.a LLVMAnalysis.a \
-           LLVMipa.a LLVMTransformUtils.a LLVMTarget.a LLVMLinker.a \
-           LLVMArchive.a LLVMBCReader.a LLVMBCWriter.a \
-           LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
+LINK_COMPONENTS = bcreader bcwriter ipo scalaropts ipa linker
 REQUIRES_EH := 1
 
 include $(LEVEL)/Makefile.common
diff --git a/tools/llc/Makefile b/tools/llc/Makefile
index 812e59a224f..847a175d25d 100644
--- a/tools/llc/Makefile
+++ b/tools/llc/Makefile
@@ -13,24 +13,10 @@ REQUIRES_EH := 1
 
 # Include this here so we can get the configuration of the targets
 # that have been configured for construction. We have to do this 
-# early so we can set up USEDLIBS properly before includeing Makefile.rules
+# early so we can set up LINK_COMPONENTS before including Makefile.rules
 include $(LEVEL)/Makefile.config
 
-USEDLIBS := $(addprefix LLVM,$(TARGETS_TO_BUILD)) \
-	LLVMTarget.a \
-	LLVMCodeGen.a \
-	LLVMSelectionDAG.a \
-	LLVMipa.a \
-	LLVMTransforms.a \
-	LLVMScalarOpts.a \
-	LLVMTransformUtils.a \
-	LLVMAnalysis.a \
-	LLVMBCReader.a \
-	LLVMBCWriter.a \
-	LLVMCore.a \
-	LLVMSupport.a \
-	LLVMbzip2.a \
-	LLVMSystem.a
+LINK_COMPONENTS := $(TARGETS_TO_BUILD) bcreader
 
 include $(LLVM_SRC_ROOT)/Makefile.rules
 
diff --git a/tools/llvm-ar/Makefile b/tools/llvm-ar/Makefile
index 18da6176820..bf1516732a6 100644
--- a/tools/llvm-ar/Makefile
+++ b/tools/llvm-ar/Makefile
@@ -9,8 +9,7 @@
 LEVEL = ../..
 
 TOOLNAME = llvm-ar
-USEDLIBS = LLVMArchive.a LLVMBCReader.a \
-	   LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
+LINK_COMPONENTS = archive bcreader
 REQUIRES_EH := 1
 
 include $(LEVEL)/Makefile.common
diff --git a/tools/llvm-bcanalyzer/Makefile b/tools/llvm-bcanalyzer/Makefile
index b3acd0157e0..65be92123f6 100644
--- a/tools/llvm-bcanalyzer/Makefile
+++ b/tools/llvm-bcanalyzer/Makefile
@@ -9,7 +9,7 @@
 LEVEL = ../..
 
 TOOLNAME = llvm-bcanalyzer
-USEDLIBS = LLVMBCReader.a LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
+LINK_COMPONENTS := bcreader
 REQUIRES_EH := 1
 
 include $(LEVEL)/Makefile.common
diff --git a/tools/llvm-db/Makefile b/tools/llvm-db/Makefile
index 3bf9d54afd2..7c0d58a226a 100644
--- a/tools/llvm-db/Makefile
+++ b/tools/llvm-db/Makefile
@@ -9,8 +9,7 @@
 
 LEVEL = ../..
 TOOLNAME = llvm-db
-USEDLIBS = LLVMDebugger.a LLVMBCReader.a LLVMCore.a LLVMSupport.a \
-	  LLVMbzip2.a LLVMSystem.a
+LINK_COMPONENTS := debugger bcreader
 REQUIRES_EH := 1
 
 include $(LEVEL)/Makefile.common
diff --git a/tools/llvm-extract/Makefile b/tools/llvm-extract/Makefile
index 20a107c5c76..8efe423a98b 100644
--- a/tools/llvm-extract/Makefile
+++ b/tools/llvm-extract/Makefile
@@ -9,9 +9,7 @@
 LEVEL = ../..
 
 TOOLNAME = llvm-extract
-USEDLIBS = LLVMBCReader.a LLVMBCWriter.a LLVMTransforms.a LLVMipo.a \
-	   LLVMTarget.a LLVMAnalysis.a LLVMTransformUtils.a LLVMipa.a \
-           LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
+LINK_COMPONENTS := bcreader bcwriter ipo
 REQUIRES_EH := 1
 
 include $(LEVEL)/Makefile.common
diff --git a/tools/llvm-ld/Makefile b/tools/llvm-ld/Makefile
index 636aea4ef61..dc8bffb742b 100644
--- a/tools/llvm-ld/Makefile
+++ b/tools/llvm-ld/Makefile
@@ -10,10 +10,7 @@
 LEVEL = ../..
 
 TOOLNAME = llvm-ld
-USEDLIBS = LLVMipo.a LLVMTransforms.a LLVMScalarOpts.a LLVMAnalysis.a \
-	   LLVMipa.a LLVMTransformUtils.a LLVMTarget.a LLVMLinker.a \
-	   LLVMArchive.a LLVMBCReader.a LLVMBCWriter.a \
-	   LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
+LINK_COMPONENTS = ipo scalaropts linker archive bcreader bcwriter
 REQUIRES_EH := 1
 
 include $(LEVEL)/Makefile.common
diff --git a/tools/llvm-link/Makefile b/tools/llvm-link/Makefile
index 0663396cdd9..f9761358671 100644
--- a/tools/llvm-link/Makefile
+++ b/tools/llvm-link/Makefile
@@ -9,8 +9,7 @@
 LEVEL = ../..
 
 TOOLNAME = llvm-link
-USEDLIBS = LLVMLinker.a LLVMBCReader.a LLVMBCWriter.a \
-	   LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
+LINK_COMPONENTS = linker bcreader bcwriter
 REQUIRES_EH := 1
 
 include $(LEVEL)/Makefile.common
diff --git a/tools/llvm-nm/Makefile b/tools/llvm-nm/Makefile
index c7502e23061..5e18c4a1629 100644
--- a/tools/llvm-nm/Makefile
+++ b/tools/llvm-nm/Makefile
@@ -9,8 +9,7 @@
 LEVEL = ../..
 
 TOOLNAME = llvm-nm
-USEDLIBS = LLVMArchive.a LLVMBCReader.a \
-	   LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
+LINK_COMPONENTS = archive bcreader
 REQUIRES_EH := 1
 
 include $(LEVEL)/Makefile.common
diff --git a/tools/llvm-prof/Makefile b/tools/llvm-prof/Makefile
index 9774f64fa1a..b745e654927 100644
--- a/tools/llvm-prof/Makefile
+++ b/tools/llvm-prof/Makefile
@@ -9,8 +9,7 @@
 LEVEL = ../..
 
 TOOLNAME = llvm-prof
-USEDLIBS = LLVMAnalysis.a LLVMBCReader.a \
-           LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
+LINK_COMPONENTS = bcreader analysis
 REQUIRES_EH := 1
 
 include $(LEVEL)/Makefile.common
diff --git a/tools/llvm-ranlib/Makefile b/tools/llvm-ranlib/Makefile
index 1379532f5ee..ca4d0ce85d1 100644
--- a/tools/llvm-ranlib/Makefile
+++ b/tools/llvm-ranlib/Makefile
@@ -9,8 +9,7 @@
 
 LEVEL = ../..
 TOOLNAME = llvm-ranlib
-USEDLIBS = LLVMArchive.a LLVMBCReader.a \
-	   LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
+LINK_COMPONENTS = archive bcreader
 REQUIRES_EH := 1
 
 include $(LEVEL)/Makefile.common
diff --git a/tools/llvm2cpp/Makefile b/tools/llvm2cpp/Makefile
index cc3169c46f1..88db590c9bf 100644
--- a/tools/llvm2cpp/Makefile
+++ b/tools/llvm2cpp/Makefile
@@ -8,10 +8,9 @@
 ##===----------------------------------------------------------------------===##
 LEVEL = ../..
 TOOLNAME = llvm2cpp
-USEDLIBS = LLVMBCReader.a LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
+LINK_COMPONENTS = bcreader
 REQUIRES_EH := 1
 
 include $(LEVEL)/Makefile.common
 
 CompileCommonOpts := $(filter-out -pedantic,$(CompileCommonOpts))
-CompileCommonOpts := $(filter-out -Wno-long-long,$(CompileCommonOpts))
diff --git a/tools/llvmc/Makefile b/tools/llvmc/Makefile
index 2ccf85a55a7..335ac5904c2 100644
--- a/tools/llvmc/Makefile
+++ b/tools/llvmc/Makefile
@@ -8,7 +8,7 @@
 ##===----------------------------------------------------------------------===##
 LEVEL = ../..
 TOOLNAME = llvmc
-USEDLIBS = LLVMCore.a LLVMSupport.a LLVMSystem.a
+LINK_COMPONENTS = support system
 CONFIG_FILES = c cpp ll
 EXTRA_DIST = c cpp ll ConfigLexer.cpp.cvs ConfigLexer.l.cvs
 REQUIRES_EH := 1
diff --git a/tools/llvmc/llvmc.cpp b/tools/llvmc/llvmc.cpp
index f2e7c1fb37b..3b22149db3c 100644
--- a/tools/llvmc/llvmc.cpp
+++ b/tools/llvmc/llvmc.cpp
@@ -295,7 +295,6 @@ int main(int argc, char **argv) {
     if (KeepTemps)      flags |= CompilerDriver::KEEP_TEMPS_FLAG;
     if (ShowStats)      flags |= CompilerDriver::SHOW_STATS_FLAG;
     if (TimeActions)    flags |= CompilerDriver::TIME_ACTIONS_FLAG;
-    if (TimePassesIsEnabled) flags |= CompilerDriver::TIME_PASSES_FLAG;
     if (StripOutput)    flags |= CompilerDriver::STRIP_OUTPUT_FLAG;
     CD->setDriverFlags(flags);
 
diff --git a/tools/lto/Makefile b/tools/lto/Makefile
index c2daead4dfd..c7befa44c10 100644
--- a/tools/lto/Makefile
+++ b/tools/lto/Makefile
@@ -17,14 +17,10 @@ DONT_BUILD_RELINKED = 1
 
 # Include this here so we can get the configuration of the targets
 # that have been configured for construction. We have to do this 
-# early so we can set up USEDLIBS properly before includeing Makefile.rules
+# early so we can set up LINK_COMPONENTS before includeing Makefile.rules
 include $(LEVEL)/Makefile.config
 
-USEDLIBS := $(addprefix LLVM,$(TARGETS_TO_BUILD)) \
-	LLVMSelectionDAG.a LLVMCodeGen.a LLVMipo.a LLVMTransforms.a \
-	LLVMScalarOpts.a LLVMipa.a LLVMTransformUtils.a LLVMAnalysis.a \
-	LLVMTarget.a LLVMBCReader.a LLVMBCWriter.a LLVMSystem.a LLVMLinker.a \
-	LLVMCore.a LLVMSupport.a LLVMbzip2.a
+LINK_COMPONENTS := $(TARGETS_TO_BUILD) ipo scalaropts bcreader bcwriter
 
 include $(LEVEL)/Makefile.common
 
diff --git a/tools/opt/Makefile b/tools/opt/Makefile
index 4bb9ed53b1a..787136e9219 100644
--- a/tools/opt/Makefile
+++ b/tools/opt/Makefile
@@ -10,9 +10,7 @@ LEVEL = ../..
 TOOLNAME = opt
 REQUIRES_EH := 1
 
-USEDLIBS = LLVMBCReader.a LLVMBCWriter.a LLVMInstrumentation.a \
-	   LLVMScalarOpts.a LLVMipo.a LLVMipa.a LLVMDataStructure \
-	   LLVMTransforms.a LLVMTarget.a LLVMTransformUtils.a LLVMAnalysis.a \
-	   LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a 
+LINK_COMPONENTS := bcreader bcwriter instrumentation scalaropts ipo \
+                   datastructure transforms
 
 include $(LEVEL)/Makefile.common