X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=Makefile.rules;h=d6ed2d531613a5234ce7a5ac6d023a6d63646449;hb=b00a6425de1ef8668b63f29927c38da8a19ce904;hp=39acd0cf2515f00e8c3390d6a6c8fa020cdf99f7;hpb=e4cb90f41cc0df3e6d69f622e06214214d053001;p=oota-llvm.git diff --git a/Makefile.rules b/Makefile.rules index 39acd0cf251..d6ed2d53161 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -19,10 +19,11 @@ #-------------------------------------------------------------------- # Define the various target sets #-------------------------------------------------------------------- -RecursiveTargets := all clean check install uninstall -LocalTargets := all-local clean-local check-local install-local printvars \ - uninstall-local -TopLevelTargets := dist dist-check dist-clean tags dist-gzip dist-bzip2 \ +RecursiveTargets := all clean clean-all install uninstall install-bytecode +LocalTargets := all-local clean-local clean-all-local check-local \ + install-local printvars uninstall-local \ + install-bytecode-local +TopLevelTargets := check dist dist-check dist-clean tags dist-gzip dist-bzip2 \ dist-zip UserTargets := $(RecursiveTargets) $(LocalTargets) $(TopLevelTargets) InternalTargets := preconditions distdir dist-hook @@ -59,11 +60,12 @@ $(UserTargets):: # PRECONDITIONS: that which must be built/checked first ################################################################################ -SrcMakefiles := $(filter %Makefile %Makefile.rules %Makefile.tests \ - %Makefile.JIT,$(wildcard $(BUILD_SRC_DIR)/Makefile*)) +SrcMakefiles := $(filter %Makefile %Makefile.tests,\ + $(wildcard $(BUILD_SRC_DIR)/Makefile*)) ObjMakefiles := $(subst $(BUILD_SRC_DIR),$(BUILD_OBJ_DIR),$(SrcMakefiles)) -ConfigureScript := $(LLVM_SRC_ROOT)/configure -ConfigStatusScript := $(LLVM_OBJ_ROOT)/config.status +ConfigureScript := $(BUILD_SRC_ROOT)/configure +ConfigStatusScript := $(BUILD_OBJ_ROOT)/config.status +LConfigStatusScript:= $(LLVM_OBJ_ROOT)/config.status MakefileConfigIn := $(LLVM_SRC_ROOT)/Makefile.config.in MakefileConfig := $(LLVM_OBJ_ROOT)/Makefile.config PreConditions := $(ConfigStatusScript) $(MakefileConfig) $(ObjMakefiles) @@ -73,11 +75,32 @@ preconditions : $(PreConditions) #------------------------------------------------------------------------ # Make sure the BUILT_SOURCES are built first #------------------------------------------------------------------------ -$(filter-out clean clean-local,UserTargets):: $(BUILT_SOURCES) +$(filter-out clean clean-local,$(UserTargets)):: $(BUILT_SOURCES) clean-local:: ifneq ($(strip $(BUILT_SOURCES)),) - $(Verb) $(RM) -f $(BUILT_SOURCES) + -$(Verb) $(RM) -f $(BUILT_SOURCES) +endif + +ifneq ($(BUILD_OBJ_ROOT),$(BUILD_SRC_ROOT)) +spotless: + $(Verb) if test -x config.status ; then \ + $(EchoCmd) Wiping out $(BUILD_OBJ_ROOT) ; \ + $(MKDIR) .spotless.save ; \ + $(MV) config.status .spotless.save ; \ + $(MV) mklib .spotless.save ; \ + $(MV) projects .spotless.save ; \ + $(RM) -rf * ; \ + $(MV) .spotless.save/config.status . ; \ + $(MV) .spotless.save/mklib . ; \ + $(MV) .spotless.save/projects . ; \ + $(RM) -rf .spotless.save ; \ + $(EchoCmd) Rebuilding configuration of $(BUILD_OBJ_ROOT) ; \ + $(ConfigStatusScript) --recheck $(ConfigureScriptFLAGS) && \ + $(ConfigStatusScript) ; \ + else \ + $(EchoCmd) "make spotless" can only be run from $(BUILD_OBJ_ROOT); \ + fi endif $(BUILT_SOURCES) : $(ObjMakefiles) @@ -85,18 +108,31 @@ $(BUILT_SOURCES) : $(ObjMakefiles) #------------------------------------------------------------------------ # Make sure we're not using a stale configuration #------------------------------------------------------------------------ +reconfigure: + $(Echo) Reconfiguring $(BUILD_OBJ_ROOT) + $(Verb) cd $(BUILD_OBJ_ROOT) && \ + if test -w $(BUILD_OBJ_ROOT)/config.cache ; then \ + $(RM) $(BUILD_OBJ_ROOT)/config.cache ; \ + fi ; \ + $(ConfigStatusScript) --recheck $(ConfigureScriptFLAGS) && \ + $(ConfigStatusScript) + .PRECIOUS: $(ConfigStatusScript) $(ConfigStatusScript): $(ConfigureScript) $(Echo) Reconfiguring with $< - $(Verb) $(ConfigStatusScript) --recheck $(ConfigureScriptFLAGS) - $(Verb) $(ConfigStatusScript) + $(Verb) cd $(BUILD_OBJ_ROOT) && \ + if test -w $(BUILD_OBJ_ROOT)/config.cache ; then \ + $(RM) $(BUILD_OBJ_ROOT)/config.cache ; \ + fi ; \ + $(ConfigStatusScript) --recheck $(ConfigureScriptFLAGS) && \ + $(ConfigStatusScript) #------------------------------------------------------------------------ # Make sure the configuration makefile is up to date #------------------------------------------------------------------------ -$(MakefileConfig): $(MakefileConfigIn) $(ConfigStatusScript) +$(MakefileConfig): $(MakefileConfigIn) $(LConfigStatusScript) $(Echo) Regenerating $@ - $(Verb) cd $(LLVM_OBJ_ROOT) ; $(ConfigStatusScript) Makefile.config + $(Verb) cd $(LLVM_OBJ_ROOT) ; $(LConfigStatusScript) Makefile.config #------------------------------------------------------------------------ # If the Makefile in the source tree has been updated, copy it over into the @@ -104,10 +140,10 @@ $(MakefileConfig): $(MakefileConfigIn) $(ConfigStatusScript) #------------------------------------------------------------------------ ifneq ($(BUILD_OBJ_DIR),$(BUILD_SRC_DIR)) -$(BUILD_OBJ_DIR)/Makefile : $(BUILD_SRC_DIR)/Makefile +Makefile: $(BUILD_SRC_DIR)/Makefile $(Echo) "Updating Makefile" $(Verb) $(MKDIR) $(@D) - $(Verb) cp -f $< $@ + $(Verb) $(CP) -f $< $@ # Copy the Makefile.* files unless we're in the root directory which avoids # the copying of Makefile.config.in or other things that should be explicitly @@ -118,7 +154,7 @@ $(BUILD_OBJ_DIR)/Makefile% : $(BUILD_SRC_DIR)/Makefile% *.in) ;; \ *) $(Echo) "Updating $(@F)" ; \ $(MKDIR) $(@D) ; \ - cp -f $< $@ ;; \ + $(CP) -f $< $@ ;; \ esac endif @@ -129,12 +165,12 @@ endif $(UserTargets):: $(PreConditions) all:: all-local -check:: check-local clean:: clean-local +clean-all:: clean-local clean-all-local install:: install-local uninstall:: uninstall-local -check-local:: all-local install-local:: all-local +install-bytecode:: install-bytecode-local ############################################################################### # VARIABLES: Set up various variables based on configuration data @@ -144,20 +180,26 @@ install-local:: all-local # Variables derived from configuration we are building #-------------------------------------------------------------------- + ifdef ENABLE_PROFILING - Configuration := Profile + BuildMode := Profile CXX.Flags := -O3 -DNDEBUG -felide-constructors -finline-functions -pg C.Flags := -O3 -DNDEBUG -pg LD.Flags := -O3 -DNDEBUG -pg else ifdef ENABLE_OPTIMIZED - Configuration := Release - CXX.Flags := -O3 -DNDEBUG -finline-functions -felide-constructors -fomit-frame-pointer - C.Flags := -O3 -DNDEBUG -fomit-frame-pointer + BuildMode := Release + # Don't use -fomit-frame-pointer on FreeBSD + ifneq ($(OS),FreeBSD) + OmitFramePointer := -fomit-frame-pointer + endif + CXX.Flags := -O3 -DNDEBUG -finline-functions -felide-constructors \ + $(OmitFramePointer) + C.Flags := -O3 -DNDEBUG $(OmitFramePointer) LD.Flags := -O3 -DNDEBUG else - Configuration := Debug - CXX.Flags := -g -D_DEBUG + BuildMode := Debug + CXX.Flags := -g -D_DEBUG C.Flags := -g -D_DEBUG LD.Flags := -g -D_DEBUG KEEP_SYMBOLS := 1 @@ -174,11 +216,14 @@ LibTool.Flags := --tag=CXX #-------------------------------------------------------------------- # Directory locations #-------------------------------------------------------------------- -ObjDir := $(BUILD_OBJ_DIR)/$(Configuration) -LibDir := $(BUILD_OBJ_ROOT)/lib/$(Configuration) -ToolDir := $(BUILD_OBJ_ROOT)/tools/$(Configuration) -LLVMLibDir := $(LLVM_OBJ_ROOT)/lib/$(Configuration) -LLVMToolDir := $(LLVM_OBJ_ROOT)/tools/$(Configuration) +ObjDir := $(BUILD_OBJ_DIR)/$(BuildMode) +LibDir := $(BUILD_OBJ_ROOT)/$(BuildMode)/lib +ToolDir := $(BUILD_OBJ_ROOT)/$(BuildMode)/bin +ExmplDir := $(BUILD_OBJ_ROOT)/$(BuildMode)/examples +LLVMLibDir := $(LLVM_OBJ_ROOT)/$(BuildMode)/lib +LLVMToolDir := $(LLVM_OBJ_ROOT)/$(BuildMode)/bin +LLVMExmplDir:= $(LLVM_OBJ_ROOT)/$(BuildMode)/examples +CFERuntimeLibDir := $(LLVMGCCDIR)/lib #-------------------------------------------------------------------- # Full Paths To Compiled Tools and Utilities @@ -197,18 +242,23 @@ endif ifndef TBLGEN TBLGEN := $(LLVMToolDir)/tblgen$(EXEEXT) endif +ifndef GCCAS +GCCAS := $(LLVMToolDir)/gccas$(EXEEXT) +endif ifndef GCCLD GCCLD := $(LLVMToolDir)/gccld$(EXEEXT) endif -ifndef LLVMGCC -LLVMGCC := PATH=$(LLVMToolDir):$(PATH) $(LLVMGCCDIR)/bin/gcc +ifndef LDIS +LLVMDIS := $(LLVMToolDir)/llvm-dis$(EXEEXT) endif -ifndef LLVMGXX -LLVMGXX := PATH=$(LLVMToolDir):$(PATH) $(LLVMGCCDIR)/bin/g++ +ifndef LLI +LLI := $(LLVMToolDir)/lli$(EXEEXT) endif - -# Need a better way to compute this. -LLVMGCCLibDir := $(dir $(shell $(LLVMGCC) -print-file-name=libgcc.a))/ +ifndef LOPT +LOPT := $(LLVMToolDir)/opt$(EXEEXT) +endif +LLVMGCCWITHPATH := PATH="$(LLVMToolDir):$(PATH)" $(LLVMGCC) +LLVMGXXWITHPATH := PATH="$(LLVMToolDir):$(PATH)" $(LLVMGXX) #-------------------------------------------------------------------- # Adjust to user's request @@ -221,6 +271,13 @@ else LD.Flags += -rpath $(LibDir) endif +ifdef TOOL_VERBOSE + C.Flags += -v + CXX.Flags += -v + LD.Flags += -v + VERBOSE := 1 +endif + # Adjust settings for verbose mode ifndef VERBOSE Verb := @ @@ -239,8 +296,12 @@ endif # Adjust linker flags for building an executable ifdef TOOLNAME +ifdef EXAMPLE_TOOL + LD.Flags += -rpath $(ExmplDir) -export-dynamic +else LD.Flags += -rpath $(ToolDir) -export-dynamic endif +endif #---------------------------------------------------------- # Options To Invoke Tools @@ -259,19 +320,21 @@ CPP.Flags += -I$(BUILD_OBJ_DIR) \ Compile.C = $(CC) $(CPP.Flags) $(CompileCommonOpts) -c $(C.Flags) LTCompile.C = $(LIBTOOL) $(LibTool.Flags) --mode=compile $(Compile.C) -BCCompile.C = $(LLVMGCC) $(CPP.Flags) $(CompileCommonOpts) $(C.Flags) -c +BCCompile.C = $(LLVMGCCWITHPATH) $(CPP.Flags) $(CompileCommonOpts) \ + $(C.Flags) -c Compile.CXX = $(CXX) $(CPP.Flags) $(CompileCommonOpts) $(CXX.Flags) -c LTCompile.CXX = $(LIBTOOL) $(LibTool.Flags) --mode=compile $(Compile.CXX) -BCCompile.CXX = $(LLVMGXX) $(CPP.Flags) $(CompileCommonOpts) $(CXX.Flags) -c +BCCompile.CXX = $(LLVMGXXWITHPATH) $(CPP.Flags) $(CompileCommonOpts) \ + $(CXX.Flags) -c Link = $(LIBTOOL) $(LibTool.Flags) --mode=link $(CXX) $(CPP.Flags) \ $(CompileCommonOpts) $(LD.Flags) $(Strip) Relink = $(LIBTOOL) $(LibTool.Flags) --mode=link $(CXX) $(CPP.Flags) \ $(CompileCommonOpts) -BCLinkLib = $(LLVMGCC) -shared -nostdlib LTInstall = $(LIBTOOL) $(LibTool.Flags) --mode=install $(INSTALL) Burg = $(BURG) -I $(BUILD_SRC_DIR) TableGen = $(TBLGEN) -I $(BUILD_SRC_DIR) Archive = $(AR) $(AR.Flags) +LArchive = $(LLVMToolDir)/llvm-ar rcsf ifdef RANLIB Ranlib = $(RANLIB) else @@ -279,27 +342,37 @@ Ranlib = ranlib endif #---------------------------------------------------------- -# Get the list of source files +# Get the list of source files and compute object file +# names from them. #---------------------------------------------------------- -ifndef SOURCES - Sources := $(notdir $(wildcard $(BUILD_SRC_DIR)/*.cpp \ - $(BUILD_SRC_DIR)/*.cc $(BUILD_SRC_DIR)/*.c $(BUILD_SRC_DIR)/*.y \ - $(BUILD_SRC_DIR)/*.l)) +ifdef FAKE_SOURCES + Sources := + FakeSources := $(FAKE_SOURCES) + ifdef BUILT_SOURCES + FakeSources += $(filter %.cpp %.c %.cc %.y %.l,$(BUILT_SOURCES)) + endif + BaseNameSources := $(sort $(basename $(FakeSources))) + ObjectsO := $(BaseNameSources:%=$(ObjDir)/%.o) + ObjectsLO := $(BaseNameSources:%=$(ObjDir)/%.lo) + ObjectsBC := $(BaseNameSources:%=$(ObjDir)/%.bc) else - Sources := $(SOURCES) -endif + ifndef SOURCES + Sources := $(notdir $(wildcard $(BUILD_SRC_DIR)/*.cpp \ + $(BUILD_SRC_DIR)/*.cc $(BUILD_SRC_DIR)/*.c $(BUILD_SRC_DIR)/*.y \ + $(BUILD_SRC_DIR)/*.l)) + else + Sources := $(SOURCES) + endif -ifdef BUILT_SOURCES -Sources += $(filter %.cpp %.c %.cc %.y %.l,$(BUILT_SOURCES)) -endif + ifdef BUILT_SOURCES + Sources += $(filter %.cpp %.c %.cc %.y %.l,$(BUILT_SOURCES)) + endif -#---------------------------------------------------------- -# Types of objects that can be built from sources -#---------------------------------------------------------- -BaseNameSources := $(sort $(basename $(Sources))) -ObjectsO := $(BaseNameSources:%=$(ObjDir)/%.o) -ObjectsLO := $(BaseNameSources:%=$(ObjDir)/%.lo) -ObjectsBC := $(BaseNameSources:%=$(ObjDir)/%.bc) + BaseNameSources := $(sort $(basename $(Sources))) + ObjectsO := $(BaseNameSources:%=$(ObjDir)/%.o) + ObjectsLO := $(BaseNameSources:%=$(ObjDir)/%.lo) + ObjectsBC := $(BaseNameSources:%=$(ObjDir)/%.bc) +endif ############################################################################### # DIRECTORIES: Handle recursive descent of directory structure @@ -316,8 +389,8 @@ $(bindir): $(libdir): $(Verb) $(MKDIR) $(libdir) -$(bytecode_libdir): - $(Verb) $(MKDIR) $(bytecode_libdir) +$(includedir): + $(Verb) $(MKDIR) $(includedir) $(sysconfdir): $(Verb) $(MKDIR) $(sysconfdir) @@ -325,10 +398,10 @@ $(sysconfdir): # To create other directories, as needed, and timestamp their creation %/.dir: $(Verb) $(MKDIR) $* > /dev/null - @$(DATE) > $@ + $(Verb) $(DATE) > $@ -.PRECIOUS: $(ObjDir)/.dir $(LibDir)/.dir $(ToolDir)/.dir $(LLVMLibDir)/.dir -.PRECIOUS: $(LLVMToolDir)/.dir +.PRECIOUS: $(ObjDir)/.dir $(LibDir)/.dir $(ToolDir)/.dir $(ExmplDir)/.dir +.PRECIOUS: $(LLVMLibDir)/.dir $(LLVMToolDir)/.dir $(LLVMExmplDir)/.dir #--------------------------------------------------------- # Handle the DIRS options for sequential construction @@ -341,9 +414,11 @@ $(RecursiveTargets):: $(Verb) for dir in $(DIRS); do \ if [ ! -f $$dir/Makefile ]; then \ $(MKDIR) $$dir; \ - cp $(BUILD_SRC_DIR)/$$dir/Makefile $$dir/Makefile; \ + $(CP) $(BUILD_SRC_DIR)/$$dir/Makefile $$dir/Makefile; \ fi; \ - ($(MAKE) -C $$dir $@ ) || exit 1; \ + if [ ! -f $$dir/LLVM_DO_NOT_BUILD ]; then \ + ($(MAKE) -C $$dir $@ ) || exit 1; \ + fi ; \ done endif @@ -356,9 +431,11 @@ $(RecursiveTargets):: $(Verb) for dir in $(EXPERIMENTAL_DIRS); do \ if [ ! -f $$dir/Makefile ]; then \ $(MKDIR) $$dir; \ - cp $(BUILD_SRC_DIR)/$$dir/Makefile $$dir/Makefile; \ + $(CP) $(BUILD_SRC_DIR)/$$dir/Makefile $$dir/Makefile; \ fi; \ - ($(MAKE) -C $$dir $@ ) || exit 0; \ + if [ ! -f $$dir/LLVM_DO_NOT_BUILD ]; then \ + ($(MAKE) -C $$dir $@ ) || exit 0; \ + fi ; \ done endif @@ -369,22 +446,24 @@ ifdef PARALLEL_DIRS SubDirs += $(PARALLEL_DIRS) -# Unfortunately, this list must be maintained if new -# recursive targets are added. +# Unfortunately, this list must be maintained if new recursive targets are added all :: $(addsuffix /.makeall ,$(PARALLEL_DIRS)) clean :: $(addsuffix /.makeclean ,$(PARALLEL_DIRS)) -check :: $(addsuffix /.makecheck ,$(PARALLEL_DIRS)) +clean-all:: $(addsuffix /.makeclean-all,$(PARALLEL_DIRS)) install :: $(addsuffix /.makeinstall ,$(PARALLEL_DIRS)) uninstall:: $(addsuffix /.makeuninstall,$(PARALLEL_DIRS)) +install-bytecode :: $(addsuffix /.makeinstall-bytecode,$(PARALLEL_DIRS)) -Parallel_Targets := $(foreach T,$(RecursiveTargets),%/.make$(T)) +ParallelTargets := $(foreach T,$(RecursiveTargets),%/.make$(T)) -$(Parallel_Targets) : +$(ParallelTargets) : $(Verb) if [ ! -f $(@D)/Makefile ]; then \ $(MKDIR) $(@D); \ - cp $(BUILD_SRC_DIR)/$(@D)/Makefile $(@D)/Makefile; \ + $(CP) $(BUILD_SRC_DIR)/$(@D)/Makefile $(@D)/Makefile; \ fi; \ - $(MAKE) -C $(@D) $(subst $(@D)/.make,,$@) + if [ ! -f $$dir/LLVM_DO_NOT_BUILD ]; then \ + $(MAKE) -C $(@D) $(subst $(@D)/.make,,$@) ; \ + fi endif #--------------------------------------------------------- @@ -400,9 +479,11 @@ $(RecursiveTargets):: if [ -d $(BUILD_SRC_DIR)/$$dir ]; then\ if [ ! -f $$dir/Makefile ]; then \ $(MKDIR) $$dir; \ - cp $(BUILD_SRC_DIR)/$$dir/Makefile $$dir/Makefile; \ + $(CP) $(BUILD_SRC_DIR)/$$dir/Makefile $$dir/Makefile; \ fi; \ - ($(MAKE) -C$$dir $@ ) || exit 1; \ + if [ ! -f $$dir/LLVM_DO_NOT_BUILD ]; then \ + ($(MAKE) -C$$dir $@ ) || exit 1; \ + fi ; \ fi \ done endif @@ -415,7 +496,13 @@ ifdef CONFIG_FILES install-local:: $(sysconfdir) $(CONFIG_FILES) $(Echo) Installing Configuration Files To $(sysconfdir) $(Verb)for file in $(CONFIG_FILES); do \ - $(INSTALL) $(BUILD_SRC_DIR)/$${file} $(sysconfdir) ; \ + if test -f $(BUILD_OBJ_DIR)/$${file} ; then \ + $(INSTALL) $(BUILD_OBJ_DIR)/$${file} $(sysconfdir) ; \ + elif test -f $(BUILD_SRC_DIR)/$${file} ; then \ + $(INSTALL) $(BUILD_SRC_DIR)/$${file} $(sysconfdir) ; \ + else \ + $(ECHO) Error: cannot find config file $${file}. ; \ + fi \ done uninstall-local:: @@ -430,6 +517,54 @@ endif # Library Build Rules: Four ways to build a library ############################################################################### +#--------------------------------------------------------- +# Bytecode Module Targets: +# If the user set MODULE_NAME then they want to build a +# bytecode module from the sources. We compile all the +# sources and link it together into a single bytecode +# module. +#--------------------------------------------------------- + +ifdef MODULE_NAME + +Module := $(LibDir)/$(MODULE_NAME).bc +LinkModule := $(LLVMGCCWITHPATH) -shared -nostdlib + +ifdef EXPORTED_SYMBOL_FILE +LinkMOdule += -Xlinker -internalize-public-api-file=$(EXPORTED_SYMBOL_FILE) +endif + +$(Module): $(BUILT_SOURCES) $(ObjectsBC) $(LibDir)/.dir $(GCCLD) + $(Echo) Building $(BuildMOde) Bytecode Module $(notdir $@) + $(Verb) $(LinkModule) -o $@ $(ObjectsBC) + +all-local:: $(Module) + +clean-local:: +ifneq ($(strip $(Module)),) + -$(Verb) $(RM) -f $(Module) +endif + +ifdef BYTECODE_DESTINATION +ModuleDestDir := $(BYTECODE_DESTINATION) +else +ModuleDestDir := $(libdir) +endif + +DestModule := $(ModuleDestDir)/$(MODULE_NAME).bc + +install-module:: $(DestModule) +install-local:: $(DestModule) + +$(DestModule): $(ModuleDestDir) $(Module) + $(Echo) Installing $(BuildMode) Bytecode Module $(DestModule) + $(Verb) $(INSTALL) $(Module) $@ + +uninstall-local:: + $(Echo) Uninstalling $(BuildMode) Bytecode Module $(DestModule) + -$(Verb) $(RM) -f $(DestModule) + +endif # if we're building a library ... ifdef LIBRARYNAME @@ -439,7 +574,7 @@ LIBRARYNAME := $(strip $(LIBRARYNAME)) LibName.LA := $(LibDir)/lib$(LIBRARYNAME).la LibName.A := $(LibDir)/lib$(LIBRARYNAME).a LibName.O := $(LibDir)/$(LIBRARYNAME).o -LibName.BC := $(LibDir)/lib$(LIBRARYNAME).bc +LibName.BCA:= $(LibDir)/lib$(LIBRARYNAME).bca #--------------------------------------------------------- # Shared Library Targets: @@ -451,14 +586,14 @@ ifdef SHARED_LIBRARY all-local:: $(LibName.LA) -$(LibName.LA): $(BUILT_SOURCES) $(ObjectsLO) $(LibDir)/.dir - $(Echo) Linking $(Configuration) Shared Library $(LIBRARYNAME)$(SHLIBEXT) +$(LibName.LA): $(ObjectsLO) $(LibDir)/.dir + $(Echo) Linking $(BuildMode) Shared Library $(LIBRARYNAME)$(SHLIBEXT) $(Verb) $(Link) -o $@ $(ObjectsLO) $(Verb) $(LTInstall) $@ $(LibDir) clean-local:: ifneq ($(strip $(LibName.LA)),) - $(Verb) $(RM) -f $(LibName.LA) + -$(Verb) $(RM) -f $(LibName.LA) endif DestSharedLib = $(libdir)/lib$(LIBRARYNAME)$(SHLIBEXT) @@ -466,13 +601,13 @@ DestSharedLib = $(libdir)/lib$(LIBRARYNAME)$(SHLIBEXT) install-local:: $(DestSharedLib) $(DestSharedLib): $(libdir) $(LibName.LA) - $(Echo) Installing $(Configuration) Shared Library $(DestSharedLib) + $(Echo) Installing $(BuildMode) Shared Library $(DestSharedLib) $(Verb) $(LTInstall) $(LibName.LA) $(DestSharedLib) $(Verb) $(LIBTOOL) --finish $(libdir) uninstall-local:: - $(Echo) Uninstalling $(Configuration) Shared Library $(DestSharedLib) - $(Verb) $(RM) -f $(DestSharedLib) + $(Echo) Uninstalling $(BuildMode) Shared Library $(DestSharedLib) + -$(Verb) $(RM) -f $(libdir)/lib$(LIBRARYNAME).* endif @@ -484,38 +619,56 @@ endif #--------------------------------------------------------- ifdef BYTECODE_LIBRARY -ifdef EXPORTED_SYMBOL_LIST - BCLinkLib += -Xlinker -internalize-public-api-list=$(EXPORTED_SYMBOL_LIST) -else - ifdef EXPORTED_SYMBOL_FILE - BCLinkLib += -Xlinker -internalize-public-api-file=$(EXPORTED_SYMBOL_FILE) - else - BCLinkLib += -Xlinker -disable-internalize - endif -endif +# make the C and C++ compilers strip debug info out of bytecode libraries. +BCCompile.C += -Wa,-strip-debug +BCCompile.CXX += -Wa,-strip-debug + +all-local:: $(LibName.BCA) -all-local:: $(LibName.BC) +ifdef EXPORTED_SYMBOL_FILE +BCLinkLib = $(LLVMGCCWITHPATH) -shared -nostdlib -Xlinker \ + -internalize-public-api-file=$(EXPORTED_SYMBOL_FILE) -$(LibName.BC): $(BUILT_SOURCES) $(ObjectsBC) $(LibDir)/.dir - $(Echo) Linking $(Configuration) Bytecode Library $(notdir $@) - $(Verb) $(BCLinkLib) -o $@ $(ObjectsBC) +$(LibName.BCA): $(ObjectsBC) $(LibDir)/.dir $(GCCLD) \ + $(LLVMToolDir)/llvm-ar + $(Echo) Building $(BuildMode) Bytecode Archive $(notdir $@) \ + "(internalize)" + $(Verb) $(BCLinkLib) -o $(ObjDir)/$(LIBRARYNAME).o $(ObjectsBC) + $(Verb) $(RM) -f $@ + $(Verb) $(LArchive) $@ $(ObjDir)/$(LIBRARYNAME).o +else +$(LibName.BCA): $(ObjectsBC) $(LibDir)/.dir \ + $(LLVMToolDir)/llvm-ar + $(Echo) Building $(BuildMode) Bytecode Archive $(notdir $@) + $(Verb) $(RM) -f $@ + $(Verb) $(LArchive) $@ $(ObjectsBC) + +endif clean-local:: -ifneq ($(strip $(LibName.BC)),) - $(Verb) $(RM) -f $(LibName.BC) +ifneq ($(strip $(LibName.BCA)),) + -$(Verb) $(RM) -f $(LibName.BCA) +endif + +ifdef BYTECODE_DESTINATION +BytecodeDestDir := $(BYTECODE_DESTINATION) +else +BytecodeDestDir := $(libdir) endif -DestBytecodeLib = $(bytecode_libdir)/lib$(LIBRARYNAME).bc +DestBytecodeLib = $(BytecodeDestDir)/lib$(LIBRARYNAME).a + +install-bytecode-local:: $(DestBytecodeLib) install-local:: $(DestBytecodeLib) -$(DestBytecodeLib): $(bytecode_libdir) $(LibName.BC) - $(Echo) Installing $(Configuration) Bytecode Library $(DestBytecodeLib) - $(Verb) $(INSTALL) $(LibName.BC) $@ +$(DestBytecodeLib): $(BytecodeDestDir) $(LibName.BCA) + $(Echo) Installing $(BuildMode) Bytecode Archive $(DestBytecodeLib) + $(Verb) $(INSTALL) $(LibName.BCA) $@ uninstall-local:: - $(Echo) Uninstalling $(Configuration) Bytecode Library $(DestBytecodeLib) - $(Verb) $(RM) -f $(DestBytecodeLib) + $(Echo) Uninstalling $(BuildMode) Bytecode Archive $(DestBytecodeLib) + -$(Verb) $(RM) -f $(DestBytecodeLib) endif @@ -528,13 +681,13 @@ ifndef DONT_BUILD_RELINKED all-local:: $(LibName.O) -$(LibName.O): $(BUILT_SOURCES) $(ObjectsO) $(LibDir)/.dir - $(Echo) Linking $(Configuration) Object Library $(notdir $@) +$(LibName.O): $(ObjectsO) $(LibDir)/.dir + $(Echo) Linking $(BuildMode) Object Library $(notdir $@) $(Verb) $(Relink) -o $@ $(ObjectsO) clean-local:: ifneq ($(strip $(LibName.O)),) - $(Verb) $(RM) -f $(LibName.O) + -$(Verb) $(RM) -f $(LibName.O) endif DestRelinkedLib = $(libdir)/$(LIBRARYNAME).o @@ -542,12 +695,12 @@ DestRelinkedLib = $(libdir)/$(LIBRARYNAME).o install-local:: $(DestRelinkedLib) $(DestRelinkedLib): $(libdir) $(LibName.O) - $(Echo) Installing $(Configuration) Object Library $(DestRelinkedLib) + $(Echo) Installing $(BuildMode) Object Library $(DestRelinkedLib) $(Verb) $(LTInstall) $(LibName.O) $(DestRelinkedLib) uninstall-local:: - $(Echo) Uninstalling $(Configuration) Object Library $(DestRelinkedLib) - $(Verb) $(RM) -f $(DestRelinkedLib) + $(Echo) Uninstalling $(BuildMode) Object Library $(DestRelinkedLib) + -$(Verb) $(RM) -f $(DestRelinkedLib) endif @@ -560,15 +713,15 @@ ifdef BUILD_ARCHIVE all-local:: $(LibName.A) -$(LibName.A): $(BUILT_SOURCES) $(ObjectsO) $(LibDir)/.dir - $(Echo) Building $(Configuration) Archive Library $(notdir $@) - $(Verb)$(RM) -f $@ +$(LibName.A): $(ObjectsO) $(LibDir)/.dir + $(Echo) Building $(BuildMode) Archive Library $(notdir $@) + -$(Verb) $(RM) -f $@ $(Verb) $(Archive) $@ $(ObjectsO) $(Verb) $(Ranlib) $@ clean-local:: ifneq ($(strip $(LibName.A)),) - $(Verb) $(RM) -f $(LibName.A) + -$(Verb) $(RM) -f $(LibName.A) endif DestArchiveLib := $(libdir)/lib$(LIBRARYNAME).a @@ -576,13 +729,13 @@ DestArchiveLib := $(libdir)/lib$(LIBRARYNAME).a install-local:: $(DestArchiveLib) $(DestArchiveLib): $(libdir) $(LibName.A) - $(Echo) Installing $(Configuration) Archive Library $(DestArchiveLib) + $(Echo) Installing $(BuildMode) Archive Library $(DestArchiveLib) $(Verb) $(MKDIR) $(libdir) $(Verb) $(LTInstall) $(LibName.A) $(DestArchiveLib) uninstall-local:: - $(Echo) Uninstalling $(Configuration) Archive Library $(DestArchiveLib) - $(Verb) $(RM) -f $(DestArchiveLib) + $(Echo) Uninstalling $(BuildMode) Archive Library $(DestArchiveLib) + -$(Verb) $(RM) -f $(DestArchiveLib) endif @@ -595,10 +748,71 @@ endif ifdef TOOLNAME +#--------------------------------------------------------- +# Handle the special "JIT" value for LLVM_LIBS which is a +# shorthand for a bunch of libraries that get the correct +# JIT support for a tool that runs JIT. +#--------------------------------------------------------- +ifeq ($(LLVMLIBS),JIT) + +# Make sure we can get our own symbols in the tool +Link += -dlopen self + +# Generic JIT libraries +JIT_LIBS := LLVMInterpreter LLVMJIT LLVMCodeGen LLVMExecutionEngine + +# You can enable the X86 JIT on a non-X86 host by setting the flag +# ENABLE_X86_JIT on the make command line. If not, it will still be +# enabled automagically on an X86 host. +ifeq ($(ARCH), x86) + ENABLE_X86_JIT = 1 +endif + +# What the X86 JIT requires +ifdef ENABLE_X86_JIT + JIT_LIBS += LLVMX86 LLVMSelectionDAG +endif + +# You can enable the SparcV9 JIT on a non-SparcV9 host by setting the flag +# ENABLE_SPARCV9_JIT on the make command line. If not, it will still be +# enabled automagically on an SparcV9 host. +ifeq ($(ARCH), Sparc) + ENABLE_SPARCV9_JIT = 1 +endif + +# What the Sparc JIT requires +ifdef ENABLE_SPARCV9_JIT + JIT_LIBS += LLVMSparcV9 LLVMSparcV9ModuloSched LLVMSparcV9InstrSched \ + 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 +# ENABLE_PPC_JIT on the make command line. If not, it will still be +# enabled automagically on an PowerPC host. +ifeq ($(ARCH), PowerPC) + ENABLE_PPC_JIT = 1 +endif + +# What the PowerPC JIT requires +ifdef ENABLE_PPC_JIT + JIT_LIBS += LLVMPowerPC +endif + +LLVMLIBS := $(JIT_LIBS) LLVMScalarOpts LLVMAnalysis.a LLVMTransformUtils.a \ + LLVMBCReader LLVMCore LLVMSupport.a LLVMTarget.a LLVMbzip2 \ + LLVMSystem.a $(PLATFORMLIBDL) +endif + #--------------------------------------------------------- # Set up variables for building a tool. #--------------------------------------------------------- +ifdef EXAMPLE_TOOL +ToolBuildPath := $(ExmplDir)/$(TOOLNAME)$(EXEEXT) +else ToolBuildPath := $(ToolDir)/$(TOOLNAME)$(EXEEXT) +endif ProjLibsOptions := $(patsubst %.a.o, -l%, $(addsuffix .o, $(USEDLIBS))) ProjLibsOptions := $(patsubst %.o, $(LibDir)/%.o, $(ProjLibsOptions)) LLVMLibsOptions := $(patsubst %.a.o, -l%, $(addsuffix .o, $(LLVMLIBS))) @@ -608,17 +822,6 @@ LLVMUsedLibs := $(patsubst %.a.o, lib%.a, $(addsuffix .o, $(LLVMLIBS))) ProjLibsPaths := $(addprefix $(LibDir)/,$(ProjUsedLibs)) LLVMLibsPaths := $(addprefix $(LLVMLibDir)/,$(LLVMUsedLibs)) -#--------------------------------------------------------- -# Handle optional compression libraries automatically -#--------------------------------------------------------- -ExtraLibs := $(LIBS) -ifeq ($(HAVE_BZIP2),1) -ExtraLibs += -lbz2 -endif -ifeq ($(HAVE_ZLIB),1) -ExtraLibs += -lz -endif - #--------------------------------------------------------- # Tell make that we need to rebuild subdirectories before # we can link the tool. This affects things like LLI which @@ -633,27 +836,32 @@ all-local:: $(ToolBuildPath) clean-local:: ifneq ($(strip $(ToolBuildPath)),) - $(Verb) $(RM) -f $(ToolBuildPath) + -$(Verb) $(RM) -f $(ToolBuildPath) +endif + +ifdef EXAMPLE_TOOL +$(ToolBuildPath): $(ExmplDir)/.dir +else +$(ToolBuildPath): $(ToolDir)/.dir endif -$(ToolBuildPath): $(BUILT_SOURCES) $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths)\ - $(ToolDir)/.dir - $(Echo) Linking $(Configuration) executable $(TOOLNAME) $(StripWarnMsg) +$(ToolBuildPath): $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths) + $(Echo) Linking $(BuildMode) executable $(TOOLNAME) $(StripWarnMsg) $(Verb) $(Link) -o $@ $(TOOLLINKOPTS) $(ObjectsO) $(ProjLibsOptions) \ $(LLVMLibsOptions) $(ExtraLibs) $(TOOLLINKOPTSB) - $(Echo) ======= Finished Linking $(Configuration) Executable $(TOOLNAME) $(StripWarnMsg) + $(Echo) ======= Finished Linking $(BuildMode) Executable $(TOOLNAME) $(StripWarnMsg) DestTool = $(bindir)/$(TOOLNAME) install-local:: $(DestTool) $(DestTool): $(bindir) $(ToolBuildPath) - $(Echo) Installing $(Configuration) $(DestTool) + $(Echo) Installing $(BuildMode) $(DestTool) $(Verb) $(INSTALL) $(ToolBuildPath) $(DestTool) uninstall-local:: - $(Echo) Uninstalling $(Configuration) $(DestTool) - $(Verb) $(RM) -f $(DestTool) + $(Echo) Uninstalling $(BuildMode) $(DestTool) + -$(Verb) $(RM) -f $(DestTool) endif @@ -661,11 +869,6 @@ endif # Object Build Rules: Build object files based on sources ############################################################################### -# BUILDMODE - This variable can be used in a rule that generates a file in the -# ObjDir to indicate whether the compiled file is a Debug, Release, or Profile -# object. -BUILDMODE = $(notdir $(patsubst %/,%, $(dir $@))) - # Provide rule sets for when dependency generation is enabled ifndef DISABLE_AUTO_DEPENDENCIES @@ -674,14 +877,14 @@ ifndef DISABLE_AUTO_DEPENDENCIES #--------------------------------------------------------- ifdef SHARED_LIBRARY -$(ObjDir)/%.lo $(ObjDir)/%.o: %.cpp $(ObjDir)/.dir - $(Echo) "Compiling $*.cpp for $(BUILDMODE) build (PIC)" +$(ObjDir)/%.lo $(ObjDir)/%.o: %.cpp $(ObjDir)/.dir $(BUILT_SOURCES) + $(Echo) "Compiling $*.cpp for $(BuildMode) build (PIC)" $(Verb) if $(LTCompile.CXX) -MD -MT $@ -MP -MF $(ObjDir)/$*.LACXXd $< -o $@ ; \ then $(MV) -f "$(ObjDir)/$*.LACXXd" "$(ObjDir)/$*.d"; \ else $(RM) -f "$(ObjDir)/$*.LACXXd"; exit 1; fi -$(ObjDir)/%.lo $(ObjDir)/%.o: %.c $(ObjDir)/.dir - $(Echo) "Compiling $*.c for $(BUILDMODE) build (PIC)" +$(ObjDir)/%.lo $(ObjDir)/%.o: %.c $(ObjDir)/.dir $(BUILT_SOURCES) + $(Echo) "Compiling $*.c for $(BuildMode) build (PIC)" $(Verb) if $(LTCompile.C) -MD -MT $@ -MP -MF $(ObjDir)/$*.LACd $< -o $@ ; \ then $(MV) -f "$(ObjDir)/$*.LACd" "$(ObjDir)/$*.d"; \ else $(RM) -f "$(ObjDir)/$*.LACd"; exit 1; fi @@ -691,14 +894,14 @@ $(ObjDir)/%.lo $(ObjDir)/%.o: %.c $(ObjDir)/.dir #--------------------------------------------------------- else -$(ObjDir)/%.o: %.cpp $(ObjDir)/.dir - $(Echo) "Compiling $*.cpp for $(BUILDMODE) build" +$(ObjDir)/%.o: %.cpp $(ObjDir)/.dir $(BUILT_SOURCES) + $(Echo) "Compiling $*.cpp for $(BuildMode) build" $(Verb) if $(Compile.CXX) -MD -MT $@ -MP -MF $(ObjDir)/$*.CXXd $< -o $@ ; \ then $(MV) -f "$(ObjDir)/$*.CXXd" "$(ObjDir)/$*.d"; \ else $(RM) -f "$(ObjDir)/$*.CXXd"; exit 1; fi -$(ObjDir)/%.o: %.c $(ObjDir)/.dir - $(Echo) "Compiling $*.c for $(BUILDMODE) build" +$(ObjDir)/%.o: %.c $(ObjDir)/.dir $(BUILT_SOURCES) + $(Echo) "Compiling $*.c for $(BuildMode) build" $(Verb) if $(Compile.C) -MD -MT $@ -MP -MF $(ObjDir)/$*.Cd $< -o $@ ; \ then $(MV) -f "$(ObjDir)/$*.Cd" "$(ObjDir)/$*.d"; \ else $(RM) -f "$(ObjDir)/$*.Cd"; exit 1; fi @@ -708,14 +911,14 @@ endif #--------------------------------------------------------- # Create .bc files in the ObjDir directory from .cpp and .c files... #--------------------------------------------------------- -$(ObjDir)/%.bc: %.cpp $(ObjDir)/.dir - $(Echo) "Compiling $*.cpp for $(BUILDMODE) build (bytecode)" +$(ObjDir)/%.bc: %.cpp $(ObjDir)/.dir $(GCCAS) $(BUILT_SOURCES) + $(Echo) "Compiling $*.cpp for $(BuildMode) build (bytecode)" $(Verb) if $(BCCompile.CXX) -MD -MT $@ -MP -MF "$(ObjDir)/$*.BCCXXd" $< -o $@ ; \ then $(MV) -f "$(ObjDir)/$*.BCCXXd" "$(ObjDir)/$*.d"; \ else $(RM) -f "$(ObjDir)/$*.BCCXXd"; exit 1; fi -$(ObjDir)/%.bc: %.c $(ObjDir)/.dir - $(Echo) "Compiling $*.c for $(BUILDMODE) build (bytecode)" +$(ObjDir)/%.bc: %.c $(ObjDir)/.dir $(GCCAS) $(BUILT_SOURCES) + $(Echo) "Compiling $*.c for $(BuildMode) build (bytecode)" $(Verb) if $(BCCompile.C) -MD -MT $@ -MP -MF "$(ObjDir)/$*.BCCd" $< -o $@ ; \ then $(MV) -f "$(ObjDir)/$*.BCCd" "$(ObjDir)/$*.d"; \ else $(RM) -f "$(ObjDir)/$*.BCCd"; exit 1; fi @@ -725,31 +928,31 @@ else ifdef SHARED_LIBRARY -$(ObjDir)/%.lo $(ObjDir)/%.o: %.cpp $(ObjDir)/.dir - $(Echo) "Compiling $*.cpp for $(BUILDMODE) build (PIC)" +$(ObjDir)/%.lo $(ObjDir)/%.o: %.cpp $(ObjDir)/.dir $(BUILT_SOURCES) + $(Echo) "Compiling $*.cpp for $(BuildMode) build (PIC)" $(LTCompile.CXX) $< -o $@ -$(ObjDir)/%.lo $(ObjDir)/%.o: %.c $(ObjDir)/.dir - $(Echo) "Compiling $*.cpp for $(BUILDMODE) build (PIC)" +$(ObjDir)/%.lo $(ObjDir)/%.o: %.c $(ObjDir)/.dir $(BUILT_SOURCES) + $(Echo) "Compiling $*.c for $(BuildMode) build (PIC)" $(LTCompile.C) $< -o $@ else -$(ObjDir)/%.o: %.cpp $(ObjDir)/.dir - $(Echo) "Compiling $*.cpp for $(BUILDMODE) build" +$(ObjDir)/%.o: %.cpp $(ObjDir)/.dir $(BUILT_SOURCES) + $(Echo) "Compiling $*.cpp for $(BuildMode) build" $(Compile.CXX) $< -o $@ -$(ObjDir)/%.o: %.c $(ObjDir)/.dir - $(Echo) "Compiling $*.cpp for $(BUILDMODE) build" +$(ObjDir)/%.o: %.c $(ObjDir)/.dir $(BUILT_SOURCES) + $(Echo) "Compiling $*.c for $(BuildMode) build" $(Compile.C) $< -o $@ endif -$(ObjDir)/%.bc: %.cpp $(ObjDir)/.dir - $(Echo) "Compiling $*.cpp for $(BUILDMODE) build (bytecode)" +$(ObjDir)/%.bc: %.cpp $(ObjDir)/.dir $(GCCAS) $(BUILT_SOURCES) + $(Echo) "Compiling $*.cpp for $(BuildMode) build (bytecode)" $(BCCompile.CXX) $< -o $@ -$(ObjDir)/%.bc: %.c $(ObjDir)/.dir - $(Echo) "Compiling $*.c for $(BUILDMODE) build (bytecode)" +$(ObjDir)/%.bc: %.c $(ObjDir)/.dir $(GCCAS) $(BUILT_SOURCES) + $(Echo) "Compiling $*.c for $(BuildMode) build (bytecode)" $(BCCompile.C) $< -o $@ endif @@ -759,7 +962,7 @@ endif # regardless of dependencies #--------------------------------------------------------- $(ObjDir)/%.bc: %.ll $(ObjDir)/.dir $(LLVMAS) - $(Echo) "Compiling $*.ll for $(BUILDMODE) build" + $(Echo) "Compiling $*.ll for $(BuildMode) build" $(Verb) $(LLVMAS) $< -f -o $@ ############################################################################### @@ -770,51 +973,63 @@ ifdef TARGET TDFiles := $(strip $(wildcard $(BUILD_SRC_DIR)/*.td) $(LLVM_SRC_ROOT)/lib/Target/Target.td) INCFiles := $(filter %.inc,$(BUILT_SOURCES)) - -$(INCFiles) : $(TBLGEN) $(TDFiles) - -%GenRegisterNames.inc : %.td +INCTMPFiles := $(INCFiles:%=$(ObjDir)/%.tmp) +.PRECIOUS: $(INCTMPFiles) $(INCFiles) + +# All of these files depend on tblgen and the .td files. +$(INCTMPFiles) : $(TBLGEN) $(TDFiles) + +# INCFiles rule: All of the tblgen generated files are emitted to +# $(ObjDir)/%.inc.tmp, instead of emitting them directly to %.inc. This allows +# us to only "touch" the real file if the contents of it change. IOW, if +# tblgen is modified, all of the .inc.tmp files are regereated, but no +# dependencies of the .inc files are, unless the contents of the .inc file +# changes. +$(INCFiles) : %.inc : $(ObjDir)/%.inc.tmp + $(Verb) $(CMP) -s $@ $< || $(CP) $< $@ + +$(TARGET:%=$(ObjDir)/%GenRegisterNames.inc.tmp): \ +$(ObjDir)/%GenRegisterNames.inc.tmp : %.td $(ObjDir)/.dir $(Echo) "Building $( $@ +clean-local:: + -$(Verb) $(RM) -f $(LexOutput) + $(Verb) $(RM) -f $(LexOutput) + endif #--------------------------------------------------------- @@ -854,10 +1075,9 @@ endif # from yacc (bison) input sources. #--------------------------------------------------------- -YaccOutput := $(strip $(addprefix $(subst %.y,%,$(filter %.y,$(Sources))),\ - .h .cpp .output)) - -ifneq ($(YaccOutput),) +YaccFiles := $(filter %.y,$(Sources)) +ifneq ($(YaccFiles),) +YaccOutput := $(addprefix $(patsubst %.y,%,$(YaccFiles)),.h .cpp .output) .PRECIOUS: $(YaccOutput) @@ -873,6 +1093,9 @@ ifneq ($(YaccOutput),) $(Verb) $(MV) -f $*.tab.c $*.cpp $(Verb) $(MV) -f $*.tab.h $*.h +clean-local:: + -$(Verb) $(RM) -f $(YaccOutput) + $(Verb) $(RM) -f $(YaccOutput) endif ############################################################################### @@ -898,25 +1121,36 @@ endif # errors or disastrous removal. clean-local:: ifneq ($(strip $(ObjDir)),) - $(Verb) $(RM) -rf $(ObjDir) + -$(Verb) $(RM) -rf $(ObjDir) endif - $(Verb) $(RM) -f core core.[0-9][0-9]* *.o *.d *~ *.flc + -$(Verb) $(RM) -f core core.[0-9][0-9]* *.o *.d *~ *.flc ifneq ($(strip $(SHLIBEXT)),) # Extra paranoia - make real sure SHLIBEXT is set - $(Verb) $(RM) -f *$(SHLIBEXT) -endif -ifneq ($(strip $(LexOutput)),) - $(Verb) $(RM) -f $(LexOutput) -endif -ifneq ($(strip $(YaccOutput)),) - $(Verb) $(RM) -f $(YaccOutput) + -$(Verb) $(RM) -f *$(SHLIBEXT) endif +clean-all-local:: + -$(Verb) $(RM) -rf Debug Release Profile + # Build tags database for Emacs/Xemacs: -tags:: TAGS +tags:: TAGS CTAGS + TAGS: - find include lib tools examples -name '*.cpp' -o -name '*.h' | \ + find $(BUILD_SRC_ROOT)/include $(BUILD_SRC_ROOT)/lib \ + $(BUILD_SRC_ROOT)/tools $(BUILD_SRC_ROOT)/examples \ + $(BUILD_OBJ_ROOT)/include $(BUILD_OBJ_ROOT)/lib \ + $(BUILD_OBJ_ROOT)/tools $(BUILD_OBJ_ROOT)/examples \ + -name '*.cpp' -o -name '*.h' | \ $(ETAGS) $(ETAGSFLAGS) - +CTAGS: + find $(BUILD_SRC_ROOT)/include $(BUILD_SRC_ROOT)/lib \ + $(BUILD_SRC_ROOT)/tools $(BUILD_SRC_ROOT)/examples \ + $(BUILD_OBJ_ROOT)/include $(BUILD_OBJ_ROOT)/lib \ + $(BUILD_OBJ_ROOT)/tools $(BUILD_OBJ_ROOT)/examples \ + \( -name '*.cpp' -o -name '*.h' \) -print | \ + ctags -ImtT -o $(BUILD_OBJ_ROOT)/CTAGS -L - + + ############################################################################### # DEPENDENCIES: Include the dependency files if we should ############################################################################### @@ -927,7 +1161,7 @@ ifneq ($strip($(filter-out clean clean-local dist-clean,$(MAKECMDGOALS))),) # Get the list of dependency files DependFiles := $(basename $(filter %.cpp %.c %.cc, $(Sources))) -DependFiles := $(patsubst %,$(BUILD_OBJ_DIR)/$(Configuration)/%.d,$(DependFiles)) +DependFiles := $(patsubst %,$(BUILD_OBJ_DIR)/$(BuildMode)/%.d,$(DependFiles)) -include /dev/null $(DependFiles) @@ -935,6 +1169,23 @@ endif endif +############################################################################### +# CHECK: Running the test suite +############################################################################### + +check:: + $(Verb) if test -d "$(BUILD_OBJ_ROOT)/test" ; then \ + if test -f "$(BUILD_OBJ_ROOT)/test/Makefile" ; then \ + $(EchoCmd) Running test suite ; \ + $(MAKE) -C $(BUILD_OBJ_ROOT)/test check-local \ + TESTSUITE=$(TESTSUITE) ; \ + else \ + $(EchoCmd) No Makefile in test directory ; \ + fi ; \ + else \ + $(EchoCmd) No test directory ; \ + fi + ############################################################################### # DISTRIBUTION: Handle construction of a distribution tarball ############################################################################### @@ -957,9 +1208,9 @@ DistOther := $(notdir $(wildcard \ $(BUILD_SRC_DIR)/*.def \ $(BUILD_SRC_DIR)/*.ll \ $(BUILD_SRC_DIR)/*.in)) -DistSources := $(Sources) $(EXTRA_DIST) DistSubDirs := $(SubDirs) -DistFiles := $(DistAlways) $(DistSources) $(DistOther) +DistSources = $(Sources) $(EXTRA_DIST) +DistFiles = $(DistAlways) $(DistSources) $(DistOther) #------------------------------------------------------------------------ # We MUST build distribution with OBJ_DIR != SRC_DIR @@ -968,11 +1219,8 @@ ifeq ($(BUILD_SRC_DIR),$(BUILD_OBJ_DIR)) dist dist-check dist-clean dist-gzip dist-bzip2 dist-zip :: $(Echo) ERROR: Target $@ only available with OBJ_DIR != SRC_DIR -DistCheckTop := else -DistCheckTop := check - #------------------------------------------------------------------------ # Prevent catastrophic remove #------------------------------------------------------------------------ @@ -996,19 +1244,21 @@ else dist-gzip:: $(DistTarGZip) -$(DistTarGZip) : distdir +$(DistTarGZip) : $(TopDistDir)/.makedistdir $(Echo) Packing gzipped distribution tar file. - $(Verb) cd $(BUILD_OBJ_ROOT) ; $(TAR) chf - "$(DistName)" | gzip -c > "$(DistTarGZip)" + $(Verb) cd $(BUILD_OBJ_ROOT) ; $(TAR) chf - "$(DistName)" | \ + $(GZIP) -c > "$(DistTarGZip)" dist-bzip2:: $(DistTarBZ2) -$(DistTarBZ2) : distdir +$(DistTarBZ2) : $(TopDistDir)/.makedistdir $(Echo) Packing bzipped distribution tar file. - $(Verb) cd $(BUILD_OBJ_ROOT) ; $(TAR) chf - $(DistName) | $(BZIP2) -c >$(DistTarBZ2) + $(Verb) cd $(BUILD_OBJ_ROOT) ; $(TAR) chf - $(DistName) | \ + $(BZIP2) -c >$(DistTarBZ2) dist-zip:: $(DistZip) -$(DistZip) : distdir +$(DistZip) : $(TopDistDir)/.makedistdir $(Echo) Packing zipped distribution file. $(Verb) rm -f $(DistZip) $(Verb) cd $(BUILD_OBJ_ROOT) ; $(ZIP) -rq $(DistZip) $(DistName) @@ -1018,7 +1268,7 @@ dist :: $(DistTarGZip) $(DistTarBZ2) $(DistZip) DistCheckDir := $(LLVM_OBJ_ROOT)/_distcheckdir -dist-check:: $(DistCheckTop) $(DistTarGZip) +dist-check:: $(DistTarGZip) $(Echo) Checking distribution tar file. $(Verb) if test -d $(DistCheckDir) ; then \ $(RM) -rf $(DistCheckDir) ; \ @@ -1030,7 +1280,8 @@ dist-check:: $(DistCheckTop) $(DistTarGZip) gunzip -c $(DistTarGZip) | $(TAR) xf - && \ cd build && \ ../$(DistName)/configure --prefix="$(DistCheckDir)/install" \ - --srcdir=../$(DistName) --with-llvmgccdir="$(LLVMGCCDIR)" && \ + --srcdir=../$(DistName) && \ + $(MAKE) all && \ $(MAKE) check && \ $(MAKE) install && \ $(MAKE) uninstall && \ @@ -1041,37 +1292,47 @@ dist-check:: $(DistCheckTop) $(DistTarGZip) dist-clean:: $(Echo) Cleaning distribution files - $(Verb) $(RM) -rf $(DistTarGZip) $(DistTarBZ2) $(DistZip) $(DistName) $(DistCheckDir) + -$(Verb) $(RM) -rf $(DistTarGZip) $(DistTarBZ2) $(DistZip) $(DistName) \ + $(DistCheckDir) endif #------------------------------------------------------------------------ # Provide the recursive distdir target for building the distribution directory #------------------------------------------------------------------------ -distdir : $(DistSources) - $(Echo) Building Distribution Directory $(DistDir) +distdir: $(DistDir)/.makedistdir +$(DistDir)/.makedistdir: $(DistSources) $(Verb) if test "$(DistDir)" = "$(TopDistDir)" ; then \ if test -d "$(DistDir)" ; then \ find $(DistDir) -type d ! -perm -200 -exec chmod u+w {} ';' || \ exit 1 ; \ fi ; \ - $(EchoCmd) Removing $(DistDir) ; \ + $(EchoCmd) Removing old $(DistDir) ; \ $(RM) -rf $(DistDir); \ + $(EchoCmd) Making 'all' to verify build ; \ + $(MAKE) all ; \ fi + $(Echo) Building Distribution Directory $(DistDir) $(Verb) $(MKDIR) $(DistDir) $(Verb) srcdirstrip=`echo "$(BUILD_SRC_DIR)" | sed 's|.|.|g'`; \ srcrootstrip=`echo "$(BUILD_SRC_ROOT)" | sed 's|.|.|g'`; \ for file in $(DistFiles) ; do \ case "$$file" in \ - $(BUILD_SRC_DIR)/*) file=`echo "$$file" | sed "s#^$$srcdirstrip/##"`;; \ - $(BUILD_SRC_ROOT)/*) file=`echo "$$file" | sed "s#^$$srcrootstrip/#$(BUILD_OBJ_ROOT)/#"`;; \ + $(BUILD_SRC_DIR)/*) \ + file=`echo "$$file" | sed "s#^$$srcdirstrip/##"` \ + ;; \ + $(BUILD_SRC_ROOT)/*) \ + file=`echo "$$file" | \ + sed "s#^$$srcrootstrip/##"` \ + ;; \ esac; \ - if test -f "$$file" || test -d "$$file" ; then \ + if test -f "$(BUILD_SRC_DIR)/$$file" || \ + test -d "$(BUILD_SRC_DIR)/$$file" ; then \ + from_dir="$(BUILD_SRC_DIR)" ; \ + elif test -f "$$file" || test -d "$$file" ; then \ from_dir=. ; \ - else \ - from_dir=$(BUILD_SRC_DIR); \ - fi; \ - to_dir=`echo "$$file" | sed -e 's#/[^/]*$$##'`; \ + fi ; \ + to_dir=`echo "$$file" | sed -e 's#/[^/]*$$##'` ; \ if test "$$to_dir" != "$$file" && test "$$to_dir" != "."; then \ to_dir="$(DistDir)/$$dir"; \ $(MKDIR) "$$to_dir" ; \ @@ -1085,15 +1346,16 @@ distdir : $(DistSources) if test -d "$$from_dir/$$file"; then \ if test -d "$(BUILD_SRC_DIR)/$$file" && \ test "$$from_dir" != "$(BUILD_SRC_DIR)" ; then \ - cp -pR "$(BUILD_SRC_DIR)/$$file" "$$to_dir" || exit 1; \ + $(CP) -pR "$(BUILD_SRC_DIR)/$$file" "$$to_dir" || exit 1; \ fi; \ - cp -pR $$from_dir/$$file $$to_dir || exit 1; \ + $(CP) -pR $$from_dir/$$file $$to_dir || exit 1; \ elif test -f "$$from_dir/$$file" ; then \ - cp -p "$$from_dir/$$file" "$(DistDir)/$$file" || exit 1; \ + $(CP) -p "$$from_dir/$$file" "$(DistDir)/$$file" || exit 1; \ elif test -L "$$from_dir/$$file" ; then \ - cp -pd "$$from_dir/$$file" $(DistDir)/$$file || exit 1; \ + $(CP) -pd "$$from_dir/$$file" $(DistDir)/$$file || exit 1; \ elif echo "$(DistAlways)" | grep -v "$$file" >/dev/null ; then \ - $(EchoCmd) "===== WARNING: Distribution Source $$from_dir/$$file Not Found!" ; \ + $(EchoCmd) "===== WARNING: Distribution Source " \ + "$$from_dir/$$file Not Found!" ; \ elif test "$(Verb)" != '@' ; then \ $(EchoCmd) "Skipping non-existent $$from_dir/$$file" ; \ fi; \ @@ -1102,15 +1364,21 @@ distdir : $(DistSources) if test "$$subdir" \!= "." ; then \ new_distdir="$(DistDir)/$$subdir" ; \ test -d "$$new_distdir" || $(MKDIR) "$$new_distdir" || exit 1; \ - ( cd $$subdir && $(MAKE) DistDir="$$new_distdir" distdir ) || exit 1; \ + ( cd $$subdir && $(MAKE) DistDir="$$new_distdir" distdir ) || \ + exit 1; \ fi; \ done - $(Verb) $(MAKE) DistDir="$(DistDir)" dist-hook || exit 1 - -$(Verb) find $(DistDir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ - ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(SHELL) $(INSTALL_SH) -c -m a+r {} {} \; \ - || chmod -R a+r $(DistDir) + $(Verb) if test "$(DistDir)" = "$(TopDistDir)" ; then \ + $(EchoCmd) Eliminating CVS directories from distribution ; \ + $(RM) -rf `find $(TopDistDir) -type d -name CVS -print` ;\ + $(MAKE) dist-hook ; \ + $(FIND) $(TopDistDir) -type d ! -perm -777 -exec chmod a+rwx {} \; \ + -o ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; \ + -o ! -type d ! -perm -400 -exec chmod a+r {} \; \ + -o ! -type d ! -perm -444 -exec \ + $(SHELL) $(INSTALL_SH) -c -m a+r {} {} \; \ + || chmod -R a+r $(DistDir) ; \ + fi # This is invoked by distdir target, define it as a no-op to avoid errors if not # defined by user. @@ -1125,7 +1393,7 @@ endif ifeq ($(LEVEL),.) #------------------------------------------------------------------------ -# Install support for project's include files: +# Install support for the project's include files: #------------------------------------------------------------------------ install-local:: $(Echo) Installing include files @@ -1152,7 +1420,7 @@ endif # Print out the directories used for building #------------------------------------------------------------------------ printvars:: - $(Echo) "Configuration : " '$(Configuration)' + $(Echo) "BuildMode : " '$(BuildMode)' $(Echo) "BUILD_SRC_ROOT : " '$(BUILD_SRC_ROOT)' $(Echo) "BUILD_SRC_DIR : " '$(BUILD_SRC_DIR)' $(Echo) "BUILD_OBJ_ROOT : " '$(BUILD_OBJ_ROOT)' @@ -1162,15 +1430,20 @@ printvars:: $(Echo) "libdir : " '$(libdir)' $(Echo) "bindir : " '$(bindir)' $(Echo) "sysconfdir : " '$(sysconfdir)' - $(Echo) "bytecode_libdir: " '$(bytecode_libdir)' $(Echo) "UserTargets : " '$(UserTargets)' $(Echo) "ObjMakefiles : " '$(ObjMakefiles)' $(Echo) "SrcMakefiles : " '$(SrcMakefiles)' $(Echo) "ObjDir : " '$(ObjDir)' $(Echo) "LibDir : " '$(LibDir)' $(Echo) "ToolDir : " '$(ToolDir)' + $(Echo) "ExmplDir : " '$(ExmplDir)' + $(Echo) "Sources : " '$(Sources)' $(Echo) "TDFiles : " '$(TDFiles)' $(Echo) "INCFiles : " '$(INCFiles)' + $(Echo) "INCTMPFiles : " '$(INCTMPFiles)' $(Echo) "Compile.CXX : " '$(Compile.CXX)' $(Echo) "Compile.C : " '$(Compile.C)' $(Echo) "Archive : " '$(Archive)' + $(Echo) "YaccFiles : " '$(YaccFiles)' + $(Echo) "LexFiles : " '$(LexFiles)' + $(Echo) "Module : " '$(Module)'