Use archive libraries instead of object files for VMCore, BCReader,

BCWriter, and bzip2 libraries. Adjust the various makefiles to accommodate
these changes. This was done to speed up link times.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@28610 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Reid Spencer 2006-06-01 01:30:27 +00:00
parent b756c79d12
commit 18c8b49e7d
33 changed files with 61 additions and 54 deletions

View File

@ -357,7 +357,7 @@ endif
# Options To Invoke Tools # Options To Invoke Tools
#---------------------------------------------------------- #----------------------------------------------------------
CompileCommonOpts := -Wall -W -Wwrite-strings -Wno-unused CompileCommonOpts := -Wall -W -Wwrite-strings -Wno-unused
ifeq ($(OS),HP-UX) ifeq ($(OS),HP-UX)
CompileCommonOpts := -D_REENTRANT -D_HPUX_SOURCE CompileCommonOpts := -D_REENTRANT -D_HPUX_SOURCE
@ -628,7 +628,7 @@ ifdef ENABLE_ALPHA_JIT
endif endif
LLVMLIBS := $(JIT_LIBS) LLVMScalarOpts.a LLVMTransformUtils.a LLVMAnalysis.a \ LLVMLIBS := $(JIT_LIBS) LLVMScalarOpts.a LLVMTransformUtils.a LLVMAnalysis.a \
LLVMBCReader LLVMTarget.a LLVMCore LLVMSupport.a LLVMbzip2 \ LLVMBCReader.a LLVMTarget.a LLVMCore.a LLVMSupport.a LLVMbzip2.a \
LLVMSystem.a $(PLATFORMLIBDL) LLVMSystem.a $(PLATFORMLIBDL)
endif endif

View File

@ -9,6 +9,6 @@
LEVEL=../.. LEVEL=../..
TOOLNAME=ModuleMaker TOOLNAME=ModuleMaker
EXAMPLE_TOOL = 1 EXAMPLE_TOOL = 1
USEDLIBS= LLVMBCWriter LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a USEDLIBS= LLVMBCWriter.a LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
include $(LEVEL)/Makefile.common include $(LEVEL)/Makefile.common

View File

@ -9,6 +9,7 @@
LEVEL = ../.. LEVEL = ../..
LIBRARYNAME := LLVMAsmParser LIBRARYNAME := LLVMAsmParser
BUILD_ARCHIVE = 1
EXTRA_DIST := Lexer.cpp.cvs Lexer.l.cvs \ EXTRA_DIST := Lexer.cpp.cvs Lexer.l.cvs \
llvmAsmParser.cpp.cvs llvmAsmParser.h.cvs llvmAsmParser.y.cvs llvmAsmParser.cpp.cvs llvmAsmParser.h.cvs llvmAsmParser.y.cvs

View File

@ -8,6 +8,7 @@
##===----------------------------------------------------------------------===## ##===----------------------------------------------------------------------===##
LEVEL = ../../.. LEVEL = ../../..
LIBRARYNAME = LLVMBCReader LIBRARYNAME = LLVMBCReader
BUILD_ARCHIVE = 1
include $(LEVEL)/Makefile.common include $(LEVEL)/Makefile.common

View File

@ -8,5 +8,6 @@
##===----------------------------------------------------------------------===## ##===----------------------------------------------------------------------===##
LEVEL = ../../.. LEVEL = ../../..
LIBRARYNAME = LLVMBCWriter LIBRARYNAME = LLVMBCWriter
BUILD_ARCHIVE = 1
include $(LEVEL)/Makefile.common include $(LEVEL)/Makefile.common

View File

@ -8,7 +8,7 @@
##===----------------------------------------------------------------------===## ##===----------------------------------------------------------------------===##
LEVEL = ../.. LEVEL = ../..
PARALLEL_DIRS = SelectionDAG
LIBRARYNAME = LLVMCodeGen LIBRARYNAME = LLVMCodeGen
PARALLEL_DIRS = SelectionDAG
include $(LEVEL)/Makefile.common include $(LEVEL)/Makefile.common

View File

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

View File

