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
2024-12-26 05:32:25 +00:00 · 2006-06-01 01:30:27 +00:00 · 2006-06-01 01:30:27 +00:00 · 18c8b49e7d
commit 18c8b49e7d
parent b756c79d12
33 changed files with 61 additions and 54 deletions
--- a/Makefile.rules
+++ b/Makefile.rules
@ -357,7 +357,7 @@ endif
 # Options To Invoke Tools
 #----------------------------------------------------------

-CompileCommonOpts := -Wall -W -Wwrite-strings -Wno-unused
+CompileCommonOpts := -Wall -W -Wwrite-strings -Wno-unused 

 ifeq ($(OS),HP-UX)
  CompileCommonOpts := -D_REENTRANT -D_HPUX_SOURCE
@ -628,7 +628,7 @@ ifdef ENABLE_ALPHA_JIT
 endif

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

--- a/examples/ModuleMaker/Makefile
+++ b/examples/ModuleMaker/Makefile
@ -9,6 +9,6 @@
 LEVEL=../..
 TOOLNAME=ModuleMaker
 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
--- a/lib/AsmParser/Makefile
+++ b/lib/AsmParser/Makefile
@ -9,6 +9,7 @@

 LEVEL = ../..
 LIBRARYNAME := LLVMAsmParser
+BUILD_ARCHIVE = 1
 EXTRA_DIST := Lexer.cpp.cvs Lexer.l.cvs \
              llvmAsmParser.cpp.cvs llvmAsmParser.h.cvs llvmAsmParser.y.cvs

--- a/lib/Bytecode/Reader/Makefile
+++ b/lib/Bytecode/Reader/Makefile
@ -8,6 +8,7 @@
 ##===----------------------------------------------------------------------===##
 LEVEL = ../../..
 LIBRARYNAME = LLVMBCReader
+BUILD_ARCHIVE = 1

 include $(LEVEL)/Makefile.common

--- a/lib/Bytecode/Writer/Makefile
+++ b/lib/Bytecode/Writer/Makefile
@ -8,5 +8,6 @@
 ##===----------------------------------------------------------------------===##
 LEVEL = ../../..
 LIBRARYNAME = LLVMBCWriter
+BUILD_ARCHIVE = 1

 include $(LEVEL)/Makefile.common
--- a/lib/CodeGen/Makefile
+++ b/lib/CodeGen/Makefile
@ -8,7 +8,7 @@
 ##===----------------------------------------------------------------------===##

 LEVEL = ../..
-PARALLEL_DIRS = SelectionDAG
 LIBRARYNAME = LLVMCodeGen
+PARALLEL_DIRS = SelectionDAG

 include $(LEVEL)/Makefile.common
--- a/lib/CodeGen/SelectionDAG/Makefile
+++ b/lib/CodeGen/SelectionDAG/Makefile
@ -7,7 +7,7 @@
 # 
 ##===----------------------------------------------------------------------===##
 LEVEL = ../../..
-PARALLEL_DIRS =
 LIBRARYNAME = LLVMSelectionDAG
+PARALLEL_DIRS =

 include $(LEVEL)/Makefile.common
--- a/lib/Support/bzip2/Makefile
+++ b/lib/Support/bzip2/Makefile
@ -8,6 +8,7 @@
 ##===----------------------------------------------------------------------===##
 LEVEL = ../../..
 LIBRARYNAME = LLVMbzip2
+BUILD_ARCHIVE = 1
 SOURCES = blocksort.c huffman.c crctable.c randtable.c compress.c decompress.c \
 	  bzlib.c
 EXTRA_DIST = bzlib.h bzlib_private.h CHANGES LICENSE README \
--- a/lib/Target/CBackend/Makefile
+++ b/lib/Target/CBackend/Makefile
@ -9,5 +9,5 @@

 LEVEL = ../../..
 LIBRARYNAME = LLVMCBackend
+CXXFLAGS += -pedantic -Wno-long-long
 include $(LEVEL)/Makefile.common
-
--- a/lib/VMCore/Makefile
+++ b/lib/VMCore/Makefile
@ -8,14 +8,10 @@
 ##===----------------------------------------------------------------------===##
 LEVEL = ../..
 LIBRARYNAME = LLVMCore
+BUILD_ARCHIVE = 1

 BUILT_SOURCES = $(PROJ_SRC_ROOT)/include/llvm/Intrinsics.gen

-include $(LEVEL)/Makefile.config
-ifeq ($(ARCH),Alpha)
-BUILD_ARCHIVE = 1
-endif
-
 include $(LEVEL)/Makefile.common

 GENFILE:=$(PROJ_SRC_ROOT)/include/llvm/Intrinsics.gen
