Pull in Moh's vprof utility from tamarin-tracing.
authorAndreas Gal <gal@mozilla.com>
Thu, 31 Jul 2008 13:39:41 -0700
changeset 17917 3073cb49fee5ff16c124448f0e80ed7f666e142a
parent 17916 db0271921fbf412ee56039aa68e32c0a5b0bf15c
child 17918 01eb436bb5d70df744dc982032cb0298549b6158
child 17919 0ce82e77046fed9a267c7173295cc31f20fa353f
push id1452
push usershaver@mozilla.com
push dateFri, 22 Aug 2008 00:08:22 +0000
treeherderautoland@d13bb0868596 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone1.9.1a1pre
Pull in Moh's vprof utility from tamarin-tracing.
js/src/Makefile.ref
--- a/js/src/Makefile.ref
+++ b/js/src/Makefile.ref
@@ -61,16 +61,20 @@ ENABLE_JIT=1
 endif
 
 ifdef ENABLE_JIT
 DEFINES += -DJS_TRACER
 DEFINES += -DFEATURE_NANOJIT
 INCLUDES += -Inanojit
 endif
 
+ifndef BUILD_OPT
+DEFINES += -Ivprof
+endif
+
 ifdef NARCISSUS
 DEFINES += -DNARCISSUS
 endif
 
 # Look in OBJDIR to find jsautocfg.h and jsautokw.h
 INCLUDES   += -I. -I$(OBJDIR)
 
 ifdef JS_THREADSAFE
@@ -207,16 +211,22 @@ JS_HFILES +=			\
 	nanojit/Fragmento.h	\
 	nanojit/Native.h	\
 	nanojit/RegAlloc.h	\
 	nanojit/nanojit.h	\
 	nanojit/TraceTreeDrawer.h \
 	$(NULL)
 endif
 
+ifndef BUILD_OPT
+JS_HFILES +=            \
+        vprof/vprof.h   \
+        $(NULL)
+endif
+
 API_HFILES =		\
 	jsapi.h		\
 	jsdbgapi.h	\
 	$(NULL)
 
 OTHER_HFILES =		\
 	jsbit.h		\
 	jscompat.h	\
@@ -294,16 +304,22 @@ JS_CPPFILES +=		       \
 	nanojit/avmplus.cpp    \
 	$(NULL)
 
 ifdef DEBUG
 JS_CPPFILES += nanojit/TraceTreeDrawer.cpp
 endif
 endif
 
+ifndef BUILD_OPT
+JS_CPPFILES +=                 \
+        vprof/vprof.cpp        \
+        $(NULL)
+endif
+
 ifdef JS_LIVECONNECT
 DIRS      += liveconnect
 endif
 
 ifdef JS_HAS_FILE_OBJECT
 JS_CPPFILES += jsfile.cpp
 JS_HFILES += jsfile.h
 endif