X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;ds=sidebyside;f=Makefile.rules;h=9152f8edc60327c5c5bc8ff06740b9e2f8a50263;hb=4797826e17d77e2f2aec2695ec3618ca237c463b;hp=81bfc6d2a223dddd8d0c3f450c52ff3ccad25d38;hpb=9b51b6fab2b5e1c0fafd39bdd4626323410b2d8b;p=oota-llvm.git diff --git a/Makefile.rules b/Makefile.rules index 81bfc6d2a22..9152f8edc60 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -1,9 +1,9 @@ #===-- Makefile.common - Common make rules for LLVM -------*- makefile -*--==== # # This file is included by all of the LLVM makefiles. This file defines common -# rules to do things like compile a .cpp file or generate dependancy info. -# These are platform dependant, so this is the file used to specify these -# system dependant operations. +# rules to do things like compile a .cpp file or generate dependency info. +# These are platform dependent, so this is the file used to specify these +# system dependent operations. # # The following functionality can be set by setting incoming variables. # The variable $(LEVEL) *must* be set: @@ -32,9 +32,6 @@ # # 6. LLVM_SRC_ROOT - If specified, points to the top of the LLVM source tree. # -# 7. LLVM_OBJ_ROOT - If specified, points to the top directory where LLVM -# object files are placed. -# # 8. BUILD_SRC_DIR - The directory which contains the current set of Makefiles # and usually the source code too (unless SourceDir is set). # @@ -46,88 +43,14 @@ # placed. # # For building, -# LLVM, LLVM_SRC_ROOT = BUILD_SRC_ROOT, and -# LLVM_OBJ_ROOT = BUILD_OBJ_ROOT. -#===-----------------------------------------------------------------------==== - -# -# Configuration file to set paths specific to local installation of LLVM -# -include $(LEVEL)/Makefile.config - -########################################################################### -# Directory Configuration -# This section of the Makefile determines what is where. To be -# specific, there are several locations that need to be defined: -# -# o LLVM_SRC_ROOT : The root directory of the LLVM source code. -# o LLVM_OBJ_ROOT : The root directory containing the built LLVM code. -# -# o BUILD_SRC_DIR : The directory containing the code to build. -# o BUILD_SRC_ROOT : The root directory of the code to build. -# -# o BUILD_OBJ_DIR : The directory in which compiled code will be placed. -# o BUILD_OBJ_ROOT : The root directory in which compiled code is placed. -# -########################################################################### - -# -# Set the source build directory. That is almost always the current directory. -# -ifndef BUILD_SRC_DIR -BUILD_SRC_DIR = $(shell pwd) -endif - -# -# Set the source root directory. -# -ifndef BUILD_SRC_ROOT -BUILD_SRC_ROOT = $(shell cd $(BUILD_SRC_DIR)/$(LEVEL); pwd) -endif - -# -# Determine the path of the source tree relative from $HOME (the mythical -# home directory). -# -HOME_OBJ_ROOT := $(OBJ_ROOT)$(patsubst $(HOME)%,%,$(BUILD_SRC_ROOT)) - +# LLVM, LLVM_SRC_ROOT = BUILD_SRC_ROOT # -# Set the object build directory. Its location depends upon the source path -# and where object files should go. -# -ifndef BUILD_OBJ_DIR -ifeq ($(OBJ_ROOT),.) -BUILD_OBJ_DIR = $(BUILD_SRC_DIR) -else -BUILD_OBJ_DIR := $(HOME_OBJ_ROOT)$(patsubst $(BUILD_SRC_ROOT)%,%,$(BUILD_SRC_DIR)) -endif -endif - -# -# Set the root of the object directory. -# -ifndef BUILD_OBJ_ROOT -ifeq ($(OBJ_ROOT),.) -BUILD_OBJ_ROOT = $(BUILD_SRC_ROOT) -else -BUILD_OBJ_ROOT := $(HOME_OBJ_ROOT) -endif -endif - -# -# Set the LLVM source directory. -# It is typically the root directory of what we're compiling now. -# -ifndef LLVM_SRC_ROOT -LLVM_SRC_ROOT = $(BUILD_SRC_ROOT) -endif +#===-----------------------------------------------------------------------==== # -# Set the LLVM object directory. +# Set the VPATH so that we can find source files. # -ifndef LLVM_OBJ_ROOT -LLVM_OBJ_ROOT = $(BUILD_OBJ_ROOT) -endif +VPATH=$(SourceDir) ########################################################################### # Default Targets: @@ -140,6 +63,12 @@ ifdef SHARED_LIBRARY all:: dynamic endif +ifdef BYTECODE_LIBRARY +# if BYTECODE_LIBRARY is specified, the default is to build the bytecode lib +all:: bytecodelib +install:: bytecodelib-install +endif + # Default Rule: Make sure it's also a :: rule all :: @@ -149,15 +78,36 @@ install :: # Default rule for test. It ensures everything has a test rule test:: +# Default rule for building only bytecode. +bytecode:: + # Print out the directories used for building prdirs:: - echo "Home Offset : " $(HOME_OBJ_ROOT); - echo "Build Source Root: " $(BUILD_SRC_ROOT); - echo "Build Source Dir : " $(BUILD_SRC_DIR); - echo "Build Object Root: " $(BUILD_OBJ_ROOT); - echo "Build Object Dir : " $(BUILD_OBJ_DIR); - echo "LLVM Source Root: " $(LLVM_SRC_ROOT); - echo "LLVM Object Root: " $(LLVM_OBJ_ROOT); + @echo "Build Source Root: " $(BUILD_SRC_ROOT) + @echo "Build Source Dir : " $(BUILD_SRC_DIR) + @echo "Build Object Root: " $(BUILD_OBJ_ROOT) + @echo "Build Object Dir : " $(BUILD_OBJ_DIR) + @echo "LLVM Source Root: " $(LLVM_SRC_ROOT) + @echo "LLVM Object Root: " $(LLVM_OBJ_ROOT) + +########################################################################### +# Suffixes and implicit rules: +# Empty out the list of suffixes, generate a list that is only +# used by this Makefile, and cancel useless implicit rules. This +# will hopefully speed up compilation a little bit. +########################################################################### +.SUFFIXES: +.SUFFIXES: .c .cpp .h .hpp .y .l +.SUFFIXES: .lo .o .a .so .bc .td +.SUFFIXES: .ps .dot .d + +# +# Mark all of these targets as phony. This will hopefully speed up builds +# slightly since GNU Make will not try to find implicit rules for targets +# which are marked as Phony. +# +.PHONY: all dynamic bytecodelib bytecodelib-install +.PHONY: clean distclean install test bytecode prdirs ########################################################################### # Miscellaneous paths and commands: @@ -175,8 +125,6 @@ prdirs:: BURG_OPTS = -I -PURIFY := $(PURIFY) -cache-dir="$(BUILD_OBJ_ROOT)/../purifycache" -chain-length="30" -messages=all - ifdef ENABLE_PROFILING ENABLE_OPTIMIZED = 1 CONFIGURATION := Profile @@ -196,11 +144,6 @@ ifdef ENABLE_PROFILING PROFILE = -pg endif -# -# Suffixes for library compilation rules -# -.SUFFIXES: .so - ########################################################################### # Library Locations: # These variables describe various library locations: @@ -214,6 +157,7 @@ endif DESTLIBDEBUG := $(BUILD_OBJ_ROOT)/lib/Debug DESTLIBRELEASE := $(BUILD_OBJ_ROOT)/lib/Release DESTLIBPROFILE := $(BUILD_OBJ_ROOT)/lib/Profile +DESTLIBBYTECODE := $(BUILD_OBJ_ROOT)/lib/BytecodeLibs DESTLIBCURRENT := $(BUILD_OBJ_ROOT)/lib/$(CONFIGURATION) # LLVM libraries used for linking @@ -255,10 +199,21 @@ PROJTOOLCURRENT := $(BUILD_OBJ_ROOT)/tools/$(CONFIGURATION) # # Libtool is found in the current directory. # -ifdef VERBOSE -LIBTOOL=$(LLVM_SRC_ROOT)/libtool -else -LIBTOOL=$(LLVM_SRC_ROOT)/libtool --silent +LIBTOOL := $(LLVM_OBJ_ROOT)/mklib + +# +# If we're not building a shared library, use the disable-shared tag with +# libtool. This will disable the building of objects for shared libraries and +# only generate static library objects. +# +# For dynamic libraries, we'll take the performance hit for now, since we +# almost never build them. +# +# This should speed up compilation and require no modifications to future +# versions of libtool. +# +ifndef SHARED_LIBRARY +LIBTOOL += --tag=disable-shared endif # @@ -266,6 +221,7 @@ endif # ifndef VERBOSE VERB := @ +LIBTOOL += --silent endif ########################################################################### @@ -275,14 +231,26 @@ endif ########################################################################### #-------------------------------------------------------------------------- -# Special tools used while building the LLVM tree. Burg is built as part -# of the utils directory. -#-------------------------------------------------------------------------- +# Utilities used while building the LLVM tree, which live in the utils dir +# BURG := $(LLVMTOOLCURRENT)/burg RunBurg := $(BURG) $(BURG_OPTS) - TBLGEN := $(LLVMTOOLCURRENT)/tblgen +#-------------------------------------------------------------------------- +# The LLVM GCC front-end in C and C++ flavors +# +LLVMGCC := PATH=$(LLVMTOOLCURRENT):$(PATH) $(LLVMGCCDIR)/bin/gcc +LCC1 := $(LLVMGCCDIR)/libexec/gcc/$(LLVMGCCARCH)/cc1 +LLVMGXX := PATH=$(LLVMTOOLCURRENT):$(PATH) $(LLVMGCCDIR)/bin/g++ +LCC1XX := $(LLVMGCCDIR)/libexec/gcc/$(LLVMGCCARCH)/cc1plus + +#-------------------------------------------------------------------------- +# Some of the compiled LLVM tools which are used for compilation of runtime +# libraries. +# +LLVMAS := $(LLVMTOOLCURRENT)/llvm-as + ########################################################################### # Compile Time Flags @@ -292,7 +260,17 @@ TBLGEN := $(LLVMTOOLCURRENT)/tblgen # Include both the project headers and the LLVM headers for compilation and # dependency computation. # -CPPFLAGS += -I$(BUILD_SRC_ROOT)/include -I$(LLVM_SRC_ROOT)/include +# BUILD_OBJ_DIR : Files local to the particular object directory +# (locallly generated header files). +# BUILD_SRC_DIR : Files local to the particular source directory. +# BUILD_SRC_ROOT/include : Files global to the project. +# LLVM_OBJ_ROOT/include : config.h files generated by autoconf +# LEVEL/include : config.h files for the project +# LLVM_SRC_ROOT/include : Files global to LLVM. +# +CPPFLAGS += -I$(BUILD_OBJ_DIR) -I$(BUILD_SRC_DIR) -I$(LLVM_OBJ_ROOT)/include \ + -I$(BUILD_SRC_ROOT)/include -I$(LEVEL)/include \ + -I$(LLVM_SRC_ROOT)/include # By default, strip symbol information from executable ifndef KEEP_SYMBOLS @@ -303,27 +281,15 @@ endif # Allow gnu extensions... CPPFLAGS += -D_GNU_SOURCE -# -Wno-unused-parameter -CompileCommonOpts := -Wall -W -Wwrite-strings -Wno-unused -I$(LEVEL)/include -CompileOptimizeOpts := -O3 -DNDEBUG -finline-functions -fshort-enums +CompileWarnings := -Wall -W -Wwrite-strings -Wno-unused +CompileCommonOpts := $(CompileWarnings) -fshort-enums +CompileOptimizeOpts := -O3 -DNDEBUG -finline-functions # # Compile commands with libtool. # Compile := $(LIBTOOL) --mode=compile $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(CompileCommonOpts) -CompileC := $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CCFLAGS) $(CompileCommonOpts) - -# -# Add the LLVM specific "-only-static" option so that we only compile .o files -# once when not building a shared library. -# -# For shared libraries, we will end up building twice, but that doesn't happen -# very often, so we'll let it go. -# -ifndef SHARED_LIBRARY -Compile := $(Compile) -only-static -CompileC := $(CompileC) -only-static -endif +CompileC := $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(CompileCommonOpts) # Compile a cpp file, don't link... CompileG := $(Compile) -g -D_DEBUG @@ -343,11 +309,7 @@ CompileCP := $(CompileC) $(CompileOptimizeOpts) $(PROFILE) # Link final executable # (Note that we always link with the C++ compiler). # -ifdef ENABLE_PURIFY # To enable purify, build with 'gmake ENABLE_PURIFY=1' -Link := $(PURIFY) $(LIBTOOL) --mode=link $(CXX) -static -else Link := $(LIBTOOL) --mode=link $(CXX) -endif # link both projlib and llvmlib libraries LinkG := $(Link) -g -L$(PROJLIBDEBUGSOURCE) -L$(LLVMLIBDEBUGSOURCE) $(STRIP) @@ -355,25 +317,20 @@ LinkO := $(Link) -O3 -L$(PROJLIBRELEASESOURCE) -L$(LLVMLIBRELEASESOURCE) LinkP := $(Link) -O3 -L$(PROJLIBPROFILESOURCE) -L$(LLVMLIBPROFILESOURCE) $(PROFILE) # Create one .o file from a bunch of .o files... -Relink = ${LIBTOOL} --mode=link $(CXX) - -# MakeSO - Create a .so file from a .o files... -#MakeSO := $(LIBTOOL) --mode=link $(CXX) $(MakeSharedObjectOption) -#MakeSOO := $(MakeSO) -O3 -#MakeSOP := $(MakeSOO) $(PROFILE) +Relink := ${LIBTOOL} --mode=link $(CXX) # # Configure where the item being compiled should go. # ifdef SHARED_LIBRARY -Link := $(Link) -rpath $(DESTLIBCURRENT) +Link += -rpath $(DESTLIBCURRENT) endif ifdef TOOLNAME -Link := $(Link) -rpath $(DESTTOOLCURRENT) +Link += -rpath $(DESTTOOLCURRENT) endif -# Create dependancy file from CPP file, send to stdout. +# Create dependency file from CPP file, send to stdout. Depend := $(CXX) -MM -I$(LEVEL)/include $(CPPFLAGS) DependC := $(CC) -MM -I$(LEVEL)/include $(CPPFLAGS) @@ -387,20 +344,34 @@ AR = ${AR_PATH} cq # The local Makefile can list other Source files via ExtraSource = ... # ifndef Source -Source := $(ExtraSource) $(wildcard *.cpp *.c *.y *.l) +Source := $(notdir $(ExtraSource) $(wildcard $(SourceDir)/*.cpp \ + $(SourceDir)/*.c $(SourceDir)/*.y $(SourceDir)/*.l)) endif -Objs := $(sort $(patsubst Debug/%.lo, %.lo, $(addsuffix .lo,$(notdir $(basename $(Source)))))) +# +# Libtool Objects +# +Srcs := $(sort $(basename $(Source))) +Objs := $(addsuffix .lo, $(Srcs)) ObjectsO := $(addprefix $(BUILD_OBJ_DIR)/Release/,$(Objs)) ObjectsP := $(addprefix $(BUILD_OBJ_DIR)/Profile/,$(Objs)) ObjectsG := $(addprefix $(BUILD_OBJ_DIR)/Debug/,$(Objs)) +ObjectsBC := $(addprefix $(BUILD_OBJ_DIR)/BytecodeObj/,$(addsuffix .bc, $(Srcs))) + +# +# The real objects underlying the libtool objects +# +RObjs := $(sort $(patsubst Debug/%.o, %.o, $(addsuffix .o,$(basename $(Source))))) +RObjectsO := $(addprefix $(BUILD_OBJ_DIR)/Release/,$(RObjs)) +RObjectsP := $(addprefix $(BUILD_OBJ_DIR)/Profile/,$(RObjs)) +RObjectsG := $(addprefix $(BUILD_OBJ_DIR)/Debug/,$(RObjs)) #--------------------------------------------------------- # Handle the DIRS and PARALLEL_DIRS options #--------------------------------------------------------- ifdef DIRS -all install clean test :: +all install clean test bytecode :: $(VERB) for dir in ${DIRS}; do \ (cd $$dir; $(MAKE) $@) || exit 1; \ done @@ -408,18 +379,19 @@ endif # Handle PARALLEL_DIRS ifdef PARALLEL_DIRS -all :: $(addsuffix /.makeall , $(PARALLEL_DIRS)) -install :: $(addsuffix /.makeinstall, $(PARALLEL_DIRS)) -clean :: $(addsuffix /.makeclean , $(PARALLEL_DIRS)) -test :: $(addsuffix /.maketest , $(PARALLEL_DIRS)) +all :: $(addsuffix /.makeall , $(PARALLEL_DIRS)) +install :: $(addsuffix /.makeinstall , $(PARALLEL_DIRS)) +clean :: $(addsuffix /.makeclean , $(PARALLEL_DIRS)) +test :: $(addsuffix /.maketest , $(PARALLEL_DIRS)) +bytecode :: $(addsuffix /.makebytecode, $(PARALLEL_DIRS)) -%/.makeall %/.makeinstall %/.makeclean %/.maketest: +%/.makeall %/.makeinstall %/.makeclean %/.maketest %/.makebytecode: $(VERB) cd $(@D); $(MAKE) $(subst $(@D)/.make,,$@) endif # Handle directories that may or may not exist ifdef OPTIONAL_DIRS -all install clean test :: +all install clean test bytecode :: $(VERB) for dir in ${OPTIONAL_DIRS}; do \ if [ -d $$dir ]; \ then\ @@ -463,6 +435,7 @@ LIBNAME_AG := $(DESTLIBDEBUG)/lib$(LIBRARYNAME).a LIBNAME_OBJO := $(DESTLIBRELEASE)/$(LIBRARYNAME).o LIBNAME_OBJP := $(DESTLIBPROFILE)/$(LIBRARYNAME).o LIBNAME_OBJG := $(DESTLIBDEBUG)/$(LIBRARYNAME).o +LIBNAME_BC := $(DESTLIBBYTECODE)/lib$(LIBRARYNAME).bc #-------------------------------------------------------------------- # Library Targets @@ -471,6 +444,12 @@ LIBNAME_OBJG := $(DESTLIBDEBUG)/$(LIBRARYNAME).o # dynamic target builds a shared object version of the library... dynamic:: $(DESTLIBCURRENT)/lib$(LIBRARYNAME).so +bytecodelib:: $(LIBNAME_BC) +bytecodelib-install:: $(LLVMGCCDIR)/bytecode-libs/lib$(LIBRARYNAME).bc + +$(LLVMGCCDIR)/bytecode-libs/lib$(LIBRARYNAME).bc: $(LIBNAME_BC) + @echo ======= Installing $(LIBRARYNAME) bytecode library ======= + cp $< $@ # Does the library want a .o version built? ifndef DONT_BUILD_RELINKED @@ -486,23 +465,39 @@ endif # Rules for building libraries #-------------------------------------------------------------------- +LinkBCLib := $(LLVMGCC) -shared +ifdef EXPORTED_SYMBOL_LIST +LinkBCLib += -Xlinker -internalize-public-api-list=$(EXPORTED_SYMBOL_LIST) +else + ifdef EXPORTED_SYMBOL_FILE +LinkBCLib += -Xlinker -internalize-public-api-file=$(EXPORTED_SYMBOL_FILE) + else +LinkBCLib += -Xlinker -disable-internalize + endif +endif + + +# Rule for building bytecode libraries. +$(LIBNAME_BC): $(ObjectsBC) $(LibSubDirs) $(DESTLIBBYTECODE)/.dir + @echo ======= Linking $(LIBRARYNAME) bytecode library ======= + $(VERB) $(LinkBCLib) -o $@ $(ObjectsBC) $(LibSubDirs) $(LibLinkOpts) # # Rules for building dynamically linked libraries. # $(LIBNAME_O): $(ObjectsO) $(LibSubDirs) $(DESTLIBRELEASE)/.dir @echo ======= Linking $(LIBRARYNAME) dynamic release library ======= - $(VERB) $(Link) -o $*.la $(ObjectsO) $(LibSubDirs) $(LibLinkOpts); - $(VERB) $(LIBTOOL) --mode=install $(INSTALL) $*.la $(DESTLIBCURRENT); + $(VERB) $(Link) -o $*.la $(ObjectsO) $(LibSubDirs) $(LibLinkOpts) + $(VERB) $(LIBTOOL) --mode=install $(INSTALL) $*.la $(DESTLIBCURRENT) $(LIBNAME_P): $(ObjectsP) $(LibSubDirs) $(DESTLIBPROFILE)/.dir @echo ======= Linking $(LIBRARYNAME) dynamic profile library ======= - $(VERB) $(Link) -o $*.la $(ObjectsP) $(LibSubDirs) $(LibLinkOpts); - $(VERB) $(LIBTOOL) --mode=install $(INSTALL) $*.la $(DESTLIBCURRENT); + $(VERB) $(Link) -o $*.la $(ObjectsP) $(LibSubDirs) $(LibLinkOpts) + $(VERB) $(LIBTOOL) --mode=install $(INSTALL) $*.la $(DESTLIBCURRENT) $(LIBNAME_G): $(ObjectsG) $(LibSubDirs) $(DESTLIBDEBUG)/.dir @echo ======= Linking $(LIBRARYNAME) dynamic debug library ======= - $(VERB) $(Link) -o $*.la $(ObjectsG) $(LibSubDirs) $(LibLinkOpts); - $(VERB) $(LIBTOOL) --mode=install $(INSTALL) $*.la $(DESTLIBCURRENT); + $(VERB) $(Link) -o $*.la $(ObjectsG) $(LibSubDirs) $(LibLinkOpts) + $(VERB) $(LIBTOOL) --mode=install $(INSTALL) $*.la $(DESTLIBCURRENT) # # Rules for building static archive libraries. @@ -522,20 +517,32 @@ $(LIBNAME_AG): $(ObjectsG) $(LibSubDirs) $(DESTLIBDEBUG)/.dir @$(RM) -f $@ $(VERB) $(Link) -g $(STRIP) -o $@ $(ObjectsG) $(LibSubDirs) -static + # # Rules for building .o libraries. # +# JTC: +# Note that for this special case, we specify the actual object files +# instead of their libtool counterparts. This is because libtool +# doesn't want to generate a reloadable object file unless it is given +# .o files explicitly. +# +# Note that we're making an assumption here: If we build a .lo file, +# it's corresponding .o file will be placed in the same directory. +# +# I think that is safe. +# $(LIBNAME_OBJO): $(ObjectsO) $(LibSubDirs) $(DESTLIBRELEASE)/.dir @echo "Linking $@" - $(VERB) $(Relink) -o $@ $(ObjectsO) $(LibSubDirs) + $(VERB) $(Relink) -o $@ $(RObjectsO) $(LibSubDirs) $(LIBNAME_OBJP): $(ObjectsP) $(LibSubDirs) $(DESTLIBPROFILE)/.dir @echo "Linking $@" - $(VERB) $(Relink) -o $@ $(ObjectsP) $(LibSubDirs) + $(VERB) $(Relink) -o $@ $(RObjectsP) $(LibSubDirs) $(LIBNAME_OBJG): $(ObjectsG) $(LibSubDirs) $(DESTLIBDEBUG)/.dir @echo "Linking $@" - $(VERB) $(Relink) -o $@ $(ObjectsG) $(LibSubDirs) + $(VERB) $(Relink) -o $@ $(RObjectsG) $(LibSubDirs) endif @@ -543,10 +550,12 @@ endif # Create a TAGS database for emacs #------------------------------------------------------------------------ -ifdef ETAGS +ifneq ($(ETAGS),false) ifeq ($(LEVEL), .) +SRCDIRS := $(wildcard $(SourceDir)/include $(SourceDir)/lib $(SourceDir)/tools) + tags: - $(ETAGS) -l c++ `find include lib tools -name '*.cpp' -o -name '*.h'` + $(ETAGS) -l c++ `find $(SRCDIRS) -name '*.cpp' -o -name '*.h'` all:: tags endif else @@ -588,13 +597,12 @@ LIB_OPTS_P := $(LLVM_LIBS_OPTIONS_P) $(PROJ_LIBS_OPTIONS_P) # USED_LIB_PATHS - Compute the path of the libraries used so that tools are # rebuilt if libraries change. This has to make sure to handle .a/.so and .o -# files seperately. +# files separately. # STATICUSEDLIBS := $(patsubst %.a.o, lib%.a, $(addsuffix .o, $(USEDLIBS))) USED_LIB_PATHS_G := $(addprefix $(DESTLIBDEBUG)/, $(STATICUSEDLIBS)) USED_LIB_PATHS_O := $(addprefix $(DESTLIBRELEASE)/, $(STATICUSEDLIBS)) USED_LIB_PATHS_P := $(addprefix $(DESTLIBPROFILE)/, $(STATICUSEDLIBS)) -#LINK_OPTS := $(TOOLLINKOPTS) $(PLATFORMLINKOPTS) # # Libtool link options: @@ -634,79 +642,46 @@ endif #--------------------------------------------------------- -.PRECIOUS: $(BUILD_OBJ_DIR)/Depend/.dir +.PRECIOUS: $(BUILD_OBJ_DIR)/Depend/.dir $(BUILD_OBJ_DIR)/BytecodeObj/.dir .PRECIOUS: $(BUILD_OBJ_DIR)/Debug/.dir $(BUILD_OBJ_DIR)/Release/.dir -# Create .o files in the ObjectFiles directory from the .cpp and .c files... -#$(BUILD_OBJ_DIR)/Release/%.o: $(SourceDir)%.cpp $(BUILD_OBJ_DIR)/Release/.dir - #@echo "Compiling $<" - #$(VERB) $(CompileO) $< -o $@ - -#$(BUILD_OBJ_DIR)/Release/%.o: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Release/.dir - #$(VERB) $(CompileCO) $< -o $@ - -#$(BUILD_OBJ_DIR)/Profile/%.o: $(SourceDir)%.cpp $(BUILD_OBJ_DIR)/Profile/.dir - #@echo "Compiling $<" - #$(VERB) $(CompileP) $< -o $@ - -#$(BUILD_OBJ_DIR)/Profile/%.o: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Profile/.dir - #@echo "Compiling $<" - #$(VERB) $(CompileCP) $< -o $@ - -#$(BUILD_OBJ_DIR)/Debug/%.o: $(SourceDir)%.cpp $(BUILD_OBJ_DIR)/Debug/.dir - #@echo "Compiling $<" - #$(VERB) $(CompileG) $< -o $@ - -#$(BUILD_OBJ_DIR)/Debug/%.o: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Debug/.dir - #$(VERB) $(CompileCG) $< -o $@ - # Create .lo files in the ObjectFiles directory from the .cpp and .c files... -$(BUILD_OBJ_DIR)/Release/%.lo: $(SourceDir)%.cpp $(BUILD_OBJ_DIR)/Release/.dir +$(BUILD_OBJ_DIR)/Release/%.lo: %.cpp $(BUILD_OBJ_DIR)/Release/.dir @echo "Compiling $<" $(VERB) $(CompileO) $< -o $@ -$(BUILD_OBJ_DIR)/Release/%.lo: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Release/.dir +$(BUILD_OBJ_DIR)/Release/%.lo: %.c $(BUILD_OBJ_DIR)/Release/.dir @echo "Compiling $<" $(VERB) $(CompileCO) $< -o $@ -$(BUILD_OBJ_DIR)/Profile/%.lo: $(SourceDir)%.cpp $(BUILD_OBJ_DIR)/Profile/.dir +$(BUILD_OBJ_DIR)/Profile/%.lo: %.cpp $(BUILD_OBJ_DIR)/Profile/.dir @echo "Compiling $<" $(VERB) $(CompileP) $< -o $@ -$(BUILD_OBJ_DIR)/Profile/%.lo: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Profile/.dir +$(BUILD_OBJ_DIR)/Profile/%.lo: %.c $(BUILD_OBJ_DIR)/Profile/.dir @echo "Compiling $<" $(VERB) $(CompileCP) $< -o $@ -$(BUILD_OBJ_DIR)/Debug/%.lo: $(SourceDir)%.cpp $(BUILD_OBJ_DIR)/Debug/.dir +$(BUILD_OBJ_DIR)/Debug/%.lo: %.cpp $(BUILD_OBJ_DIR)/Debug/.dir @echo "Compiling $<" $(VERB) $(CompileG) $< -o $@ -$(BUILD_OBJ_DIR)/Debug/%.lo: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Debug/.dir +$(BUILD_OBJ_DIR)/Debug/%.lo: %.c $(BUILD_OBJ_DIR)/Debug/.dir @echo "Compiling $<" $(VERB) $(CompileCG) $< -o $@ -# Create .lo files in the ObjectFiles directory from the .cpp and .c files... -$(BUILD_OBJ_DIR)/Release/%.lo: $(SourceDir)%.cpp $(BUILD_OBJ_DIR)/Release/.dir - @echo "Compiling $<" - $(VERB) $(CompileO) $< -o $@ +$(BUILD_OBJ_DIR)/BytecodeObj/%.bc: %.cpp $(BUILD_OBJ_DIR)/BytecodeObj/.dir $(LCC1XX) + @echo "Compiling $< to bytecode" + $(VERB) $(LLVMGXX) $(CompileWarnings) $(CPPFLAGS) -c $< -o $@ -$(BUILD_OBJ_DIR)/Release/%.lo: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Release/.dir - $(VERB) $(CompileCO) $< -o $@ +$(BUILD_OBJ_DIR)/BytecodeObj/%.bc: %.c $(BUILD_OBJ_DIR)/BytecodeObj/.dir $(LCC1) + @echo "Compiling $< to bytecode" + $(VERB) $(LLVMGCC) $(CompileWarnings) $(CPPFLAGS) -c $< -o $@ -$(BUILD_OBJ_DIR)/Profile/%.lo: $(SourceDir)%.cpp $(BUILD_OBJ_DIR)/Profile/.dir - @echo "Compiling $<" - $(VERB) $(CompileP) $< -o $@ +$(BUILD_OBJ_DIR)/BytecodeObj/%.bc: %.ll $(BUILD_OBJ_DIR)/BytecodeObj/.dir $(LLVMAS) + @echo "Compiling $< to bytecode" + $(VERB) $(LLVMAS) $< -f -o $@ -$(BUILD_OBJ_DIR)/Profile/%.lo: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Profile/.dir - @echo "Compiling $<" - $(VERB) $(CompileCP) $< -o $@ - -$(BUILD_OBJ_DIR)/Debug/%.lo: $(SourceDir)%.cpp $(BUILD_OBJ_DIR)/Debug/.dir - @echo "Compiling $<" - $(VERB) $(CompileG) $< -o $@ - -$(BUILD_OBJ_DIR)/Debug/%.lo: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Debug/.dir - $(VERB) $(CompileCG) $< -o $@ # # Rules for building lex/yacc files @@ -723,22 +698,30 @@ YACC_OUTPUT = $(addprefix $(YACC_FILES:%.y=%), .h .cpp .output) # The last line is a gross hack to work around flex aparently not being able to # resize the buffer on a large token input. Currently, for uninitialized string # buffers in LLVM we can generate very long tokens, so this is a hack around it. -# FIXME. (f.e. char Buffer[10000]; ) +# FIXME. (f.e. char Buffer[10000] ) # %.cpp: %.l - $(FLEX) -t $< | $(SED) '/^find_rule/d' | \ - $(SED) 's/void yyunput/inline void yyunput/' | \ + @echo Flexing $< + $(VERB) $(FLEX) -t $< | \ + $(SED) '/^find_rule/d' | \ + $(SED) 's/void yyunput/inline void yyunput/' | \ $(SED) 's/void \*yy_flex_realloc/inline void *yy_flex_realloc/' | \ - $(SED) 's/#define YY_BUF_SIZE 16384/#define YY_BUF_SIZE (16384*64)/' > $@ + $(SED) 's/#define YY_BUF_SIZE 16384/#define YY_BUF_SIZE (16384*64)/' \ + > $@.tmp + $(VERB) cmp -s $@ $@.tmp > /dev/null || ${MV} -f $@.tmp $@ + @# remove the output of flex if it didn't get moved over... + @rm -f $@.tmp # Rule for building the bison parsers... %.c: %.y # Cancel built-in rules for yacc %.h: %.y # Cancel built-in rules for yacc %.cpp %.h : %.y - @echo Bison\'ing $<... - $(VERB) $(BISON) -v -d -p $(<:%Parser.y=%) $*.y - $(VERB) ${MV} -f $*.tab.c $*.cpp - $(VERB) ${MV} -f $*.tab.h $*.h + @echo Bisoning $< + $(VERB) $(BISON) -v -d -p $( /dev/null || ${MV} -f $*.tab.c $*.cpp + $(VERB) cmp -s $*.tab.h $*.h > /dev/null || ${MV} -f $*.tab.h $*.h + @# If the files were not updated, don't leave them lying around... + @rm -f $*.tab.c $*.tab.h # To create the directories... %/.dir: @@ -746,7 +729,7 @@ YACC_OUTPUT = $(addprefix $(YACC_FILES:%.y=%), .h .cpp .output) @$(DATE) > $@ # To create postscript files from dot files... -ifdef DOT +ifneq ($(DOT),false) %.ps: %.dot ${DOT} -Tps < $< > $@ else @@ -754,45 +737,41 @@ else ${ECHO} "Cannot build $@: The program dot is not installed" endif +# +# This rules ensures that header files that are removed still have a rule for +# which they can be "generated." This allows make to ignore them and +# reproduce the dependency lists. +# +%.h:: ; + # 'make clean' nukes the tree clean:: - $(VERB) $(RM) -rf $(BUILD_OBJ_DIR)/Debug $(BUILD_OBJ_DIR)/Release $(BUILD_OBJ_DIR)/Profile $(BUILD_OBJ_DIR)/Depend + $(VERB) $(RM) -rf $(BUILD_OBJ_DIR)/Debug $(BUILD_OBJ_DIR)/Release + $(VERB) $(RM) -rf $(BUILD_OBJ_DIR)/Profile $(BUILD_OBJ_DIR)/Depend + $(VERB) $(RM) -rf $(BUILD_OBJ_DIR)/BytecodeObj $(VERB) $(RM) -f core core.[0-9][0-9]* *.o *.d *.so *~ *.flc $(VERB) $(RM) -f $(LEX_OUTPUT) $(YACC_OUTPUT) -distclean:: clean - $(VERB) (cd $(LLVM_SRC_ROOT); $(RM) -rf $(LEVEL)/Makefile.config \ - $(LEVEL)/include/Config/config.h \ - $(LEVEL)/autom4te.cache \ - $(LEVEL)/config.log) - ########################################################################### # C/C++ Dependencies # Define variables and rules that generate header file dependencies # from C/C++ source files. ########################################################################### +ifndef DISABLE_AUTO_DEPENDENCIES + # If dependencies were generated for the file that included this file, -# include the dependancies now... +# include the dependencies now... # -SourceBaseNames := $(basename $(notdir $(filter-out Debug/%, $(Source)))) +SourceBaseNames := $(basename $(Source)) SourceDepend := $(SourceBaseNames:%=$(BUILD_OBJ_DIR)/Depend/%.d) -# -# Depend target: -# This allows a user to manually ask for an update in the dependencies -# -depend: $(SourceDepend) - - # Create dependencies for the *.cpp files... -#$(SourceDepend): \x -$(BUILD_OBJ_DIR)/Depend/%.d: $(SourceDir)%.cpp $(BUILD_OBJ_DIR)/Depend/.dir +$(BUILD_OBJ_DIR)/Depend/%.d: %.cpp $(BUILD_OBJ_DIR)/Depend/.dir $(VERB) $(Depend) $< | $(SED) 's|\.o|\.lo|' | $(SED) 's|$*\.lo *|$(BUILD_OBJ_DIR)/Release/& $(BUILD_OBJ_DIR)/Profile/& $(BUILD_OBJ_DIR)/Debug/& $(BUILD_OBJ_DIR)/Depend/$(@F)|g' > $@ # Create dependencies for the *.c files... -#$(SourceDepend): \x -$(BUILD_OBJ_DIR)/Depend/%.d: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Depend/.dir +$(BUILD_OBJ_DIR)/Depend/%.d: %.c $(BUILD_OBJ_DIR)/Depend/.dir $(VERB) $(DependC) -o $@ $< | $(SED) 's|\.o|\.lo|' | $(SED) 's|$*\.lo *|$(BUILD_OBJ_DIR)/Release/& $(BUILD_OBJ_DIR)/Profile/& $(BUILD_OBJ_DIR)/Debug/& $(BUILD_OBJ_DIR)/Depend/$(@F)|g' > $@ # @@ -800,7 +779,9 @@ $(BUILD_OBJ_DIR)/Depend/%.d: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Depend/.dir # are cleaning (this example taken from the GNU Make Manual). # ifneq ($(MAKECMDGOALS),clean) -ifneq ($(SourceDepend),) --include $(SourceDepend) +ifneq ($(MAKECMDGOALS),distclean) +-include /dev/null $(SourceDepend) endif endif + +endif # ifndef DISABLE_AUTO_DEPENDENCIES