@ -8,6 +8,7 @@
##===----------------------------------------------------------------------===## ##===----------------------------------------------------------------------===##
LEVEL = ../../.. LEVEL = ../../..
LIBRARYNAME = LLVMbzip2 LIBRARYNAME = LLVMbzip2
BUILD_ARCHIVE = 1
SOURCES = blocksort.c huffman.c crctable.c randtable.c compress.c decompress.c \ SOURCES = blocksort.c huffman.c crctable.c randtable.c compress.c decompress.c \
bzlib.c bzlib.c
EXTRA_DIST = bzlib.h bzlib_private.h CHANGES LICENSE README \ EXTRA_DIST = bzlib.h bzlib_private.h CHANGES LICENSE README \

View File

@ -9,5 +9,5 @@
LEVEL = ../../.. LEVEL = ../../..
LIBRARYNAME = LLVMCBackend LIBRARYNAME = LLVMCBackend
CXXFLAGS += -pedantic -Wno-long-long
include $(LEVEL)/Makefile.common include $(LEVEL)/Makefile.common

View File

@ -8,14 +8,10 @@
##===----------------------------------------------------------------------===## ##===----------------------------------------------------------------------===##
LEVEL = ../.. LEVEL = ../..
LIBRARYNAME = LLVMCore LIBRARYNAME = LLVMCore
BUILD_ARCHIVE = 1
BUILT_SOURCES = $(PROJ_SRC_ROOT)/include/llvm/Intrinsics.gen BUILT_SOURCES = $(PROJ_SRC_ROOT)/include/llvm/Intrinsics.gen
include $(LEVEL)/Makefile.config
ifeq ($(ARCH),Alpha)
BUILD_ARCHIVE = 1
endif
include $(LEVEL)/Makefile.common include $(LEVEL)/Makefile.common
GENFILE:=$(PROJ_SRC_ROOT)/include/llvm/Intrinsics.gen GENFILE:=$(PROJ_SRC_ROOT)/include/llvm/Intrinsics.gen

View File

@ -9,9 +9,9 @@ LEVEL=../..
# Give the name of a library. This will build a dynamic version. # Give the name of a library. This will build a dynamic version.
# #
TOOLNAME = stkrc TOOLNAME = stkrc
LLVMLIBS = LLVMAsmParser LLVMBCWriter LLVMipo.a \ LLVMLIBS = LLVMAsmParser.a LLVMBCWriter.a LLVMipo.a LLVMScalarOpts.a \
LLVMScalarOpts.a LLVMTransforms.a LLVMTransformUtils.a LLVMipa.a LLVMAnalysis.a LLVMTarget.a \ LLVMTransforms.a LLVMTransformUtils.a LLVMipa.a LLVMAnalysis.a \
LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a LLVMTarget.a LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
CONFIG_FILES = st CONFIG_FILES = st
EXTRA_DIST = st EXTRA_DIST = st
USEDLIBS=stkr_compiler USEDLIBS=stkr_compiler

View File

@ -15,3 +15,5 @@ EXPORTED_SYMBOL_FILE = $(PROJ_SRC_DIR)/../gc_exported_symbols.lst
include $(LEVEL)/Makefile.common include $(LEVEL)/Makefile.common
CompileCommonOpts := $(filter-out -pedantic,$(CompileCommonOpts))
CompileCommonOpts := $(filter-out -Wno-long-long,$(CompileCommonOpts))

View File

@ -1,4 +1,4 @@
##===- runtime/GCCLibraries/libc/Makefile ------------------------------*- Makefile -*-===## ##===- runtime/GCCLibraries/libc/Makefile ------------------*- Makefile -*-===##
# #
# The LLVM Compiler Infrastructure # The LLVM Compiler Infrastructure
# #
@ -15,3 +15,5 @@ BYTECODE_DESTINATION = $(CFERuntimeLibDir)
include $(LEVEL)/Makefile.common include $(LEVEL)/Makefile.common
CompileCommonOpts := $(filter-out -pedantic,$(CompileCommonOpts))
CompileCommonOpts := $(filter-out -Wno-long-long,$(CompileCommonOpts))

