Index: jsemit.c
===================================================================
RCS file: /cvsroot/mozilla/js/src/jsemit.c,v
retrieving revision 3.146
diff -u -r3.146 jsemit.c
--- jsemit.c
+++ jsemit.c
@@ -5214,6 +5215,10 @@
 }
 
 #ifdef DEBUG_brendan
+#define DEBUG_srcnotesize
+#endif
+
+#ifdef DEBUG_srcnotesize
 #define NBINS 10
 static uint32 hist[NBINS];
 
Index: jsgc.c
===================================================================
RCS file: /cvsroot/mozilla/js/src/jsgc.c,v
retrieving revision 3.115
diff -u -r3.115 jsgc.c
--- jsgc.c
+++ jsgc.c
@@ -581,6 +581,14 @@
 }
 
 #ifdef DEBUG_brendan
+#define DEBUG_gchist
+#endif
+#ifdef DEBUG_timeless
+#define DEBUG_gchist
+#endif
+#define DEBUG_gchist
+
+#ifdef DEBUG_gchist
 #define NGCHIST 64
 
 static struct GCHist {
@@ -728,7 +738,7 @@
      */
     thing->next = NULL;
     thing->flagp = NULL;
-#ifdef DEBUG_brendan
+#ifdef DEBUG_gchist
     gchist[gchpos].lastDitch = tried_gc;
     gchist[gchpos].freeList = arenaList->freeList;
     if (++gchpos == NGCHIST)
@@ -1738,7 +1756,7 @@
     /* Drop atoms held by the property cache, and clear property weak links. */
     js_DisablePropertyCache(cx);
     js_FlushPropertyCache(cx);
-#ifdef DEBUG_notme
+#ifdef DEBUG_scopemeters
   { extern void js_DumpScopeMeters(JSRuntime *rt);
     js_DumpScopeMeters(rt);
   }
@@ -1996,7 +2014,7 @@
 
     if (rt->gcCallback)
         (void) rt->gcCallback(cx, JSGC_FINALIZE_END);
-#ifdef DEBUG_notme
+#ifdef DEBUG_srcnotesize
   { extern void DumpSrcNoteSizeHist();
     DumpSrcNoteSizeHist();
     printf("GC HEAP SIZE %lu (%lu)\n",
Index: jsobj.c
===================================================================
RCS file: /cvsroot/mozilla/js/src/jsobj.c,v
retrieving revision 3.240
diff -u -r3.240 jsobj.c
--- jsobj.c
+++ jsobj.c
@@ -4167,6 +4153,10 @@
     js_entry_count_hist[JS_MIN(count, 10)]++;
 }
 
+#define DEBUG_scopemeters
+#endif /* DEBUG_brendan */
+
+#ifdef DEBUG_scopemeters
 void
 js_DumpScopeMeters(JSRuntime *rt)
 {
@@ -4207,8 +4197,7 @@
     memset(js_entry_count_hist, 0, sizeof js_entry_count_hist);
     fflush(logfp);
 }
-
-#endif /* DEBUG_brendan */
+#endif
 
 uint32
 js_Mark(JSContext *cx, JSObject *obj, void *arg)
Index: jsscript.c
===================================================================
RCS file: /cvsroot/mozilla/js/src/jsscript.c,v
retrieving revision 3.92
diff -u -r3.92 jsscript.c
--- jsscript.c
+++ jsscript.c
@@ -1028,6 +1028,9 @@
 }
 
 #ifdef DEBUG_brendan
+#define DEBUG_SFTBL
+#endif
+#ifdef DEBUG_SFTBL
 size_t sftbl_savings = 0;
 #endif
 
@@ -1046,7 +1049,7 @@
     hash = JS_HashString(filename);
     hep = JS_HashTableRawLookup(table, hash, filename);
     sfe = (ScriptFilenameEntry *) *hep;
-#ifdef DEBUG_brendan
+#ifdef DEBUG_SFTBL
     if (sfe)
         sftbl_savings += strlen(sfe->filename);
 #endif
@@ -1236,7 +1239,9 @@
                                  js_script_filename_sweeper,
                                  rt);
 #ifdef DEBUG_notme
+#ifdef DEBUG_SFTBL
     printf("script filename table savings so far: %u\n", sftbl_savings);
+#endif
 #endif
 }