From d3f7233495b2da9ebce60f8000f9177a29fb554d Mon Sep 17 00:00:00 2001 From: Reid Spencer Date: Wed, 27 Oct 2004 23:18:45 +0000 Subject: [PATCH] Change Library Names Not To Conflict With Others When Installed llvm-svn: 17286 --- examples/ModuleMaker/Makefile | 2 +- lib/Analysis/Makefile | 2 +- lib/AsmParser/Makefile | 2 +- lib/CodeGen/Makefile | 2 +- lib/CodeGen/SelectionDAG/Makefile | 2 +- lib/Debugger/Makefile | 2 +- lib/ExecutionEngine/Makefile | 2 +- lib/Support/Makefile | 2 +- lib/System/Makefile | 2 +- lib/System/Unix/MappedFile.cpp | 1 - lib/Target/CBackend/Makefile | 2 +- lib/Target/Makefile | 2 +- lib/Target/PowerPC/Makefile | 2 +- lib/Target/Skeleton/Makefile | 2 +- lib/Target/SparcV9/InstrSched/Makefile | 2 +- lib/Target/SparcV9/LiveVar/Makefile | 2 +- lib/Target/SparcV9/Makefile | 2 +- lib/Target/SparcV9/ModuloScheduling/Makefile | 2 +- lib/Target/SparcV9/RegAlloc/Makefile | 2 +- lib/Target/X86/Makefile | 2 +- lib/Transforms/Hello/Makefile | 2 +- lib/Transforms/IPO/Makefile | 2 +- lib/Transforms/Instrumentation/Makefile | 2 +- .../Instrumentation/ProfilePaths/Makefile | 2 +- lib/Transforms/Makefile | 2 +- lib/Transforms/Scalar/Makefile | 2 +- lib/Transforms/Utils/Makefile | 2 +- lib/VMCore/Makefile | 2 +- projects/Stacker/samples/Makefile | 2 +- projects/Stacker/tools/stkrc/Makefile | 9 ++-- tools/Makefile.JIT | 19 ++++---- tools/analyze/Makefile | 6 +-- tools/bugpoint/Makefile | 9 ++-- tools/extract/Makefile | 5 ++- tools/gccas/Makefile | 5 ++- tools/gccld/Makefile | 5 ++- tools/llc/Makefile | 43 ++++++++++--------- tools/llee/Makefile | 2 +- tools/llvm-ar/Makefile | 2 +- tools/llvm-as/Makefile | 2 +- tools/llvm-bcanalyzer/Makefile | 2 +- tools/llvm-db/Makefile | 2 +- tools/llvm-dis/Makefile | 2 +- tools/llvm-ld/Linker.cpp | 3 ++ tools/llvm-link/Makefile | 2 +- tools/llvm-nm/Makefile | 2 +- tools/llvm-prof/Makefile | 2 +- tools/opt/Makefile | 9 ++-- utils/TableGen/Makefile | 2 +- utils/fpcmp/Makefile | 2 +- 50 files changed, 101 insertions(+), 91 deletions(-) diff --git a/examples/ModuleMaker/Makefile b/examples/ModuleMaker/Makefile index c99b7e7891c..2bd8a38b7e2 100644 --- 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 2a8d34ea726..b679b572c5b 100644 --- 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 b5e6fb9cf6d..2b85e1aaad1 100644 --- 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 cc72a03a16a..05453a36ef7 100644 --- 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 d3fc5a956ff..85aafab0b84 100644 --- 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 1cb6e0d21d4..b9df8dc775c 100644 --- 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 a100b703233..c4998fc53d1 100644 --- 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 0b6660408ac..2e4a5b066aa 100644 --- 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 e40fe4bca02..d0a7acff26b 100644 --- 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 fec2408c195..7e03cd15a81 100644 --- a/lib/System/Unix/MappedFile.cpp +++ b/lib/System/Unix/MappedFile.cpp @@ -20,7 +20,6 @@ #include "Unix.h" #include #include -#include namespace llvm { using namespace sys; diff --git a/lib/Target/CBackend/Makefile b/lib/Target/CBackend/Makefile index 7fcc434c911..fc32db0a40e 100644 --- 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 da74511be51..7c525ef86ff 100644 --- 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 05768ab212c..95432819cdc 100644 --- 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 bc9a16ddfd9..07ce6f267c6 100644 --- 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 81caf77b1fc..ea2c3aa57a4 100644 --- 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 6973f63aa58..a2a53e6ca3a 100644 --- 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 363b73cad6d..30ee8699871 100644 --- 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 44bf5ed6cae..2ec0503a173 100644 --- 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 4daa1f5c469..c19984cb204 100644 --- 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 bdaf28c5e8a..87115eac81a 100644 --- 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 af4253d1d1a..d9886a95e55 100644 --- 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 fe82fc11fa2..4f4563f18c8 100644 --- 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 e1831afab6c..d749b6b3bde 100644 --- 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 8deeeac814a..5a7477caf32 100644 --- 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 88a2ca222fc..25cee595fd2 100644 --- 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 6ea90d178c6..267747f57b8 100644 --- 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 f4da9832fde..b349b6c5c52 100644 --- 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 9fc1c96caa9..d3df2bfe785 100644 --- 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 d5b9b6ed0a1..22190a78dbb 100644 --- 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 f413dc236e4..4f352836fe6 100644 --- 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 8c9e5b0cb0a..7a2c48f5a6b 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 ec94fe6a3eb..0d76f278ffe 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 aa1338ce6aa..e3addbdb266 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 35c624a4d6b..14a8124ee84 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 37404d4b5ff..e67f3adbf7f 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 fe1b166f044..2915c6b0567 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 c11c521f9c2..553ff952add 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 fdf3389f28a..9e9fc60a3c8 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 2f4257b64de..938f73ef11a 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 689e2684aee..5482aa1a959 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 e913be2f14b..17a9d3234f6 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 db090540cbf..e1f1f2d9b7d 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 2b0189d40ea..3c8d3b5814d 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 4af152b155b..9d1999517fd 100644 --- a/tools/llvm-ld/Linker.cpp +++ b/tools/llvm-ld/Linker.cpp @@ -86,6 +86,7 @@ llvm::GetAllUndefinedSymbols(Module *M, std::set 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 1fc4683bb49..49862724065 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 d1b1bd15055..b3f1702bf5c 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 c187296f844..567bc4316a1 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 de0568afd2e..e43fed39876 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 diff --git a/utils/TableGen/Makefile b/utils/TableGen/Makefile index 93fd75a3b0e..aad4c8d70e2 100644 --- 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 e38c51d2bad..5ba547e699a 100644 --- 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