diff --git a/Makefile.rules b/Makefile.rules index 156354b2a72..04f3660a1ab 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -588,9 +588,9 @@ endif # What the Sparc JIT requires ifdef ENABLE_SPARCV9_JIT JIT_LIBS += LLVMSparcV9 LLVMSparcV9ModuloSched LLVMSparcV9InstrSched \ - LLVMSparcV9LiveVar LLVMInstrumentation.a LLVMProfilePaths \ + LLVMSparcV9LiveVar LLVMInstrumentation.a \ LLVMBCWriter LLVMTransforms.a LLVMipo.a LLVMipa.a \ - LLVMDataStructure.a LLVMSparcV9RegAlloc + LLVMDataStructure LLVMSparcV9RegAlloc endif # 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 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 \ LLVMSystem.a $(PLATFORMLIBDL) endif diff --git a/lib/Transforms/Utils/Makefile b/lib/Transforms/Utils/Makefile index 26fc4261f16..a0c49bd9dfe 100644 --- a/lib/Transforms/Utils/Makefile +++ b/lib/Transforms/Utils/Makefile @@ -9,7 +9,6 @@ LEVEL = ../../.. LIBRARYNAME = LLVMTransformUtils -BUILD_ARCHIVE = 1 include $(LEVEL)/Makefile.common diff --git a/tools/analyze/Makefile b/tools/analyze/Makefile index 06def88d01a..0d1c2485eba 100644 --- a/tools/analyze/Makefile +++ b/tools/analyze/Makefile @@ -11,6 +11,6 @@ TOOLNAME = analyze USEDLIBS = LLVMAsmParser LLVMBCReader LLVMAnalysis.a LLVMipa.a \ LLVMDataStructure \ 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 diff --git a/tools/bugpoint/Makefile b/tools/bugpoint/Makefile index 6460aa82aa2..0b198323afe 100644 --- a/tools/bugpoint/Makefile +++ b/tools/bugpoint/Makefile @@ -14,7 +14,7 @@ OPTLIBS = LLVMTransforms.a LLVMInstrumentation.a ANALIBS = LLVMDataStructure LLVMipa.a LLVMTarget.a USEDLIBS = LLVMipo.a LLVMScalarOpts.a $(OPTLIBS) $(ANALIBS) LLVMAnalysis.a \ - LLVMTransformUtils.a \ + LLVMTransformUtils \ LLVMAsmParser LLVMLinker.a LLVMBCReader LLVMBCWriter \ LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a diff --git a/tools/gccas/Makefile b/tools/gccas/Makefile index 32c10c88658..8359a760810 100644 --- a/tools/gccas/Makefile +++ b/tools/gccas/Makefile @@ -10,7 +10,7 @@ LEVEL = ../.. TOOLNAME = gccas 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 include $(LEVEL)/Makefile.common diff --git a/tools/gccld/Makefile b/tools/gccld/Makefile index 96e73d68713..e55a85e8f67 100644 --- a/tools/gccld/Makefile +++ b/tools/gccld/Makefile @@ -11,7 +11,7 @@ LEVEL = ../.. TOOLNAME = gccld 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 \ LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a diff --git a/tools/llc/Makefile b/tools/llc/Makefile index 031012a8e58..ef21140a137 100644 --- a/tools/llc/Makefile +++ b/tools/llc/Makefile @@ -70,7 +70,7 @@ USEDLIBS += \ LLVMipa.a \ LLVMTransforms.a \ LLVMScalarOpts.a \ - LLVMTransformUtils.a \ + LLVMTransformUtils \ LLVMAnalysis.a \ LLVMBCReader \ LLVMBCWriter \ diff --git a/tools/llvm-extract/Makefile b/tools/llvm-extract/Makefile index 80a90fa41a8..69e7e7f9279 100644 --- a/tools/llvm-extract/Makefile +++ b/tools/llvm-extract/Makefile @@ -10,7 +10,7 @@ LEVEL = ../.. TOOLNAME = llvm-extract 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 include $(LEVEL)/Makefile.common diff --git a/tools/llvm-ld/Makefile b/tools/llvm-ld/Makefile index 34d6dc69ca4..880df9f4fc6 100644 --- a/tools/llvm-ld/Makefile +++ b/tools/llvm-ld/Makefile @@ -11,7 +11,7 @@ LEVEL = ../.. TOOLNAME = llvm-ld 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 \ LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a diff --git a/tools/opt/Makefile b/tools/opt/Makefile index 4fd8293eb03..fcc6c5fc5df 100644 --- a/tools/opt/Makefile +++ b/tools/opt/Makefile @@ -11,7 +11,7 @@ TOOLNAME = opt USEDLIBS = LLVMBCReader LLVMBCWriter LLVMInstrumentation.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 include $(LEVEL)/Makefile.common