Fix for problem that caused both HUGE and INVALID latencies to be negative

[oota-llvm.git] / Makefile.common

diff --git a/Makefile.common b/Makefile.common
index 8e41e495a017c8c4a74463882cccc607013f1b80..72d9a32ed7e9bb4cc24f750be77db73b2b3ed72a 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -17,7 +17,8 @@
 #
 # 3. Source - If specified, this sets the source code filenames.  If this
 #    is not set, it defaults to be all of the .cpp, .c, .y, and .l files 
-#    in the current directory.
+#    in the current directory.  Also, if you want to build files in addition
+#    to the local files, you can use the ExtraSource variable
 #
 
 # Default Rule:  Make sure it's also a :: rule
@@ -37,6 +38,9 @@ install ::
 BURG = /home/vadve/vadve/Research/DynOpt/Burg/burg
 BURG_OPTS = -I
 
+
+PURIFY = /usr/dcs/applications/purify/bin/purify -cache-dir="/home/vadve/lattner/purifycache" -chain-length="10" -messages=all
+
 #---------------------------------------------------------
 # Compilation options...
 #---------------------------------------------------------
@@ -48,7 +52,7 @@ RunBurg  = $(BURG) $(BURG_OPTS)
 #Prof = -pg
 
 # TODO: Get rid of exceptions! : -fno-exceptions -fno-rtti
-CompileCommonOpts = $(Prof) -Wall -Winline -W  -Wwrite-strings -Wno-unused -I$(LEVEL)/include
+CompileCommonOpts = $(Prof) -Wall -W  -Wwrite-strings -Wno-unused-parameter -Wno-missing-braces -I$(LEVEL)/include
 
 # Compile a file, don't link...
 Compile  = $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(CompileCommonOpts)
@@ -57,6 +61,9 @@ CompileG = $(Compile) -g  -D_DEBUG
 CompileO = $(Compile) -O3 -DNDEBUG -finline-functions -felide-constructors -fnonnull-objects -freg-struct-return -fshort-enums
 
 # Link final executable
+
+# To enable purify, do it here:
+###Link     = $(PURIFY) $(CXX) $(Prof) -static
 Link     = $(CXX) $(Prof) 
 LinkG    = $(Link) -g  -L $(LEVEL)/lib/Debug
 LinkO    = $(Link) -O3 -L $(LEVEL)/lib/Release
@@ -78,9 +85,9 @@ MakeLib   = $(AR)
 
 # Source includes all of the cpp files, and objects are derived from the
 # source files...
-ifndef Source
-Source   = $(wildcard *.cpp *.c *.y *.l)
-endif
+# The local Makefile can list other Source files via ExtraSource = ...
+# 
+Source  := $(ExtraSource) $(wildcard *.cpp *.c *.y *.l)
 
 Objs = $(sort $(addsuffix .o,$(basename $(Source))))
 ObjectsO = $(addprefix Release/,$(Objs))
@@ -135,6 +142,19 @@ $(LIBNAME_AG): $(ObjectsG) $(LibSubDirs) $(LEVEL)/lib/Debug/.dir Depend/.dir
 
 endif
 
+#------------------------------------------------------------------------
+# Create a TAGS database for emacs
+#------------------------------------------------------------------------
+
+ifeq ($(LEVEL), .)
+
+tags:
+       etags -l c++ `find . -name '*.cpp' -o -name '*.h'`
+
+all:: tags
+
+endif
+
 #------------------------------------------------------------------------
 # Handle the TOOLNAME option - used when building tool executables...
 #------------------------------------------------------------------------
@@ -164,16 +184,17 @@ clean::
        rm -f $(TOOLEXENAMES)
 
 $(TOOLEXENAME_G): $(ObjectsG) $(USED_LIB_PATHS_G) $(LEVEL)/tools/Debug/.dir
-       $(LinkG) -o $@ $(ObjectsG) $(USED_LIBS_OPTIONS)
+       $(LinkG) -o $@ $(ObjectsG) $(USED_LIBS_OPTIONS) $(TOOLLINKOPTS)
 
 $(TOOLEXENAME_O): $(ObjectsO) $(USED_LIB_PATHS_O) $(LEVEL)/tools/Release/.dir
-       $(LinkO) -o $@ $(ObjectsG) $(USED_LIBS_OPTIONS)
+       $(LinkO) -o $@ $(ObjectsG) $(USED_LIBS_OPTIONS) $(TOOLLINKOPTS)
 
 endif
 
 
 
 #---------------------------------------------------------
+.PRECIOUS: Depend/.dir Debug/.dir Release/.dir
 
 # Create dependencies for the *.cpp files...
 Depend/%.d: %.cpp Depend/.dir
@@ -197,7 +218,7 @@ Debug/%.o: %.c Debug/.dir Depend/.dir
        $(CompileG) $< -o $@
 
 # Create a .cpp source file from a burg input file
-%.burm.cpp: %.burg
+%.burm.cpp: Debug/%.burg
        $(RunBurg) $< -o $@
 
 # Create a .cpp source file from a flex input file... this uses sed to cut down