Change Library Names Not To Conflict With Others When Installed

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

18 files changed, 66 insertions, 56 deletions

diff --git a/tools/Makefile.JIT b/tools/Makefile.JIT
index 8c9e5b0cb0..7a2c48f5a6 100644
--- a/tools/Makefile.JIT
+++ b/tools/Makefile.JIT
@@ -18,7 +18,7 @@ LEVEL = ../..
 include $(LEVEL)/Makefile.config
 
 # Generic JIT libraries
-JITLIBS   = lli-jit codegen executionengine
+JITLIBS   = LLVMJIT LLVMCodeGen LLVMExecutionEngine
 ARCHLIBS  =
 
 # You can enable the X86 JIT on a non-X86 host by setting the flag
@@ -30,7 +30,7 @@ endif
 
 # What the X86 JIT requires
 ifdef ENABLE_X86_JIT
-  JITLIBS  += x86 selectiondag
+  JITLIBS  += LLVMX86 LLVMSelectionDAG
   # X86 doesn't require any ARCHLIBS
 endif
 
@@ -43,10 +43,10 @@ endif
 
 # What the Sparc JIT requires
 ifdef ENABLE_SPARCV9_JIT
-  JITLIBS  += sparcv9
-  ARCHLIBS += sparcv9sched sparcv9livevar instrument.a profpaths \
-              bcwriter transforms.a ipo.a ipa.a datastructure.a \
-              sparcv9regalloc
+  JITLIBS  += LLVMSparcV9
+  ARCHLIBS += LLVMSparcV9sched LLVMSparcV9livevar LLVMInstrumentation.a \
+              LLVMProfilePaths LLVMBCWriter LLVMTransforms.a LLVMipo.a LLVMipa.a \
+	      LLVMDataStructure.a LLVMSparcV9regalloc
 endif
 
 # You can enable the PowerPC JIT on a non-PowerPC host by setting the flag
@@ -58,8 +58,9 @@ endif
 
 # What the PowerPC JIT requires
 ifdef ENABLE_PPC_JIT
-  JITLIBS  += powerpc
+  JITLIBS  += LLVMPowerPC
 endif
 
-USEDLIBS += lli-interpreter $(JITLIBS) $(ARCHLIBS) scalaropts analysis.a \
-            transformutils.a bcreader vmcore support target.a LLVMsystem.a
+USEDLIBS += LLVMInterpreter $(JITLIBS) $(ARCHLIBS) LLVMScalarOpts \
+            LLVMAnalysis.a LLVMTransformUtils.a LLVMBCReader LLVMCore \
+	    LLVMSupport.a LLVMTarget.a LLVMSystem.a
diff --git a/tools/analyze/Makefile b/tools/analyze/Makefile
index ec94fe6a3e..0d76f278ff 100644
--- a/tools/analyze/Makefile
+++ b/tools/analyze/Makefile
@@ -8,9 +8,9 @@
 ##===----------------------------------------------------------------------===##
 LEVEL = ../..
 TOOLNAME = analyze
-USEDLIBS = asmparser bcreader analysis ipa datastructure scalaropts.a \
-           transforms.a target.a scalaropts.a transformutils.a vmcore support \
-           LLVMsystem.a
+USEDLIBS = LLVMAsmParser LLVMBCReader LLVMAnalysis LLVMipa LLVMDataStructure \
+	   LLVMScalarOpts.a LLVMTransforms.a LLVMTarget.a LLVMScalarOpts.a \
+	   LLVMTransformUtils.a LLVMCore LLVMSupport.a LLVMSystem.a
 
 TOOLLINKOPTS = $(PLATFORMLIBDL)
 
diff --git a/tools/bugpoint/Makefile b/tools/bugpoint/Makefile
index aa1338ce6a..e3addbdb26 100644
--- a/tools/bugpoint/Makefile
+++ b/tools/bugpoint/Makefile
@@ -10,11 +10,12 @@ LEVEL = ../..
 
 TOOLNAME = bugpoint
 
