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

diff --git a/examples/ModuleMaker/Makefile b/examples/ModuleMaker/Makefile
index c99b7e7891c4b086331df27d76f5d5f5b643c8a2..2bd8a38b7e2f955964777c0ff846557555cef11c 100644 (file)
--- a/examples/ModuleMaker/Makefile
+++ b/examples/ModuleMaker/Makefile
@@ -8,6 +8,6 @@
 ##===----------------------------------------------------------------------===##
 LEVEL=../..
 TOOLNAME=ModuleMaker
-USEDLIBS= bcwriter vmcore support.a LLVMsystem.a
+USEDLIBS= LLVMBCWriter LLVMCore LLVMSupport.a LLVMSystem.a
 
 include $(LEVEL)/Makefile.common

diff --git a/lib/Analysis/Makefile b/lib/Analysis/Makefile
index 2a8d34ea726d6036a3c508c3ccc6c3716dce71e7..b679b572c5b0811fa0a9df2155eba3f4b6e1cfec 100644 (file)
--- a/lib/Analysis/Makefile
+++ b/lib/Analysis/Makefile
@@ -8,7 +8,7 @@
 ##===----------------------------------------------------------------------===##
 
 LEVEL = ../..
-LIBRARYNAME = analysis
+LIBRARYNAME = LLVMAnalysis
 PARALLEL_DIRS = IPA DataStructure
 BUILD_ARCHIVE = 1
 

diff --git a/lib/AsmParser/Makefile b/lib/AsmParser/Makefile
index b5e6fb9cf6d4a3ef205444f5ba9c07677d1456ea..2b85e1aaad1f93ffd55db9b0c093bc9d68b8e8b4 100644 (file)
--- a/lib/AsmParser/Makefile
+++ b/lib/AsmParser/Makefile
@@ -9,7 +9,7 @@
 
 LEVEL = ../..
 
-LIBRARYNAME = asmparser
+LIBRARYNAME = LLVMAsmParser
 
 include $(LEVEL)/Makefile.common
 

diff --git a/lib/CodeGen/Makefile b/lib/CodeGen/Makefile
index cc72a03a16aa7cfed53a2640cf4300f9cf32ec82..05453a36ef7d025c450fd9fa6ab0779b553140c9 100644 (file)
--- a/lib/CodeGen/Makefile
+++ b/lib/CodeGen/Makefile
@@ -9,6 +9,6 @@
 
 LEVEL = ../..
 PARALLEL_DIRS = SelectionDAG
-LIBRARYNAME = codegen
+LIBRARYNAME = LLVMCodeGen
 
 include $(LEVEL)/Makefile.common

diff --git a/lib/CodeGen/SelectionDAG/Makefile b/lib/CodeGen/SelectionDAG/Makefile
index d3fc5a956ff67639b342cc03418504033f0a9a99..85aafab0b84f2502e2e887e50376555cc01520ed 100644 (file)
--- a/lib/CodeGen/SelectionDAG/Makefile
+++ b/lib/CodeGen/SelectionDAG/Makefile
@@ -8,6 +8,6 @@
 ##===----------------------------------------------------------------------===##
 LEVEL = ../../..
 PARALLEL_DIRS =
-LIBRARYNAME = selectiondag
+LIBRARYNAME = LLVMSelectionDAG
 
 include $(LEVEL)/Makefile.common

diff --git a/lib/Debugger/Makefile b/lib/Debugger/Makefile
index 1cb6e0d21d47f0376048cc965988e94c4d70d317..b9df8dc775c2ed51b799e671aaecc421a50edb91 100644 (file)
--- a/lib/Debugger/Makefile
+++ b/lib/Debugger/Makefile
@@ -8,6 +8,6 @@
 ##===----------------------------------------------------------------------===##
 
 LEVEL = ../..
-LIBRARYNAME = debugger
+LIBRARYNAME = LLVMDebugger
 
 include $(LEVEL)/Makefile.common

diff --git a/lib/ExecutionEngine/Makefile b/lib/ExecutionEngine/Makefile
index a100b7032335a1d99b3785aa603d020bcdf8d6aa..c4998fc53d1b2fda69c84608c6780a5c1e8ffe8f 100644 (file)
--- a/lib/ExecutionEngine/Makefile
+++ b/lib/ExecutionEngine/Makefile
@@ -7,7 +7,7 @@
 # 
 ##===----------------------------------------------------------------------===##
 LEVEL = ../..
