Change Library Names Not To Conflict With Others When Installed

llvm-svn: 17286
This commit is contained in:
Reid Spencer 2004-10-27 23:18:45 +00:00
parent 6fb57becbd
commit d3f7233495
50 changed files with 101 additions and 91 deletions

View File

@ -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

View File

@ -8,7 +8,7 @@
##===----------------------------------------------------------------------===##
LEVEL = ../..
LIBRARYNAME = analysis
LIBRARYNAME = LLVMAnalysis
PARALLEL_DIRS = IPA DataStructure
BUILD_ARCHIVE = 1

View File

@ -9,7 +9,7 @@
LEVEL = ../..
LIBRARYNAME = asmparser
LIBRARYNAME = LLVMAsmParser
include $(LEVEL)/Makefile.common

View File

@ -9,6 +9,6 @@
LEVEL = ../..
PARALLEL_DIRS = SelectionDAG
LIBRARYNAME = codegen
LIBRARYNAME = LLVMCodeGen
include $(LEVEL)/Makefile.common

View File

@ -8,6 +8,6 @@
##===----------------------------------------------------------------------===##
LEVEL = ../../..
PARALLEL_DIRS =
LIBRARYNAME = selectiondag
LIBRARYNAME = LLVMSelectionDAG
include $(LEVEL)/Makefile.common

View File

@ -8,6 +8,6 @@
##===----------------------------------------------------------------------===##
LEVEL = ../..
LIBRARYNAME = debugger
LIBRARYNAME = LLVMDebugger
include $(LEVEL)/Makefile.common

View File

@ -7,7 +7,7 @@
#
##===----------------------------------------------------------------------===##
LEVEL = ../..
LIBRARYNAME = executionengine
LIBRARYNAME = LLVMExecutionEngine
PARALLEL_DIRS = Interpreter JIT
include $(LEVEL)/Makefile.common

View File

@ -7,7 +7,7 @@
#
##===----------------------------------------------------------------------===##
LEVEL = ../..
LIBRARYNAME = support
LIBRARYNAME = LLVMSupport
BUILD_ARCHIVE = 1
include $(LEVEL)/Makefile.common

View File

@ -7,7 +7,7 @@
#
##===----------------------------------------------------------------------===##
LEVEL = ../..
LIBRARYNAME = LLVMsystem
LIBRARYNAME = LLVMSystem
BUILD_ARCHIVE = 1
EXTRA_DIST = AIX Cygwin Darwin FreeBSD Interix Linux SunOS Unix Win32

View File

