1. Remove libraries no longer created from the list of libraries linked into the

SparcV9 JIT.
2. Make LLVMTransformUtils a relinked object file and always link it before
   LLVMAnalysis.a.  These two libraries have circular dependencies on each
   other which creates problem when building the SparcV9 JIT.  This change
   fixes the dependency on all platforms problems with a minimum of fuss.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@24023 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
John Criswell 2005-10-26 20:35:13 +00:00
parent 2012cc013c
commit e96a1a576b
10 changed files with 11 additions and 12 deletions

View File

@ -588,9 +588,9 @@ endif
# What the Sparc JIT requires # What the Sparc JIT requires
ifdef ENABLE_SPARCV9_JIT ifdef ENABLE_SPARCV9_JIT
JIT_LIBS += LLVMSparcV9 LLVMSparcV9ModuloSched LLVMSparcV9InstrSched \ JIT_LIBS += LLVMSparcV9 LLVMSparcV9ModuloSched LLVMSparcV9InstrSched \
LLVMSparcV9LiveVar LLVMInstrumentation.a LLVMProfilePaths \ LLVMSparcV9LiveVar LLVMInstrumentation.a \
LLVMBCWriter LLVMTransforms.a LLVMipo.a LLVMipa.a \ LLVMBCWriter LLVMTransforms.a LLVMipo.a LLVMipa.a \
LLVMDataStructure.a LLVMSparcV9RegAlloc LLVMDataStructure LLVMSparcV9RegAlloc
endif endif
# You can enable the PowerPC JIT on a non-PowerPC host by setting the flag # You can enable the PowerPC JIT on a non-PowerPC host by setting the flag
@ -617,7 +617,7 @@ ifdef ENABLE_ALPHA_JIT
JIT_LIBS += LLVMAlpha LLVMSelectionDAG JIT_LIBS += LLVMAlpha LLVMSelectionDAG
endif endif
LLVMLIBS := $(JIT_LIBS) LLVMScalarOpts.a LLVMTransformUtils.a LLVMAnalysis.a \ LLVMLIBS := $(JIT_LIBS) LLVMScalarOpts.a LLVMTransformUtils LLVMAnalysis.a \
LLVMBCReader LLVMCore LLVMSupport.a LLVMTarget.a LLVMbzip2 \ LLVMBCReader LLVMCore LLVMSupport.a LLVMTarget.a LLVMbzip2 \
LLVMSystem.a $(PLATFORMLIBDL) LLVMSystem.a $(PLATFORMLIBDL)
endif endif

View File

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

View File

@ -11,6 +11,6 @@ TOOLNAME = analyze
USEDLIBS = LLVMAsmParser LLVMBCReader LLVMAnalysis.a LLVMipa.a \ USEDLIBS = LLVMAsmParser LLVMBCReader LLVMAnalysis.a LLVMipa.a \
LLVMDataStructure \ LLVMDataStructure \
LLVMScalarOpts.a LLVMTransforms.a LLVMTarget.a LLVMScalarOpts.a \ LLVMScalarOpts.a LLVMTransforms.a LLVMTarget.a LLVMScalarOpts.a \
LLVMTransformUtils.a LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a LLVMTransformUtils LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a
include $(LEVEL)/Makefile.common include $(LEVEL)/Makefile.common

View File

@ -14,7 +14,7 @@ OPTLIBS = LLVMTransforms.a LLVMInstrumentation.a
ANALIBS = LLVMDataStructure LLVMipa.a LLVMTarget.a ANALIBS = LLVMDataStructure LLVMipa.a LLVMTarget.a
USEDLIBS = LLVMipo.a LLVMScalarOpts.a $(OPTLIBS) $(ANALIBS) LLVMAnalysis.a \ USEDLIBS = LLVMipo.a LLVMScalarOpts.a $(OPTLIBS) $(ANALIBS) LLVMAnalysis.a \
LLVMTransformUtils.a \ LLVMTransformUtils \
LLVMAsmParser LLVMLinker.a LLVMBCReader LLVMBCWriter \ LLVMAsmParser LLVMLinker.a LLVMBCReader LLVMBCWriter \
LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a

View File