View File

@ -14,3 +14,5 @@ BYTECODE_DESTINATION = $(CFERuntimeLibDir)
include $(LEVEL)/Makefile.common include $(LEVEL)/Makefile.common
CompileCommonOpts := $(filter-out -pedantic,$(CompileCommonOpts))
CompileCommonOpts := $(filter-out -Wno-long-long,$(CompileCommonOpts))

View File

@ -8,9 +8,9 @@
##===----------------------------------------------------------------------===## ##===----------------------------------------------------------------------===##
LEVEL = ../.. LEVEL = ../..
TOOLNAME = analyze TOOLNAME = analyze
USEDLIBS = LLVMAsmParser LLVMBCReader LLVMAnalysis.a LLVMipa.a \ USEDLIBS = LLVMAsmParser.a LLVMBCReader.a 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.a LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
include $(LEVEL)/Makefile.common include $(LEVEL)/Makefile.common

View File

@ -15,7 +15,7 @@ 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.a \
LLVMAsmParser LLVMLinker.a LLVMBCReader LLVMBCWriter \ LLVMAsmParser.a LLVMLinker.a LLVMBCReader.a LLVMBCWriter.a \
LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
include $(LEVEL)/Makefile.common include $(LEVEL)/Makefile.common

View File

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

View File

@ -12,7 +12,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.a LLVMTarget.a LLVMLinker.a \
LLVMArchive.a LLVMBCReader LLVMBCWriter \ LLVMArchive.a LLVMBCReader.a LLVMBCWriter.a \
LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
include $(LEVEL)/Makefile.common include $(LEVEL)/Makefile.common

View File

@ -56,17 +56,17 @@ endif
USEDLIBS += \ USEDLIBS += \
LLVMSelectionDAG \ LLVMSelectionDAG \
LLVMCodeGen \ LLVMCodeGen \
LLVMTarget.a \ LLVMTarget \
LLVMipa.a \ LLVMipa.a \
LLVMTransforms.a \ LLVMTransforms.a \
LLVMScalarOpts.a \ LLVMScalarOpts.a \
LLVMTransformUtils.a \ LLVMTransformUtils.a \
LLVMAnalysis.a \ LLVMAnalysis.a \
LLVMBCReader \ LLVMBCReader.a \
LLVMBCWriter \ LLVMBCWriter.a \
LLVMCore \ LLVMCore.a \
LLVMSupport.a \ LLVMSupport.a \
LLVMbzip2 \ LLVMbzip2.a \
LLVMSystem.a LLVMSystem.a
include $(LLVM_SRC_ROOT)/Makefile.rules include $(LLVM_SRC_ROOT)/Makefile.rules

View File

@ -9,8 +9,8 @@
LEVEL = ../.. LEVEL = ../..
TOOLNAME = llvm-ar TOOLNAME = llvm-ar
USEDLIBS = LLVMArchive.a LLVMBCReader \ USEDLIBS = LLVMArchive.a LLVMBCReader.a \
LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
include $(LEVEL)/Makefile.common include $(LEVEL)/Makefile.common

View File

@ -8,7 +8,7 @@
##===----------------------------------------------------------------------===## ##===----------------------------------------------------------------------===##
LEVEL = ../.. LEVEL = ../..
TOOLNAME = llvm-as TOOLNAME = llvm-as
USEDLIBS = LLVMAsmParser LLVMBCWriter LLVMCore \ USEDLIBS = LLVMAsmParser.a LLVMBCWriter.a LLVMCore.a \
LLVMSupport.a LLVMbzip2 LLVMSystem.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
include $(LEVEL)/Makefile.common include $(LEVEL)/Makefile.common

View File

@ -9,5 +9,5 @@
LEVEL = ../.. LEVEL = ../..
TOOLNAME = llvm-bcanalyzer TOOLNAME = llvm-bcanalyzer
USEDLIBS = LLVMBCReader LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a USEDLIBS = LLVMBCReader.a LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
include $(LEVEL)/Makefile.common include $(LEVEL)/Makefile.common

View File