-OPTLIBS  = transforms instrument profpaths 
-ANALIBS  = datastructure ipa target.a 
+OPTLIBS  = LLVMTransforms LLVMInstrumentation LLVMProfilePaths
+ANALIBS  = LLVMDataStructure LLVMipa LLVMTarget.a 
 
-USEDLIBS = ipo scalaropts analysis $(OPTLIBS) $(ANALIBS) transformutils \
-           asmparser bcreader bcwriter vmcore support LLVMsystem.a
+USEDLIBS = LLVMipo LLVMScalarOpts LLVMAnalysis $(OPTLIBS) $(ANALIBS) \
+	   LLVMTransformUtils LLVMAsmParser LLVMBCReader LLVMBCWriter LLVMCore \
+	   LLVMSupport.a LLVMSystem.a
 
 TOOLLINKOPTS = $(PLATFORMLIBDL)
 
diff --git a/tools/extract/Makefile b/tools/extract/Makefile
index 35c624a4d6..14a8124ee8 100644
--- a/tools/extract/Makefile
+++ b/tools/extract/Makefile
@@ -9,7 +9,8 @@
 LEVEL = ../..
 
 TOOLNAME = extract
-USEDLIBS = bcreader bcwriter transforms.a ipo.a target.a analysis.a \
-           transformutils.a ipa.a vmcore support.a LLVMsystem.a
+USEDLIBS = LLVMBCReader LLVMBCWriter LLVMTransforms.a LLVMipo.a LLVMTarget.a \
+	   LLVMAnalysis.a LLVMTransformUtils.a LLVMipa.a LLVMCore LLVMSupport.a \
+	   LLVMSystem.a
 
 include $(LEVEL)/Makefile.common
diff --git a/tools/gccas/Makefile b/tools/gccas/Makefile
index 37404d4b5f..e67f3adbf7 100644
--- a/tools/gccas/Makefile
+++ b/tools/gccas/Makefile
@@ -9,7 +9,8 @@
 LEVEL = ../..
 
 TOOLNAME = gccas
-USEDLIBS = asmparser bcwriter transforms ipo.a ipa.a scalaropts analysis.a \
-           target.a transformutils vmcore support.a LLVMsystem.a
+USEDLIBS = LLVMAsmParser LLVMBCWriter LLVMTransforms LLVMipo.a LLVMipa.a \
+	   LLVMScalarOpts LLVMAnalysis.a LLVMTarget.a LLVMTransformUtils \
+	   LLVMCore LLVMSupport.a LLVMSystem.a
 
 include $(LEVEL)/Makefile.common
diff --git a/tools/gccld/Makefile b/tools/gccld/Makefile
index fe1b166f04..2915c6b056 100644
--- a/tools/gccld/Makefile
+++ b/tools/gccld/Makefile
@@ -10,7 +10,8 @@
 LEVEL = ../..
 
 TOOLNAME = gccld
-USEDLIBS = ipo.a transforms.a scalaropts.a analysis.a ipa.a transformutils.a \
-           target.a bcreader bcwriter vmcore support.a LLVMsystem.a
+USEDLIBS = LLVMipo.a LLVMTransforms.a LLVMScalarOpts.a LLVMAnalysis.a LLVMipa.a \
+	   LLVMTransformUtils.a LLVMTarget.a LLVMBCReader LLVMBCWriter LLVMCore \
+	   LLVMSupport.a LLVMSystem.a
 
 include $(LEVEL)/Makefile.common
diff --git a/tools/llc/Makefile b/tools/llc/Makefile
index c11c521f9c..553ff952ad 100644
--- a/tools/llc/Makefile
+++ b/tools/llc/Makefile
@@ -10,27 +10,28 @@
 LEVEL = ../..
 TOOLNAME = llc
 USEDLIBS = \