@ -10,7 +10,7 @@ LEVEL = ../..
TOOLNAME = gccas TOOLNAME = gccas
USEDLIBS = LLVMAsmParser LLVMBCWriter LLVMTransforms.a LLVMipo.a LLVMipa.a \ USEDLIBS = LLVMAsmParser LLVMBCWriter LLVMTransforms.a LLVMipo.a LLVMipa.a \
LLVMScalarOpts.a LLVMAnalysis.a LLVMTarget.a LLVMTransformUtils.a \ LLVMScalarOpts.a LLVMAnalysis.a LLVMTarget.a LLVMTransformUtils \
LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a
include $(LEVEL)/Makefile.common include $(LEVEL)/Makefile.common

View File

@ -11,7 +11,7 @@ LEVEL = ../..
TOOLNAME = gccld TOOLNAME = gccld
USEDLIBS = LLVMipo.a LLVMTransforms.a LLVMScalarOpts.a LLVMAnalysis.a \ USEDLIBS = LLVMipo.a LLVMTransforms.a LLVMScalarOpts.a LLVMAnalysis.a \
LLVMipa.a LLVMTransformUtils.a LLVMTarget.a LLVMLinker.a \ LLVMipa.a LLVMTransformUtils LLVMTarget.a LLVMLinker.a \
LLVMArchive.a LLVMBCReader LLVMBCWriter \ LLVMArchive.a LLVMBCReader LLVMBCWriter \
LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a

View File

@ -70,7 +70,7 @@ USEDLIBS += \
LLVMipa.a \ LLVMipa.a \
LLVMTransforms.a \ LLVMTransforms.a \
LLVMScalarOpts.a \ LLVMScalarOpts.a \
LLVMTransformUtils.a \ LLVMTransformUtils \
LLVMAnalysis.a \ LLVMAnalysis.a \
LLVMBCReader \ LLVMBCReader \
LLVMBCWriter \ LLVMBCWriter \

View File

@ -10,7 +10,7 @@ LEVEL = ../..
TOOLNAME = llvm-extract TOOLNAME = llvm-extract
USEDLIBS = LLVMBCReader LLVMBCWriter LLVMTransforms.a LLVMipo.a LLVMTarget.a \ USEDLIBS = LLVMBCReader LLVMBCWriter LLVMTransforms.a LLVMipo.a LLVMTarget.a \
LLVMAnalysis.a LLVMTransformUtils.a LLVMipa.a \ LLVMAnalysis.a LLVMTransformUtils LLVMipa.a \
LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a
include $(LEVEL)/Makefile.common include $(LEVEL)/Makefile.common

View File

@ -11,7 +11,7 @@ LEVEL = ../..
TOOLNAME = llvm-ld TOOLNAME = llvm-ld
USEDLIBS = LLVMipo.a LLVMTransforms.a LLVMScalarOpts.a LLVMAnalysis.a \ USEDLIBS = LLVMipo.a LLVMTransforms.a LLVMScalarOpts.a LLVMAnalysis.a \
LLVMipa.a LLVMTransformUtils.a LLVMTarget.a LLVMLinker.a \ LLVMipa.a LLVMTransformUtils LLVMTarget.a LLVMLinker.a \
LLVMArchive.a LLVMBCReader LLVMBCWriter \ LLVMArchive.a LLVMBCReader LLVMBCWriter \
LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a

View File

@ -11,7 +11,7 @@ TOOLNAME = opt
USEDLIBS = LLVMBCReader LLVMBCWriter LLVMInstrumentation.a \ USEDLIBS = LLVMBCReader LLVMBCWriter LLVMInstrumentation.a \
LLVMScalarOpts.a LLVMipo.a LLVMipa.a LLVMDataStructure LLVMTransforms.a \ LLVMScalarOpts.a LLVMipo.a LLVMipa.a LLVMDataStructure LLVMTransforms.a \
LLVMTarget.a LLVMAnalysis.a LLVMTransformUtils.a LLVMCore LLVMSupport.a \ LLVMTarget.a LLVMAnalysis.a LLVMTransformUtils LLVMCore LLVMSupport.a \
LLVMbzip2 LLVMSystem.a LLVMbzip2 LLVMSystem.a
include $(LEVEL)/Makefile.common include $(LEVEL)/Makefile.common