Subzero: Fix "make presubmit" for spec -Om1.

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 484 matching lines @@
 # parallel execution speed.
 ALLSPEC := 253.perlbmk 177.mesa 188.ammp 256.bzip2 164.gzip 179.art 183.equake \
            175.vpr 176.gcc 181.mcf 186.crafty 197.parser 254.gap 255.vortex \
            300.twolf 252.eon
 .PHONY: $(ALLSPEC)
 
 TARGET := x8632
 ifeq ($(TARGET),x8632)
   TARGETFLAG=x8632
   SETUP=SetupGccX8632Opt
-  SPEC := -O2 --filetype=obj
+  SPEC := --filetype=obj
 endif
 ifeq ($(TARGET),x8664)
   TARGETFLAG=x8664
   SETUP=SetupGccX8664Opt
-  SPEC := -O2 --filetype=obj
+  SPEC := --filetype=obj
 endif
 ifeq ($(TARGET),arm32)
   TARGETFLAG=arm32
   SETUP=SetupGccArmOpt
-  SPEC := -O2 --filetype=obj
+  SPEC := --filetype=obj
 endif
-SPECFLAGS :=
+SPECFLAGS := -O2
 SPECBUILDONLY := false
 %.spec2k: % $(OBJDIR)/pnacl-sz make_symlink runtime
         ./pydir/szbuild_spec2k.py -v \
           $(SPECFLAGS) --target=$(TARGETFLAG) $(SPEC) $<
         $(SPECBUILDONLY) || ( cd ../../../tests/spec2k; \
          ./run_all.sh RunTimedBenchmarks $(SETUP) train $< )
 
 check-spec: $(ALLSPEC:=.spec2k)
 
 check: check-lit check-unit check-xtest
@@ skipping 17 matching lines @@
         +make -f Makefile.standalone \
           TARGET=x8664 check-spec
 # Build spec2k under -Om1/x86-32, to check for liveness errors.
         +make -f Makefile.standalone \
           SPECFLAGS='-Om1' SPECBUILDONLY=true check-spec
 # Build spec2k under -Om1/x86-64, to check for liveness errors.
         +make -f Makefile.standalone \
           SPECFLAGS='-Om1' TARGET=x8664 SPECBUILDONLY=true check-spec
 # Run spec2k for x86-32 without advanced phi lowering.
         +make -f Makefile.standalone \
-          SPECFLAGS='--sz=--phi-edge-split=0' check-spec
+          SPECFLAGS='-O2 --sz=--phi-edge-split=0' check-spec
 # Run spec2k for x86-64 without advanced phi lowering.
         +make -f Makefile.standalone \
-          SPECFLAGS='--sz=--phi-edge-split=0' TARGET=x8664 check-spec
+          SPECFLAGS='-O2 --sz=--phi-edge-split=0' TARGET=x8664 check-spec
 # Run cross tests and lit tests to validate filetype=asm output.
         +make -f Makefile.standalone \
           FORCEASM=1 check-xtest check-lit
 # Build spec2k for arm32.
         +make -f Makefile.standalone \
           TARGET=arm32 SPECBUILDONLY=true check-spec
 # Build spec2k under -Om1/arm32.
         +make -f Makefile.standalone \
           TARGET=arm32 SPECFLAGS='-Om1' SPECBUILDONLY=true check-spec
 # Run a few spec2k tests for arm32 using qemu. Keep the list sorted in
@@ skipping 41 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/