@ -20,7 +20,6 @@
#include "Unix.h"
#include <fcntl.h>
#include <sys/mman.h>
#include <sys/stat.h>
namespace llvm {
using namespace sys;

View File

@ -8,6 +8,6 @@
##===----------------------------------------------------------------------===##
LEVEL = ../../..
LIBRARYNAME = cwriter
LIBRARYNAME = LLVMCBackend
include $(LEVEL)/Makefile.common

View File

@ -8,7 +8,7 @@
##===----------------------------------------------------------------------===##
LEVEL = ../..
PARALLEL_DIRS = CBackend X86 SparcV9 PowerPC Skeleton
LIBRARYNAME = target
LIBRARYNAME = LLVMTarget
BUILD_ARCHIVE = 1
include $(LEVEL)/Makefile.common

View File

@ -7,7 +7,7 @@
#
##===----------------------------------------------------------------------===##
LEVEL = ../../..
LIBRARYNAME = powerpc
LIBRARYNAME = LLVMPowerPC
TARGET = PowerPC
# Make sure that tblgen is run, first thing.

View File

@ -8,7 +8,7 @@
##===----------------------------------------------------------------------===##
LEVEL = ../../..
LIBRARYNAME = skeleton
LIBRARYNAME = LLVMSkeleton
TARGET = Skeleton
# Make sure that tblgen is run, first thing.

View File

@ -9,6 +9,6 @@
LEVEL = ../../../..
DIRS =
LIBRARYNAME = sparcv9sched
LIBRARYNAME = LLVMSparcV9InstrSched
include $(LEVEL)/Makefile.common

View File

@ -8,7 +8,7 @@
##===----------------------------------------------------------------------===##
LEVEL = ../../../..
LIBRARYNAME = sparcv9livevar
LIBRARYNAME = LLVMSparcV9LiveVar
include $(LEVEL)/Makefile.common

View File

@ -7,7 +7,7 @@
#
##===----------------------------------------------------------------------===##
LEVEL = ../../..
LIBRARYNAME = sparcv9
LIBRARYNAME = LLVMSparcV9
PARALLEL_DIRS = InstrSched LiveVar ModuloScheduling RegAlloc
BUILT_SOURCES = \

View File

@ -9,6 +9,6 @@
LEVEL = ../../../..
DIRS =
LIBRARYNAME = sparcv9modulosched
LIBRARYNAME = LLVMSparcV9ModuloSched
include $(LEVEL)/Makefile.common

View File

@ -9,7 +9,7 @@
LEVEL = ../../../..
DIRS =
LIBRARYNAME = sparcv9regalloc
LIBRARYNAME = LLVMSparcV9RegAlloc
BUILD_ARCHIVE = 1
include $(LEVEL)/Makefile.common

View File

@ -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 \

View File

@ -8,7 +8,7 @@
##===----------------------------------------------------------------------===##
LEVEL = ../../..
LIBRARYNAME = hello
LIBRARYNAME = LLVMHello
SHARED_LIBRARY = 1
include $(LEVEL)/Makefile.common

View File

@ -7,7 +7,7 @@
#
##===----------------------------------------------------------------------===##
LEVEL = ../../..
LIBRARYNAME = ipo
LIBRARYNAME = LLVMipo
BUILD_ARCHIVE = 1
include $(LEVEL)/Makefile.common

View File

@ -7,7 +7,7 @@
#
##===----------------------------------------------------------------------===##
LEVEL = ../../..
LIBRARYNAME = instrument
LIBRARYNAME = LLVMInstrumentation
PARALLEL_DIRS = ProfilePaths
BUILD_ARCHIVE = 1

View File

@ -7,7 +7,7 @@
#
##===----------------------------------------------------------------------===##
LEVEL = ../../../..
LIBRARYNAME = profpaths
LIBRARYNAME = LLVMProfilePaths
include $(LEVEL)/Makefile.common

View File

@ -8,7 +8,7 @@
##===----------------------------------------------------------------------===##
LEVEL = ../..
PARALLEL_DIRS = Utils Instrumentation Scalar IPO
LIBRARYNAME = transforms
LIBRARYNAME = LLVMTransforms
BUILD_ARCHIVE = 1
include $(LEVEL)/Makefile.common

View File

@ -7,7 +7,7 @@
#
##===----------------------------------------------------------------------===##
LEVEL = ../../..
LIBRARYNAME = scalaropts
LIBRARYNAME = LLVMScalarOpts
BUILD_ARCHIVE = 1
include $(LEVEL)/Makefile.common

View File

@ -7,7 +7,7 @@
#
##===----------------------------------------------------------------------===##
LEVEL = ../../..
LIBRARYNAME = transformutils
LIBRARYNAME = LLVMTransformUtils
BUILD_ARCHIVE = 1
include $(LEVEL)/Makefile.common

View File

@ -7,7 +7,7 @@
#
##===----------------------------------------------------------------------===##
LEVEL = ../..
LIBRARYNAME = vmcore
LIBRARYNAME = LLVMCore
include $(LEVEL)/Makefile.common

View File

@ -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 \

View File

@ -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

View File

@ -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

View File

@ -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)

View File

@ -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)

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -7,7 +7,7 @@
#
##===----------------------------------------------------------------------===##
LEVEL = ../..
LIBRARYNAME = execve
LIBRARYNAME = LLVMexecve
SHARED_LIBRARY = 1
include $(LEVEL)/Makefile.common

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -9,7 +9,7 @@
LEVEL = ../..
TOOLNAME = llvm-db
USEDLIBS = debugger
USEDLIBS = LLVMDebugger
# Enable JIT support
include ../Makefile.JIT

View File

@ -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

View File

@ -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())

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -8,7 +8,7 @@
##===----------------------------------------------------------------------===##
LEVEL = ../..
TOOLNAME = tblgen
USEDLIBS = support.a LLVMsystem.a
USEDLIBS = LLVMSupport.a LLVMSystem.a
include $(LEVEL)/Makefile.common

View File

@ -9,7 +9,7 @@
LEVEL = ../..
TOOLNAME = fpcmp
USEDLIBS = support.a
USEDLIBS = LLVMSupport.a
include $(LEVEL)/Makefile.common