Subzero: Updated spec2k Makefile

tests/spec2k/Makefile.common

 # Copyright (c) 2012 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 ######################################################################
 # CONFIG
 ######################################################################
 
 # NOTE: we assume you have a symlink "CLIENT" in this directory pointing
 #       to your .../native_client directory
@@ skipping 308 matching lines @@
 PNACL_BIN=$(PNACL_ROOT)/bin
 # Sandboxed translation uses the standalone translator install (which only
 # supports sandboxed translation). This allows it to run on the arm hardware
 # bots, which have no native toolchain build.
 PNACL_TRANSLATOR=$(TIME_TRANSLATE) $(PNACL_BIN)/pnacl-translate \
   $(EXTRA_TRANSLATOR_FLAGS)
 PNACL_TRANSLATOR_SB=$(TIME_TRANSLATE) \
   $(PNACL_TRANSLATOR_ROOT)/bin/pnacl-translate --pnacl-sb
 PNACL_TRANSLATOR_SB_EMU=$(PNACL_TRANSLATOR_SB) --pnacl-use-emulator \
   $(EXTRA_TRANSLATOR_FLAGS)
-PNACL_CC=$(PNACL_BIN)/pnacl-clang
-PNACL_CXX=$(PNACL_BIN)/pnacl-clang++
-PNACL_FINALIZE=$(PNACL_BIN)/pnacl-finalize
+PNACL_CC=$(TC_ROOT)/../toolchain_build/src/subzero/pydir/sz-clang.py \
+  -fsanitize-address
+PNACL_CXX=$(TC_ROOT)/../toolchain_build/src/subzero/pydir/sz-clang++.py \
+  -fsanitize-address
+PNACL_FINALIZE=$(PNACL_BIN)/pnacl-finalize --no-strip-syms
 PNACL_FLAGS=--pnacl-driver-verbose
 
 PNACL_FLAGS_COMMON=$(PNACL_FLAGS) $(CFLAGS)
 
 %.bc: %.c
         $(PNACL_CC) -O0 $(PNACL_FLAGS_COMMON) $< -c -o $@
 %.bc: %.cc
         $(PNACL_CXX) -O0 $(PNACL_FLAGS_COMMON) $< -c -o $@
 
 %.o3.bc: %.c
@@ skipping 188 matching lines @@
 
 $(IT).pnacl_translator_fast_1thread.opt.x8664: $(IT).opt.stripped.pexe
         $(PNACL_TRANSLATOR_SB) $(PNACL_FLAGS) $(PNACL_TRANSLATOR_FLAGS_FAST) \
           $^ -o $@ -arch x86-64 -threads=seq
         @$(call LOG_TIME_AND_SIZE,$@,$(IT))
 
 $(IT).pnacl_translator_fast_1thread.opt.sz.x8664: $(IT).opt.stripped.pexe
         $(PNACL_TRANSLATOR_SB) $(PNACL_FLAGS) $(PNACL_SZ_FLAGS) \
           $^ -o $@ -arch x86-64 -threads=seq
         @$(call LOG_TIME_AND_SIZE,$@,$(IT))