-	cwriter \
-	powerpc \
-	sparcv9 \
-	x86 \
-	skeleton \
-	selectiondag \
-	sparcv9regalloc \
-	sparcv9sched \
-	codegen \
-	target.a \
-	sparcv9livevar \
-	ipa.a \
-	transforms.a \
-	scalaropts.a \
-	analysis.a \
-	transformutils.a \
-	bcreader \
-	bcwriter \
-	vmcore \
-	support.a \
-	LLVMsystem.a
+	LLVMCBackend \
+	LLVMPowerPC \
+	LLVMSparcV9 \
+	LLVMX86 \
+	LLVMSkeleton \
+	LLVMSelectionDAG \
+	LLVMSparcV9RegAlloc \
+	LLVMSparcV9InstrSched \
+	LLVMCodeGen \
+	LLVMTarget.a \
+	LLVMSparcV9LiveVar \
+	LLVMipa.a \
+	LLVMTransforms.a \
+	LLVMScalarOpts.a \
+	LLVMAnalysis.a \
+	LLVMTransformUtils.a \
+	LLVMBCReader \
+	LLVMBCWriter \
+	LLVMCore \
+	LLVMSupport.a \
+	LLVMSystem.a
+
 TOOLLINKOPTS = $(PLATFORMLIBDL)
 
 include $(LEVEL)/Makefile.common
diff --git a/tools/llee/Makefile b/tools/llee/Makefile
index fdf3389f28..9e9fc60a3c 100644
--- a/tools/llee/Makefile
+++ b/tools/llee/Makefile
@@ -7,7 +7,7 @@
 # 
 ##===----------------------------------------------------------------------===##
 LEVEL = ../..
-LIBRARYNAME = execve
+LIBRARYNAME = LLVMexecve
 SHARED_LIBRARY = 1
 include $(LEVEL)/Makefile.common
 
diff --git a/tools/llvm-ar/Makefile b/tools/llvm-ar/Makefile
index 2f4257b64d..938f73ef11 100644
--- a/tools/llvm-ar/Makefile
+++ b/tools/llvm-ar/Makefile
@@ -9,6 +9,6 @@
 LEVEL = ../..
 
 TOOLNAME = llvm-ar 
-USEDLIBS = bcreader vmcore support.a LLVMsystem.a
+USEDLIBS = LLVMBCReader LLVMCore LLVMSupport.a LLVMSystem.a
 
 include $(LEVEL)/Makefile.common
diff --git a/tools/llvm-as/Makefile b/tools/llvm-as/Makefile
index 689e2684ae..5482aa1a95 100644
--- a/tools/llvm-as/Makefile
+++ b/tools/llvm-as/Makefile
@@ -8,6 +8,6 @@
 ##===----------------------------------------------------------------------===##
 LEVEL = ../..
 TOOLNAME = llvm-as
-USEDLIBS = asmparser bcwriter vmcore support.a LLVMsystem.a
+USEDLIBS = LLVMAsmParser LLVMBCWriter LLVMCore LLVMSupport.a LLVMSystem.a
 
 include $(LEVEL)/Makefile.common
diff --git a/tools/llvm-bcanalyzer/Makefile b/tools/llvm-bcanalyzer/Makefile
index e913be2f14..17a9d3234f 100644
--- a/tools/llvm-bcanalyzer/Makefile
+++ b/tools/llvm-bcanalyzer/Makefile
@@ -9,5 +9,5 @@
 LEVEL = ../..
 
 TOOLNAME = llvm-bcanalyzer
-USEDLIBS = bcreader vmcore support.a LLVMsystem.a
+USEDLIBS = LLVMBCReader LLVMCore LLVMSupport.a LLVMSystem.a
 include $(LEVEL)/Makefile.common
diff --git a/tools/llvm-db/Makefile b/tools/llvm-db/Makefile
index db090540cb..e1f1f2d9b7 100644
--- a/tools/llvm-db/Makefile
+++ b/tools/llvm-db/Makefile
@@ -9,7 +9,7 @@
 
 LEVEL = ../..
 TOOLNAME = llvm-db
-USEDLIBS = debugger
+USEDLIBS = LLVMDebugger
 
 # Enable JIT support
 include ../Makefile.JIT
diff --git a/tools/llvm-dis/Makefile b/tools/llvm-dis/Makefile
index 2b0189d40e..3c8d3b5814 100644
--- a/tools/llvm-dis/Makefile
+++ b/tools/llvm-dis/Makefile
@@ -9,5 +9,5 @@
 LEVEL = ../..
 
 TOOLNAME = llvm-dis