--- a/projects/Stacker/tools/stkrc/Makefile
+++ b/projects/Stacker/tools/stkrc/Makefile
@ -9,9 +9,9 @@ LEVEL=../..
 # Give the name of a library.  This will build a dynamic version.
 #
 TOOLNAME = stkrc
-LLVMLIBS = LLVMAsmParser LLVMBCWriter LLVMipo.a \
-	   LLVMScalarOpts.a LLVMTransforms.a LLVMTransformUtils.a LLVMipa.a LLVMAnalysis.a LLVMTarget.a \
-	   LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a 
+LLVMLIBS = LLVMAsmParser.a LLVMBCWriter.a LLVMipo.a LLVMScalarOpts.a \
+	  LLVMTransforms.a LLVMTransformUtils.a LLVMipa.a LLVMAnalysis.a \
+	  LLVMTarget.a LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a 
 CONFIG_FILES = st
 EXTRA_DIST = st
 USEDLIBS=stkr_compiler 
--- a/runtime/GC/SemiSpace/Makefile
+++ b/runtime/GC/SemiSpace/Makefile
@ -15,3 +15,5 @@ EXPORTED_SYMBOL_FILE = $(PROJ_SRC_DIR)/../gc_exported_symbols.lst

 include $(LEVEL)/Makefile.common

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

 include $(LEVEL)/Makefile.common

+CompileCommonOpts := $(filter-out -pedantic,$(CompileCommonOpts))
+CompileCommonOpts := $(filter-out -Wno-long-long,$(CompileCommonOpts))
--- a/runtime/libtrace/Makefile
+++ b/runtime/libtrace/Makefile
@ -14,3 +14,5 @@ BYTECODE_DESTINATION = $(CFERuntimeLibDir)

 include $(LEVEL)/Makefile.common

+CompileCommonOpts := $(filter-out -pedantic,$(CompileCommonOpts))
+CompileCommonOpts := $(filter-out -Wno-long-long,$(CompileCommonOpts))
--- a/tools/analyze/Makefile
+++ b/tools/analyze/Makefile
@ -8,9 +8,9 @@
 ##===----------------------------------------------------------------------===##
 LEVEL = ../..
 TOOLNAME = analyze
-USEDLIBS = LLVMAsmParser LLVMBCReader LLVMAnalysis.a LLVMipa.a \
+USEDLIBS = LLVMAsmParser.a LLVMBCReader.a LLVMAnalysis.a LLVMipa.a \
           LLVMDataStructure \
 	   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
--- a/tools/bugpoint/Makefile
+++ b/tools/bugpoint/Makefile
@ -15,7 +15,7 @@ ANALIBS  = LLVMDataStructure LLVMipa.a LLVMTarget.a

 USEDLIBS = LLVMipo.a LLVMScalarOpts.a $(OPTLIBS) $(ANALIBS) LLVMAnalysis.a \
 	   LLVMTransformUtils.a \
-	   LLVMAsmParser LLVMLinker.a LLVMBCReader LLVMBCWriter \
-	   LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a
+	   LLVMAsmParser.a LLVMLinker.a LLVMBCReader.a LLVMBCWriter.a \
+	   LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a

 include $(LEVEL)/Makefile.common
--- a/tools/gccas/Makefile
+++ b/tools/gccas/Makefile
@ -9,8 +9,8 @@
 LEVEL = ../..

 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 \
-           LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a
+           LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a

 include $(LEVEL)/Makefile.common
--- a/tools/gccld/Makefile
+++ b/tools/gccld/Makefile
@ -12,7 +12,7 @@ LEVEL = ../..
 TOOLNAME = gccld
 USEDLIBS = LLVMipo.a LLVMTransforms.a LLVMScalarOpts.a LLVMAnalysis.a \
           LLVMipa.a LLVMTransformUtils.a LLVMTarget.a LLVMLinker.a \
-           LLVMArchive.a LLVMBCReader LLVMBCWriter \
-           LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a
+           LLVMArchive.a LLVMBCReader.a LLVMBCWriter.a \
+           LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a

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

 include $(LLVM_SRC_ROOT)/Makefile.rules
--- a/tools/llvm-ar/Makefile
+++ b/tools/llvm-ar/Makefile
@ -9,8 +9,8 @@
 LEVEL = ../..

 TOOLNAME = llvm-ar
-USEDLIBS = LLVMArchive.a LLVMBCReader \
-	   LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a
+USEDLIBS = LLVMArchive.a LLVMBCReader.a \
+	   LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a

 include $(LEVEL)/Makefile.common

--- a/tools/llvm-as/Makefile
+++ b/tools/llvm-as/Makefile
@ -8,7 +8,7 @@
 ##===----------------------------------------------------------------------===##
 LEVEL = ../..
 TOOLNAME = llvm-as
