X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=Makefile.common;h=eb33df935263263e1442ec2f583f74b9454e25b0;hb=1d1e5b598e760a8fefb1e484cbd052ab73076c59;hp=e3599bb9d0cf97fe0f5783985f6cb371eb85cc94;hpb=1eeac6612b3e8b09b6baf0688f9121d7f8ffefd8;p=oota-llvm.git diff --git a/Makefile.common b/Makefile.common index e3599bb9d0c..eb33df93526 100644 --- a/Makefile.common +++ b/Makefile.common @@ -142,10 +142,10 @@ endif # By default, strip symbol information from executable ifdef KEEP_SYMBOLS STRIP = -WARN_MSG = +STRIP_WARN_MSG = else -STRIP = -s -WARN_MSG = "(without symbols) " +STRIP = $(PLATFORMSTRIPOPTS) +STRIP_WARN_MSG = "(without symbols) " endif # Allow gnu extensions... @@ -153,18 +153,19 @@ CPPFLAGS += -D_GNU_SOURCE # -Wno-unused-parameter CompileCommonOpts := -Wall -W -Wwrite-strings -Wno-unused -I$(LEVEL)/include +CompileOptimizeOpts := -O3 -DNDEBUG -finline-functions -fshort-enums # Compile a cpp file, don't link... Compile := $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(CompileCommonOpts) CompileG := $(Compile) -g -D_DEBUG -CompileO := $(Compile) -O3 -DNDEBUG -finline-functions -felide-constructors -fshort-enums ## DISABLE -freg-struct-return because of gcc3.2 bug -CompileP := $(CompileO) $(PROFILE) +CompileO := $(Compile) $(CompileOptimizeOpts) -felide-constructors -fomit-frame-pointer +CompileP := $(Compile) $(CompileOptimizeOpts) -felide-constructors $(PROFILE) # Compile a c file, don't link... CompileC := $(CC) -c $(CPPFLAGS) $(CCFLAGS) $(CompileCommonOpts) CompileCG := $(CompileC) -g -D_DEBUG -CompileCO := $(CompileC) -O3 -DNDEBUG -finline-functions -felide-constructors -fshort-enums ## DISABLE -freg-struct-return because of gcc3.2 bug -CompileCP := $(CompileCO) $(PROFILE) +CompileCO := $(CompileC) $(CompileOptimizeOpts) -felide-constructors -fomit-frame-pointer +CompileCP := $(CompileC) $(CompileOptimizeOpts) -felide-constructors $(PROFILE) # Link final executable @@ -174,9 +175,9 @@ Link := $(PURIFY) $(CXX) -static else Link := $(CXX) endif -LinkG := $(Link) -g -L $(LIBDEBUG) $(STRIP) -LinkO := $(Link) -O3 -L $(LIBRELEASE) -LinkP := $(Link) -O3 -L $(LIBPROFILE) $(PROFILE) +LinkG := $(Link) -g -L$(LIBDEBUG) $(STRIP) +LinkO := $(Link) -O3 -L$(LIBRELEASE) +LinkP := $(Link) -O3 -L$(LIBPROFILE) $(PROFILE) # Create one .o file from a bunch of .o files... Relink = ld -r @@ -215,7 +216,7 @@ ObjectsG := $(addprefix $(BUILD_ROOT)/Debug/,$(Objs)) #--------------------------------------------------------- ifdef DIRS -all install clean :: +all install clean test :: $(VERB) for dir in ${DIRS}; do \ (cd $$dir; $(MAKE) $@) || exit 1; \ done @@ -226,10 +227,10 @@ ifdef PARALLEL_DIRS all :: $(addsuffix /.makeall , $(PARALLEL_DIRS)) install :: $(addsuffix /.makeinstall, $(PARALLEL_DIRS)) clean :: $(addsuffix /.makeclean , $(PARALLEL_DIRS)) +test :: $(addsuffix /.maketest , $(PARALLEL_DIRS)) -%/.makeall %/.makeinstall %/.makeclean: +%/.makeall %/.makeinstall %/.makeclean %/.maketest: $(VERB) cd $(@D); $(MAKE) $(subst $(@D)/.make,,$@) - endif #--------------------------------------------------------- @@ -393,22 +394,29 @@ STATICUSEDLIBS := $(patsubst %.a.o, lib%.a, $(addsuffix .o, $(USEDLIBS))) USED_LIB_PATHS_G := $(addprefix $(LIBDEBUG)/, $(STATICUSEDLIBS)) USED_LIB_PATHS_O := $(addprefix $(LIBRELEASE)/, $(STATICUSEDLIBS)) USED_LIB_PATHS_P := $(addprefix $(LIBPROFILE)/, $(STATICUSEDLIBS)) +LINK_OPTS := $(TOOLLINKOPTS) $(PLATFORMLINKOPTS) + + +# Tell make that we need to rebuild subdirectories before we can link the tool. +# This affects things like LLI which has library subdirectories. +$(USED_LIB_PATHS_G) $(USED_LIB_PATHS_O) $(USED_LIB_PATHS_P): \ + $(addsuffix /.makeall, $(PARALLEL_DIRS)) all:: $(TOOLEXENAMES) clean:: $(VERB) rm -f $(TOOLEXENAMES) -$(TOOLEXENAME_G): $(ObjectsG) $(USED_LIB_PATHS_G) $(BUILD_ROOT_TOP)/tools/Debug/.dir - @echo ======= Linking $(TOOLNAME) debug executable $(WARN_MSG) ======= - $(VERB) $(LinkG) -o $@ $(ObjectsG) $(USED_LIBS_OPTIONS_G) $(TOOLLINKOPTS) +$(TOOLEXENAME_G): $(ObjectsG) $(USED_LIB_PATHS_G) $(TOOLDEBUG)/.dir + @echo ======= Linking $(TOOLNAME) debug executable $(STRIP_WARN_MSG) ======= + $(VERB) $(LinkG) -o $@ $(ObjectsG) $(USED_LIBS_OPTIONS_G) $(LINK_OPTS) -$(TOOLEXENAME_O): $(ObjectsO) $(USED_LIB_PATHS_O) $(BUILD_ROOT_TOP)/tools/Release/.dir +$(TOOLEXENAME_O): $(ObjectsO) $(USED_LIB_PATHS_O) $(TOOLRELEASE)/.dir @echo ======= Linking $(TOOLNAME) release executable ======= - $(VERB) $(LinkO) -o $@ $(ObjectsG) $(USED_LIBS_OPTIONS_O) $(TOOLLINKOPTS) + $(VERB) $(LinkO) -o $@ $(ObjectsO) $(USED_LIBS_OPTIONS_O) $(LINK_OPTS) -$(TOOLEXENAME_P): $(ObjectsP) $(USED_LIB_PATHS_P) $(BUILD_ROOT_TOP)/tools/Profile/.dir +$(TOOLEXENAME_P): $(ObjectsP) $(USED_LIB_PATHS_P) $(TOOLPROFILE)/.dir @echo ======= Linking $(TOOLNAME) profile executable ======= - $(VERB) $(LinkP) -o $@ $(ObjectsP) $(USED_LIBS_OPTIONS_P) $(TOOLLINKOPTS) + $(VERB) $(LinkP) -o $@ $(ObjectsP) $(USED_LIBS_OPTIONS_P) $(LINK_OPTS) endif @@ -449,32 +457,55 @@ $(BUILD_ROOT)/Debug/%.o: %.cpp $(BUILD_ROOT)/Debug/.dir $(BUILD_ROOT)/Debug/%.o: %.c $(BUILD_ROOT)/Debug/.dir $(VERB) $(CompileCG) $< -o $@ +# +# Rules for building lex/yacc files +# +LEX_FILES = $(filter %.l, $(Source)) +LEX_OUTPUT = $(LEX_FILES:%.l=%.cpp) +YACC_FILES = $(filter %.y, $(Source)) +YACC_OUTPUT = $(addprefix $(YACC_FILES:%.y=%), .h .cpp .output) +.PRECIOUS: $(LEX_OUTPUT) $(YACC_OUTPUT) + # Create a .cpp source file from a flex input file... this uses sed to cut down # on the warnings emited by GCC... +# +# 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]; ) +# %.cpp: %.l - flex -t $< | sed '/^find_rule/d' | sed 's/void yyunput/inline void yyunput/' | sed 's/void \*yy_flex_realloc/inline void *yy_flex_realloc/' > $@ + 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)/' > $@ # Rule for building the bison parsers... %.cpp %.h : %.y - $(VERB) $(BISON) -v -d -p $(<:%Parser.y=%) $(basename $@).y - $(VERB) mv -f $(basename $@).tab.c $(basename $@).cpp - $(VERB) mv -f $(basename $@).tab.h $(basename $@).h + $(VERB) $(BISON) -v -d -p $(<:%Parser.y=%) $*.y + $(VERB) mv -f $*.tab.c $*.cpp + $(VERB) mv -f $*.tab.h $*.h # To create the directories... %/.dir: - $(VERB) mkdir -p $(@D) + $(VERB) mkdir -p $* @date > $@ +# To create postscript files from dot files... +%.ps: %.dot + dot -Tps < $< > $@ + # 'make clean' nukes the tree clean:: $(VERB) rm -rf $(BUILD_ROOT)/Debug $(BUILD_ROOT)/Release $(BUILD_ROOT)/Profile $(BUILD_ROOT)/Depend - $(VERB) rm -f core *.o *.d *.so *~ *.flc + $(VERB) rm -f core core.[0-9][0-9]* *.o *.d *.so *~ *.flc + $(VERB) rm -f $(LEX_OUTPUT) $(YACC_OUTPUT) # If dependancies were generated for the file that included this file, # include the dependancies now... # SourceDepend := $(addsuffix .d,$(addprefix $(BUILD_ROOT)/Depend/,$(basename $(filter-out Debug/%, $(Source))))) ifneq ($(SourceDepend),) -include $(SourceDepend) +-include $(SourceDepend) endif