-USEDLIBS = bcreader vmcore support.a LLVMsystem.a
+USEDLIBS = LLVMBCReader LLVMCore LLVMSupport.a LLVMSystem.a
 include $(LEVEL)/Makefile.common
diff --git a/tools/llvm-ld/Linker.cpp b/tools/llvm-ld/Linker.cpp
index 4af152b155..9d1999517f 100644
--- a/tools/llvm-ld/Linker.cpp
+++ b/tools/llvm-ld/Linker.cpp
@@ -86,6 +86,7 @@ llvm::GetAllUndefinedSymbols(Module *M,
   std::set<std::string> DefinedSymbols;
   UndefinedSymbols.clear();   // Start out empty
   
+  // Add in all the external functions
   for (Module::iterator I = M->begin(), E = M->end(); I != E; ++I)
     if (I->hasName()) {
       if (I->isExternal())
@@ -93,6 +94,8 @@ llvm::GetAllUndefinedSymbols(Module *M,
       else if (!I->hasInternalLinkage())
         DefinedSymbols.insert(I->getName());
     }
+
+  // Add in all the external globals
   for (Module::giterator I = M->gbegin(), E = M->gend(); I != E; ++I)
     if (I->hasName()) {
       if (I->isExternal())
diff --git a/tools/llvm-link/Makefile b/tools/llvm-link/Makefile
index 1fc4683bb4..4986272406 100644
--- a/tools/llvm-link/Makefile
+++ b/tools/llvm-link/Makefile
@@ -9,6 +9,6 @@
 LEVEL = ../..
 
 TOOLNAME = llvm-link
-USEDLIBS = bcreader bcwriter vmcore support.a LLVMsystem.a
+USEDLIBS = LLVMBCReader LLVMBCWriter LLVMCore LLVMSupport.a LLVMSystem.a
 
 include $(LEVEL)/Makefile.common
diff --git a/tools/llvm-nm/Makefile b/tools/llvm-nm/Makefile
index d1b1bd1505..b3f1702bf5 100644
--- a/tools/llvm-nm/Makefile
+++ b/tools/llvm-nm/Makefile
@@ -9,5 +9,5 @@
 LEVEL = ../..
 
 TOOLNAME = llvm-nm
-USEDLIBS = bcreader vmcore support.a LLVMsystem.a
+USEDLIBS = LLVMBCReader LLVMCore LLVMSupport.a LLVMSystem.a
 include $(LEVEL)/Makefile.common
diff --git a/tools/llvm-prof/Makefile b/tools/llvm-prof/Makefile
index c187296f84..567bc4316a 100644
--- a/tools/llvm-prof/Makefile
+++ b/tools/llvm-prof/Makefile
@@ -9,5 +9,5 @@
 LEVEL = ../..
 
 TOOLNAME = llvm-prof
-USEDLIBS = analysis.a bcreader vmcore support.a LLVMsystem.a
+USEDLIBS = LLVMAnalysis.a LLVMBCReader LLVMCore LLVMSupport.a LLVMSystem.a
 include $(LEVEL)/Makefile.common
diff --git a/tools/opt/Makefile b/tools/opt/Makefile
index de0568afd2..e43fed3987 100644
--- a/tools/opt/Makefile
+++ b/tools/opt/Makefile
@@ -9,10 +9,11 @@
 LEVEL = ../..
 TOOLNAME = opt
 
-USEDLIBS = bcreader bcwriter \
-           instrument profpaths scalaropts \
-           ipo ipa datastructure transforms target.a analysis \
-           transformutils vmcore support LLVMsystem.a
+USEDLIBS = LLVMBCReader LLVMBCWriter LLVMInstrumentation LLVMProfilePaths \
+	   LLVMScalarOpts LLVMipo LLVMipa LLVMDataStructure LLVMTransforms \
+	   LLVMTarget.a LLVMAnalysis LLVMTransformUtils LLVMCore LLVMSupport.a \
+	   LLVMSystem.a 
+
 TOOLLINKOPTS = $(PLATFORMLIBDL)
 
 include $(LEVEL)/Makefile.common