X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=Makefile.rules;h=37cce15f70fd147f1af95f86719e310115cda08c;hb=6d131b4582d0940c3ca3525ebfc281a4b5144b68;hp=d58b118741772c4b65a9e998ca39d0ea1c4b1547;hpb=ab6d2934350d31b9625baf8389d5a6f2bedadc21;p=oota-llvm.git

diff --git a/Makefile.rules b/Makefile.rules
index d58b1187417..37cce15f70f 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -144,7 +144,7 @@ ifdef KEEP_SYMBOLS
 STRIP =
 WARN_MSG =
 else
-STRIP = -s
+STRIP = -Wl,-x
 WARN_MSG = "(without symbols) "
 endif
 
@@ -174,9 +174,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 +215,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 +226,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
 
 #---------------------------------------------------------
@@ -395,19 +395,25 @@ 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
+$(TOOLEXENAME_G): $(ObjectsG) $(USED_LIB_PATHS_G) $(TOOLDEBUG)/.dir
 	@echo ======= Linking $(TOOLNAME) debug executable $(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 $@ $(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) $(LINK_OPTS)
 
@@ -450,27 +456,50 @@ $(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 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...