Subzero: Improve the use of timers.

Makefile.standalone

 # The following variables will likely need to be modified, depending on where
 # and how you built LLVM & Clang. They can be overridden in a command-line
 # invocation of make, like:
 #
 #   make LLVM_SRC_PATH=<path> LIBCXX_INSTALL_PATH=<path> CLANG_PATH=<path> \
 #        PNACL_BIN_PATH=<path> ...
 #
 
 # LLVM_SRC_PATH is the path to the root of the checked out source code. This
 # directory should contain the configure script, the include/ and lib/
@@ skipping 66 matching lines @@
   LINKOPTLEVEL = -O2
 endif
 
 # The list of CXX defines that are dependent on build parameters.
 BASE_CXX_DEFINES =
 CXX_EXTRA =
 LD_EXTRA =
 
 ifdef MINIMAL
   NOASSERT = 1
+  NODUMP = 1
   OBJDIR := $(OBJDIR)+Min
-  BASE_CXX_DEFINES += -DALLOW_DUMP=0 -DALLOW_LLVM_CL=0 -DALLOW_LLVM_IR=0 \
-    -DALLOW_LLVM_IR_AS_INPUT=0 -DALLOW_MINIMAL_BUILD=1
+  BASE_CXX_DEFINES += -DALLOW_LLVM_CL=0 -DALLOW_LLVM_IR=0 \
+    -DALLOW_LLVM_IR_AS_INPUT=0 -DALLOW_TIMERS=0 -DALLOW_MINIMAL_BUILD=1
 else
-  BASE_CXX_DEFINES += -DALLOW_DUMP=1 -DALLOW_LLVM_CL=1 -DALLOW_LLVM_IR=1 \
-    -DALLOW_LLVM_IR_AS_INPUT=1 -DALLOW_MINIMAL_BUILD=0
+  BASE_CXX_DEFINES += -DALLOW_LLVM_CL=1 -DALLOW_LLVM_IR=1 \
+    -DALLOW_LLVM_IR_AS_INPUT=1 -DALLOW_TIMERS=1 -DALLOW_MINIMAL_BUILD=0
+endif
+
+ifdef NODUMP
+  OBJDIR := $(OBJDIR)+NoDump
+  BASE_CXX_DEFINES += -DALLOW_DUMP=0
+else
+  BASE_CXX_DEFINES += -DALLOW_DUMP=1
 endif
 
 CXX_DEFINES := $(BASE_CXX_DEFINES) -DPNACL_BROWSER_TRANSLATOR=0
 
 ifdef NOASSERT
   ASSERTIONS = -DNDEBUG
 else
   ASSERTIONS =
   OBJDIR := $(OBJDIR)+Asserts
 endif
@@ skipping 509 matching lines @@
 
 help-check-xtest:
         @cat Makefile.standalone-help/check-xtest.txt
 
 clean:
         rm -rf pnacl-sz *.o $(foreach nexe,$(NEXES),$(notdir $(nexe))) \
           $(OBJDIR) $(SB_OBJDIR) $(SBB_OBJDIR) build/*.bloat.json
 
 clean-all: clean
         rm -rf build/  crosstest/Output/