-LIBRARYNAME = executionengine
+LIBRARYNAME = LLVMExecutionEngine
 PARALLEL_DIRS = Interpreter JIT
 
 include $(LEVEL)/Makefile.common

diff --git a/lib/Support/Makefile b/lib/Support/Makefile
index 0b6660408ac9e5145235c62a84eb7dd02b16a687..2e4a5b066aa90841e562388fc57b30c3345199ba 100644 (file)
--- a/lib/Support/Makefile
+++ b/lib/Support/Makefile
@@ -7,7 +7,7 @@
 # 
 ##===----------------------------------------------------------------------===##
 LEVEL = ../..
-LIBRARYNAME = support
+LIBRARYNAME = LLVMSupport
 BUILD_ARCHIVE = 1
 
 include $(LEVEL)/Makefile.common

diff --git a/lib/System/Makefile b/lib/System/Makefile
index e40fe4bca024774ee46a206167147ab2ca19d575..d0a7acff26bbbd160d3f151560f5758df6423dfe 100644 (file)
--- a/lib/System/Makefile
+++ b/lib/System/Makefile
@@ -7,7 +7,7 @@
 # 
 ##===----------------------------------------------------------------------===##
 LEVEL = ../..
-LIBRARYNAME = LLVMsystem
+LIBRARYNAME = LLVMSystem
 BUILD_ARCHIVE = 1
 
 EXTRA_DIST = AIX Cygwin Darwin FreeBSD Interix Linux SunOS Unix Win32

diff --git a/lib/System/Unix/MappedFile.cpp b/lib/System/Unix/MappedFile.cpp
index fec2408c195bc3410f165c1334fe7a6654bdd8e7..7e03cd15a819a9a6e46d8fad34dd4cdac80b8235 100644 (file)
--- a/lib/System/Unix/MappedFile.cpp
+++ b/lib/System/Unix/MappedFile.cpp
@@ -20,7 +20,6 @@
 #include "Unix.h"
 #include <fcntl.h>
 #include <sys/mman.h>