@ -9,6 +9,7 @@
LEVEL = ../.. LEVEL = ../..
TOOLNAME = llvm-db TOOLNAME = llvm-db
USEDLIBS = LLVMDebugger LLVMBCReader LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a USEDLIBS = LLVMDebugger LLVMBCReader.a LLVMCore.a LLVMSupport.a \
LLVMbzip2.a LLVMSystem.a
include $(LEVEL)/Makefile.common include $(LEVEL)/Makefile.common

View File

@ -9,5 +9,5 @@
LEVEL = ../.. LEVEL = ../..
TOOLNAME = llvm-dis TOOLNAME = llvm-dis
USEDLIBS = LLVMBCReader LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a USEDLIBS = LLVMBCReader.a LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
include $(LEVEL)/Makefile.common include $(LEVEL)/Makefile.common

View File

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

View File

@ -12,7 +12,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.a LLVMTarget.a LLVMLinker.a \
LLVMArchive.a LLVMBCReader LLVMBCWriter \ LLVMArchive.a LLVMBCReader.a LLVMBCWriter.a \
LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
include $(LEVEL)/Makefile.common include $(LEVEL)/Makefile.common

View File

@ -9,7 +9,7 @@
LEVEL = ../.. LEVEL = ../..
TOOLNAME = llvm-link TOOLNAME = llvm-link
USEDLIBS = LLVMLinker.a LLVMBCReader LLVMBCWriter \ USEDLIBS = LLVMLinker.a LLVMBCReader.a LLVMBCWriter.a \
LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
include $(LEVEL)/Makefile.common include $(LEVEL)/Makefile.common

View File

@ -9,6 +9,6 @@
LEVEL = ../.. LEVEL = ../..
TOOLNAME = llvm-nm TOOLNAME = llvm-nm
USEDLIBS = LLVMArchive.a LLVMBCReader \ USEDLIBS = LLVMArchive.a LLVMBCReader.a \
LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
include $(LEVEL)/Makefile.common include $(LEVEL)/Makefile.common

View File

@ -9,7 +9,7 @@
LEVEL = ../.. LEVEL = ../..
TOOLNAME = llvm-prof TOOLNAME = llvm-prof
USEDLIBS = LLVMAnalysis.a LLVMBCReader \ USEDLIBS = LLVMAnalysis.a LLVMBCReader.a \
LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
include $(LEVEL)/Makefile.common include $(LEVEL)/Makefile.common

View File

@ -9,7 +9,7 @@
LEVEL = ../.. LEVEL = ../..
TOOLNAME = llvm-ranlib TOOLNAME = llvm-ranlib
USEDLIBS = LLVMArchive.a LLVMBCReader \ USEDLIBS = LLVMArchive.a LLVMBCReader.a \
LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
include $(LEVEL)/Makefile.common include $(LEVEL)/Makefile.common

View File

@ -8,7 +8,7 @@
##===----------------------------------------------------------------------===## ##===----------------------------------------------------------------------===##
LEVEL = ../.. LEVEL = ../..
TOOLNAME = llvm2cpp TOOLNAME = llvm2cpp
USEDLIBS = LLVMAsmParser LLVMBCWriter LLVMCore \ USEDLIBS = LLVMAsmParser.a LLVMBCWriter.a LLVMCore.a \
LLVMSupport.a LLVMbzip2 LLVMSystem.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
include $(LEVEL)/Makefile.common include $(LEVEL)/Makefile.common

View File

@ -8,7 +8,7 @@
##===----------------------------------------------------------------------===## ##===----------------------------------------------------------------------===##
LEVEL = ../.. LEVEL = ../..
TOOLNAME = llvmc TOOLNAME = llvmc
USEDLIBS = LLVMBCReader LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a USEDLIBS = LLVMBCReader.a LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a
CONFIG_FILES = c cpp ll CONFIG_FILES = c cpp ll
EXTRA_DIST = c cpp ll ConfigLexer.cpp.cvs ConfigLexer.l.cvs EXTRA_DIST = c cpp ll ConfigLexer.cpp.cvs ConfigLexer.l.cvs

View File

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