-USEDLIBS = LLVMAsmParser LLVMBCWriter LLVMCore \
-           LLVMSupport.a LLVMbzip2 LLVMSystem.a
+USEDLIBS = LLVMAsmParser.a LLVMBCWriter.a LLVMCore.a \
+           LLVMSupport.a LLVMbzip2.a LLVMSystem.a

 include $(LEVEL)/Makefile.common
--- a/tools/llvm-bcanalyzer/Makefile
+++ b/tools/llvm-bcanalyzer/Makefile
@ -9,5 +9,5 @@
 LEVEL = ../..

 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
--- a/tools/llvm-db/Makefile
+++ b/tools/llvm-db/Makefile
@ -9,6 +9,7 @@

 LEVEL = ../..
 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
--- a/tools/llvm-dis/Makefile
+++ b/tools/llvm-dis/Makefile
@ -9,5 +9,5 @@
 LEVEL = ../..

 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
--- a/tools/llvm-extract/Makefile
+++ b/tools/llvm-extract/Makefile
@ -9,8 +9,8 @@
 LEVEL = ../..

 TOOLNAME = llvm-extract
-USEDLIBS = LLVMBCReader LLVMBCWriter LLVMTransforms.a LLVMipo.a LLVMTarget.a \
-           LLVMAnalysis.a LLVMTransformUtils.a LLVMipa.a \
-           LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a
+USEDLIBS = LLVMBCReader.a LLVMBCWriter.a LLVMTransforms.a LLVMipo.a \
+	   LLVMTarget.a LLVMAnalysis.a LLVMTransformUtils.a LLVMipa.a \
+           LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a

 include $(LEVEL)/Makefile.common
--- a/tools/llvm-ld/Makefile
+++ b/tools/llvm-ld/Makefile
@ -12,7 +12,7 @@ LEVEL = ../..
 TOOLNAME = llvm-ld
 USEDLIBS = LLVMipo.a LLVMTransforms.a LLVMScalarOpts.a LLVMAnalysis.a \
 	   LLVMipa.a LLVMTransformUtils.a LLVMTarget.a LLVMLinker.a \
-	   LLVMArchive.a LLVMBCReader LLVMBCWriter \
-	   LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a
+	   LLVMArchive.a LLVMBCReader.a LLVMBCWriter.a \
+	   LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a

 include $(LEVEL)/Makefile.common
--- a/tools/llvm-link/Makefile
+++ b/tools/llvm-link/Makefile
@ -9,7 +9,7 @@
 LEVEL = ../..

 TOOLNAME = llvm-link
-USEDLIBS = LLVMLinker.a LLVMBCReader LLVMBCWriter \
-	   LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a
+USEDLIBS = LLVMLinker.a LLVMBCReader.a LLVMBCWriter.a \
+	   LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a

 include $(LEVEL)/Makefile.common
--- a/tools/llvm-nm/Makefile
+++ b/tools/llvm-nm/Makefile
@ -9,6 +9,6 @@
 LEVEL = ../..

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

 TOOLNAME = llvm-prof
-USEDLIBS = LLVMAnalysis.a LLVMBCReader \
-           LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a
+USEDLIBS = LLVMAnalysis.a LLVMBCReader.a \
+           LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a

 include $(LEVEL)/Makefile.common
--- a/tools/llvm-ranlib/Makefile
+++ b/tools/llvm-ranlib/Makefile
@ -9,7 +9,7 @@

 LEVEL = ../..
 TOOLNAME = llvm-ranlib
-USEDLIBS = LLVMArchive.a LLVMBCReader \
-	   LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a
+USEDLIBS = LLVMArchive.a LLVMBCReader.a \
+	   LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a

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

 include $(LEVEL)/Makefile.common
--- a/tools/llvmc/Makefile
+++ b/tools/llvmc/Makefile
@ -8,7 +8,7 @@
 ##===----------------------------------------------------------------------===##
 LEVEL = ../..
 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
 EXTRA_DIST = c cpp ll ConfigLexer.cpp.cvs ConfigLexer.l.cvs

--- a/tools/opt/Makefile
+++ b/tools/opt/Makefile
@ -9,9 +9,9 @@
 LEVEL = ../..
 TOOLNAME = opt

-USEDLIBS = LLVMBCReader LLVMBCWriter LLVMInstrumentation.a \
+USEDLIBS = LLVMBCReader.a LLVMBCWriter.a LLVMInstrumentation.a \
 	   LLVMScalarOpts.a LLVMipo.a LLVMipa.a LLVMDataStructure LLVMTransforms.a \
-	   LLVMTarget.a LLVMTransformUtils.a LLVMAnalysis.a LLVMCore LLVMSupport.a \
-	   LLVMbzip2 LLVMSystem.a 
+	   LLVMTarget.a LLVMTransformUtils.a LLVMAnalysis.a LLVMCore.a LLVMSupport.a \
+	   LLVMbzip2.a LLVMSystem.a 

 include $(LEVEL)/Makefile.common