-#include <sys/stat.h>
 
 namespace llvm {
 using namespace sys;

diff --git a/lib/System/Unix/MappedFile.inc b/lib/System/Unix/MappedFile.inc
index fec2408c195bc3410f165c1334fe7a6654bdd8e7..7e03cd15a819a9a6e46d8fad34dd4cdac80b8235 100644 (file)
--- a/lib/System/Unix/MappedFile.inc
+++ b/lib/System/Unix/MappedFile.inc
@@ -20,7 +20,6 @@
 #include "Unix.h"
 #include <fcntl.h>
 #include <sys/mman.h>
-#include <sys/stat.h>
 
 namespace llvm {
 using namespace sys;

diff --git a/lib/Target/CBackend/Makefile b/lib/Target/CBackend/Makefile
index 7fcc434c911ef11ce379a587d9175bd57f621ac5..fc32db0a40ed270f293baf0ed3fcad335a009062 100644 (file)
--- a/lib/Target/CBackend/Makefile
+++ b/lib/Target/CBackend/Makefile
@@ -8,6 +8,6 @@
 ##===----------------------------------------------------------------------===##
 
 LEVEL = ../../..
-LIBRARYNAME = cwriter
+LIBRARYNAME = LLVMCBackend
 include $(LEVEL)/Makefile.common
 

diff --git a/lib/Target/Makefile b/lib/Target/Makefile
index da74511be519b9e5e0b0581cf080e122d6ca73dc..7c525ef86fff2eb79343e338f4361a7f132b420f 100644 (file)
--- a/lib/Target/Makefile
+++ b/lib/Target/Makefile
@@ -8,7 +8,7 @@
 ##===----------------------------------------------------------------------===##
 LEVEL = ../..
 PARALLEL_DIRS = CBackend X86 SparcV9 PowerPC Skeleton
-LIBRARYNAME = target
+LIBRARYNAME = LLVMTarget
 BUILD_ARCHIVE = 1
 
 include $(LEVEL)/Makefile.common

diff --git a/lib/Target/PowerPC/Makefile b/lib/Target/PowerPC/Makefile
index 05768ab212c11a4935dc8808b246530c976b5b1e..95432819cdcec78f83afffadaaa648209d3a8932 100644 (file)
--- a/lib/Target/PowerPC/Makefile
+++ b/lib/Target/PowerPC/Makefile
@@ -7,7 +7,7 @@
 # 
 ##===----------------------------------------------------------------------===##
 LEVEL = ../../..
-LIBRARYNAME = powerpc
+LIBRARYNAME = LLVMPowerPC
 TARGET = PowerPC
 
 # Make sure that tblgen is run, first thing.

diff --git a/lib/Target/Skeleton/Makefile b/lib/Target/Skeleton/Makefile
index bc9a16ddfd9824b9dc28a19bf04859056dce60ee..07ce6f267c61fd47b99e5f58fe6a6f2a025c79eb 100644 (file)
--- a/lib/Target/Skeleton/Makefile
+++ b/lib/Target/Skeleton/Makefile
@@ -8,7 +8,7 @@
 ##===----------------------------------------------------------------------===##
 
 LEVEL = ../../..
-LIBRARYNAME = skeleton
+LIBRARYNAME = LLVMSkeleton
 
 TARGET = Skeleton
 # Make sure that tblgen is run, first thing.

diff --git a/lib/Target/SparcV9/InstrSched/Makefile b/lib/Target/SparcV9/InstrSched/Makefile
index 81caf77b1fc3fb569acf12f02f02cc9a19e6e81a..ea2c3aa57a4ed96d6dd1b04fe58259b3e2f905e6 100644 (file)
--- a/lib/Target/SparcV9/InstrSched/Makefile
+++ b/lib/Target/SparcV9/InstrSched/Makefile
@@ -9,6 +9,6 @@
 
 LEVEL = ../../../..
 DIRS  = 
-LIBRARYNAME = sparcv9sched
+LIBRARYNAME = LLVMSparcV9InstrSched
 
 include $(LEVEL)/Makefile.common

diff --git a/lib/Target/SparcV9/LiveVar/Makefile b/lib/Target/SparcV9/LiveVar/Makefile
index 6973f63aa58dee4145bb2000fc1f3dd136b7acfc..a2a53e6ca3affd0758bb9276785fcffd63bc52c0 100644 (file)
--- a/lib/Target/SparcV9/LiveVar/Makefile
+++ b/lib/Target/SparcV9/LiveVar/Makefile
@@ -8,7 +8,7 @@
 ##===----------------------------------------------------------------------===##
 
 LEVEL = ../../../..
-LIBRARYNAME = sparcv9livevar
+LIBRARYNAME = LLVMSparcV9LiveVar
 
 include $(LEVEL)/Makefile.common
 

diff --git a/lib/Target/SparcV9/Makefile b/lib/Target/SparcV9/Makefile
index 363b73cad6d63754072bef180e330c5df5aa9578..30ee86998716739ce9388d0e7bcd8d53b9d593ef 100644 (file)
--- a/lib/Target/SparcV9/Makefile
+++ b/lib/Target/SparcV9/Makefile
@@ -7,7 +7,7 @@
 # 
 ##===----------------------------------------------------------------------===##
 LEVEL = ../../..
-LIBRARYNAME = sparcv9
+LIBRARYNAME = LLVMSparcV9
 PARALLEL_DIRS = InstrSched LiveVar ModuloScheduling RegAlloc
 
 BUILT_SOURCES = \

diff --git a/lib/Target/SparcV9/ModuloScheduling/Makefile b/lib/Target/SparcV9/ModuloScheduling/Makefile
index 44bf5ed6caed3fc1e00721901d6bb865f06a1815..2ec0503a173bd0711d1390bd7085d742852de78a 100644 (file)
--- a/lib/Target/SparcV9/ModuloScheduling/Makefile
+++ b/lib/Target/SparcV9/ModuloScheduling/Makefile
@@ -9,6 +9,6 @@
 
 LEVEL = ../../../..
 DIRS  = 
-LIBRARYNAME = sparcv9modulosched
+LIBRARYNAME = LLVMSparcV9ModuloSched
 
 include $(LEVEL)/Makefile.common

diff --git a/lib/Target/SparcV9/RegAlloc/Makefile b/lib/Target/SparcV9/RegAlloc/Makefile
index 4daa1f5c469c7ead808e0d775dad0f62df6a82be..c19984cb204b92f7c4f30d402ba95c9af22268f7 100644 (file)
--- a/lib/Target/SparcV9/RegAlloc/Makefile
+++ b/lib/Target/SparcV9/RegAlloc/Makefile
@@ -9,7 +9,7 @@
 
 LEVEL = ../../../..
 DIRS  = 
-LIBRARYNAME = sparcv9regalloc
+LIBRARYNAME = LLVMSparcV9RegAlloc
 BUILD_ARCHIVE = 1
 
 include $(LEVEL)/Makefile.common

diff --git a/lib/Target/X86/Makefile b/lib/Target/X86/Makefile
index bdaf28c5e8ac330a6e9a97ca720d7fe0e45589d1..87115eac81a6e618d9480d97f2bba55dcca08092 100644 (file)
--- a/lib/Target/X86/Makefile
+++ b/lib/Target/X86/Makefile
@@ -7,7 +7,7 @@
 # 
 ##===----------------------------------------------------------------------===##
 LEVEL = ../../..
-LIBRARYNAME = x86
+LIBRARYNAME = LLVMX86
 TARGET = X86
 # Make sure that tblgen is run, first thing.
 BUILT_SOURCES = X86GenRegisterInfo.h.inc X86GenRegisterNames.inc \

diff --git a/lib/Transforms/Hello/Makefile b/lib/Transforms/Hello/Makefile
index af4253d1d1a92f5dfc18abbd85bdf95e1457234b..d9886a95e558021e8d0385c58b4c0e9bc4ec094e 100644 (file)
--- a/lib/Transforms/Hello/Makefile
+++ b/lib/Transforms/Hello/Makefile
@@ -8,7 +8,7 @@
 ##===----------------------------------------------------------------------===##
 
 LEVEL = ../../..
-LIBRARYNAME = hello
+LIBRARYNAME = LLVMHello
 SHARED_LIBRARY = 1
 
 include $(LEVEL)/Makefile.common

diff --git a/lib/Transforms/IPO/Makefile b/lib/Transforms/IPO/Makefile
index fe82fc11fa24fcd71a66b22dd0c1dba17d856117..4f4563f18c8552c12bc5a835eafeb334140f8291 100644 (file)
--- a/lib/Transforms/IPO/Makefile
+++ b/lib/Transforms/IPO/Makefile
@@ -7,7 +7,7 @@
 # 
 ##===----------------------------------------------------------------------===##
 LEVEL = ../../..
-LIBRARYNAME = ipo
+LIBRARYNAME = LLVMipo
 BUILD_ARCHIVE = 1
 
 include $(LEVEL)/Makefile.common

diff --git a/lib/Transforms/Instrumentation/Makefile b/lib/Transforms/Instrumentation/Makefile
index e1831afab6c4dbb86188ec6b961122c17cc43e4b..d749b6b3bde3db50e4f034471a1229e7edf3eb9d 100644 (file)
--- a/lib/Transforms/Instrumentation/Makefile
+++ b/lib/Transforms/Instrumentation/Makefile
@@ -7,7 +7,7 @@
 # 
 ##===----------------------------------------------------------------------===##
 LEVEL = ../../..
-LIBRARYNAME = instrument
+LIBRARYNAME = LLVMInstrumentation 
 PARALLEL_DIRS = ProfilePaths 
 BUILD_ARCHIVE = 1
 

diff --git a/lib/Transforms/Instrumentation/ProfilePaths/Makefile b/lib/Transforms/Instrumentation/ProfilePaths/Makefile
index 8deeeac814ac38964aba9bfbcc76cd99b1cb12b8..5a7477caf322fa81ac5e01f436a2bed6f7d05414 100644 (file)
--- a/lib/Transforms/Instrumentation/ProfilePaths/Makefile
+++ b/lib/Transforms/Instrumentation/ProfilePaths/Makefile
@@ -7,7 +7,7 @@
 # 
 ##===----------------------------------------------------------------------===##
 LEVEL = ../../../..
-LIBRARYNAME = profpaths
+LIBRARYNAME = LLVMProfilePaths
 
 include $(LEVEL)/Makefile.common
 

diff --git a/lib/Transforms/Makefile b/lib/Transforms/Makefile
index 88a2ca222fc54e6e55439ba1127a246ea0ba3f23..25cee595fd2dcb8254213e240d0378d1cb5e8a97 100644 (file)
--- a/lib/Transforms/Makefile
+++ b/lib/Transforms/Makefile
@@ -8,7 +8,7 @@
 ##===----------------------------------------------------------------------===##
 LEVEL = ../..
 PARALLEL_DIRS = Utils Instrumentation Scalar IPO
-LIBRARYNAME = transforms
+LIBRARYNAME = LLVMTransforms
 BUILD_ARCHIVE = 1
 
 include $(LEVEL)/Makefile.common

diff --git a/lib/Transforms/Scalar/Makefile b/lib/Transforms/Scalar/Makefile
index 6ea90d178c6435aeb9a5032434c73ac4ada393a1..267747f57b875bdb92015aefa4d5837d2b5453ad 100644 (file)
--- a/lib/Transforms/Scalar/Makefile
+++ b/lib/Transforms/Scalar/Makefile
@@ -7,7 +7,7 @@
 # 
 ##===----------------------------------------------------------------------===##
 LEVEL = ../../..
-LIBRARYNAME = scalaropts
+LIBRARYNAME = LLVMScalarOpts
 BUILD_ARCHIVE = 1
 
 include $(LEVEL)/Makefile.common

diff --git a/lib/Transforms/Utils/Makefile b/lib/Transforms/Utils/Makefile
index f4da9832fdea94528f19f24c8d130ce63f8c2c81..b349b6c5c524d6b6d46357eef7f698dc7b7ea227 100644 (file)
--- a/lib/Transforms/Utils/Makefile
+++ b/lib/Transforms/Utils/Makefile
@@ -7,7 +7,7 @@
 # 
 ##===----------------------------------------------------------------------===##
 LEVEL = ../../..
-LIBRARYNAME = transformutils
+LIBRARYNAME = LLVMTransformUtils
 BUILD_ARCHIVE = 1
 
 include $(LEVEL)/Makefile.common

diff --git a/lib/VMCore/Makefile b/lib/VMCore/Makefile
index 9fc1c96caa9a211e1ecbfb054872ee3557b5a5db..d3df2bfe785f8c135838a2c1886ab0ca5a5e230e 100644 (file)
--- a/lib/VMCore/Makefile
+++ b/lib/VMCore/Makefile
@@ -7,7 +7,7 @@
 # 
 ##===----------------------------------------------------------------------===##
 LEVEL = ../..
-LIBRARYNAME = vmcore
+LIBRARYNAME = LLVMCore
 
 include $(LEVEL)/Makefile.common
 

diff --git a/projects/Stacker/samples/Makefile b/projects/Stacker/samples/Makefile
index d5b9b6ed0a126c91392b5b0d70fd41540de0bc5e..22190a78dbb2ecef43f1da6bbdf18284c0ff5d97 100644 (file)
--- a/projects/Stacker/samples/Makefile
+++ b/projects/Stacker/samples/Makefile
@@ -24,7 +24,7 @@ LLVMDIS_EXEC = $(BUILD_OBJ_ROOT)/tools/$(CONFIGURATION)/llvm-dis
 all :: $(SAMPLES)
 
 ifdef OPTIMIZE
-%.bc : %.st 
+% : %.st 
        @$(ECHO) "Compiling and Optimizing $< to $*.bc"
        $(VERB)$(STKRC_EXEC) -e -o - $< | opt -stats -q -f -o $*.bc \
            -aa-eval -adce -branch-combine -cee -constmerge -constprop -dce -die -ds-aa \

diff --git a/projects/Stacker/tools/stkrc/Makefile b/projects/Stacker/tools/stkrc/Makefile
index f413dc236e46f995ef46c487c282fd025ba19536..4f352836fe68252a31055b0094faf67bf57bb5c1 100644 (file)
--- a/projects/Stacker/tools/stkrc/Makefile
+++ b/projects/Stacker/tools/stkrc/Makefile
@@ -8,10 +8,11 @@ LEVEL=../..
 #
 # Give the name of a library.  This will build a dynamic version.
 #
-TOOLNAME=stkrc
-LLVMLIBS= asmparser bcwriter transforms ipo.a ipa.a \
-        scalaropts analysis.a target.a transformutils \
-        vmcore support.a LLVMsystem.a 
+TOOLNAME = stkrc
+LLVMLIBS = LLVMAsmParser LLVMBCWriter LLVMTransforms LLVMipo.a LLVMipa.a \
+          LLVMScalarOpts LLVMAnalysis.a LLVMTarget.a LLVMTransformUtils \
+          LLVMCore LLVMSupport.a LLVMSystem.a 
+
 USEDLIBS=stkr_compiler 
 
 

diff --git a/tools/Makefile.JIT b/tools/Makefile.JIT
index 8c9e5b0cb0a91a5186d77857e9e42a2267a746e9..7a2c48f5a6bd75031a31c4b793466a3be3d2643c 100644 (file)
--- 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 ec94fe6a3ebc2780f6237d3581dd871f0da3f59b..0d76f278ffe83daba1a8277fe05d6a2106b8bfce 100644 (file)
--- 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 aa1338ce6aa388279c4a770abdcb5d04843d4af7..e3addbdb2662b1efa5f483b865f19ff809d89c16 100644 (file)
--- 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 35c624a4d6b8befb5a49bf286a26c41741c1bc6d..14a8124ee840234b64c7fa0cfecd32a8b5374e9d 100644 (file)
--- 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 37404d4b5ffd16146e4e7b025d43be9efd9ec28c..e67f3adbf7f53e0bcd58168c45dca5ff7552a75c 100644 (file)
--- 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 fe1b166f044f88bd28225f33869140db28c3e927..2915c6b0567393b0dbda2bcacd9134862de943e8 100644 (file)
--- 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 c11c521f9c2532120c5b7818341c27a554ce92ee..553ff952add321787c21fbd294cd82ee77c319b2 100644 (file)
--- 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 fdf3389f28aed894a8fe7d06e748678bfea78dec..9e9fc60a3c828bf0012ea890f60f34a5f347a134 100644 (file)
--- 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 2f4257b64de43ba2f58128820d20239118b7f6e4..938f73ef11a8d67f71a2079d70a5d9aef207ce2c 100644 (file)
--- 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 689e2684aeee82a45819f6aca75af5fd6c89e9b5..5482aa1a9592ad370c8fd00c43d700e52667f169 100644 (file)
--- 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 e913be2f14b654e9cf681d00f9b291887374d89a..17a9d3234f62b2aae7bd68732e53a5d80418b3fc 100644 (file)
--- 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 db090540cbff0f3265358c480d1684c6773f4ca9..e1f1f2d9b7da4e2d66c61427d09a5fc91505ea06 100644 (file)
--- 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 2b0189d40ea27a2e31d76987035dd8f68cd72fb3..3c8d3b5814d801074b3b5d7b1086ca44ee1afb45 100644 (file)
--- 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 4af152b155bd8391467a3f4726e265319ce14b89..9d1999517fda65bdccba5685504bce238f2c68b0 100644 (file)
--- 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 1fc4683bb494fe92f352bfe55437b0e15f064df5..4986272406545c2a358af76e151d8f9724bd46af 100644 (file)
--- 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 d1b1bd150550fd325156a94724d673b212f3b347..b3f1702bf5c690647d4b264594a09c67732abfb5 100644 (file)
--- 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 c187296f844b9ba4bd2aa3d118d86f1c8e046f11..567bc4316a11728c83dcb1ff160eefa7207e7f17 100644 (file)
--- 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 de0568afd2e2ef626456b468f626c1fd86971668..e43fed398767fe050f81988f687991b6d2821750 100644 (file)
--- 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

diff --git a/utils/TableGen/Makefile b/utils/TableGen/Makefile
index 93fd75a3b0eb6433d56966b5c4f088f219da5f0d..aad4c8d70e219d4d59f2c40fb588bd33094e6f22 100644 (file)
--- a/utils/TableGen/Makefile
+++ b/utils/TableGen/Makefile
@@ -8,7 +8,7 @@
 ##===----------------------------------------------------------------------===##
 LEVEL = ../..
 TOOLNAME = tblgen
-USEDLIBS = support.a LLVMsystem.a
+USEDLIBS = LLVMSupport.a LLVMSystem.a
 
 include $(LEVEL)/Makefile.common
 

diff --git a/utils/fpcmp/Makefile b/utils/fpcmp/Makefile
index e38c51d2bad9320ccd229fbd57d9b5ebe9185c7a..5ba547e699a1808cad036fb6159d300c325003bf 100644 (file)
--- a/utils/fpcmp/Makefile
+++ b/utils/fpcmp/Makefile
@@ -9,7 +9,7 @@
 
 LEVEL = ../..
 TOOLNAME = fpcmp
-USEDLIBS = support.a
+USEDLIBS = LLVMSupport.a
 
 include $(LEVEL)/Makefile.common