X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fnative_client%2Ftests%2Fspec2k%2FMakefile.common;h=b52c8d9deafd2d55f2b66f8f2b974e47b0b2aafa;hb=004985e17e624662a4c85c76a7654039dc83f028;hp=d1eca3285b572525a05fa49f34e67c25bb4b75c4;hpb=2f108dbacb161091e42a3479f4e171339b7e7623;p=platform%2Fframework%2Fweb%2Fcrosswalk.git

diff --git a/src/native_client/tests/spec2k/Makefile.common b/src/native_client/tests/spec2k/Makefile.common
index d1eca32..b52c8d9 100644
--- a/src/native_client/tests/spec2k/Makefile.common
+++ b/src/native_client/tests/spec2k/Makefile.common
@@ -9,29 +9,26 @@
 # NOTE: we assume you have a symlink "CLIENT" in this directory pointing
 #       to your .../native_client directory
 
-ifndef BUILD_PLATFORM
-BUILD_PLATFORM="build_platform_undefined"
-endif
-
 ifndef SCONS_BUILD_PLATFORM
 SCONS_BUILD_PLATFORM="scons_build_platform_undefined"
 endif
 
-ifndef BUILD_ARCH
-BUILD_ARCH="build_arch_undefined"
+ifndef BUILD_ARCH_SHORT
+BUILD_ARCH_SHORT="build_arch_short_undefined"
 endif
 
 TC_ROOT=../../../toolchain
+TOOLCHAIN_BASE=$(TC_ROOT)/$(SCONS_BUILD_PLATFORM)_$(BUILD_ARCH_SHORT)
 
-NNACL_ROOT=$(TC_ROOT)/$(SCONS_BUILD_PLATFORM)_x86
-NNACL_NEWLIB_ROOT=$(TC_ROOT)/$(SCONS_BUILD_PLATFORM)_x86_newlib
+NNACL_GLIBC_ROOT=$(TOOLCHAIN_BASE)/nacl_$(BUILD_ARCH_SHORT)_glibc
+NNACL_NEWLIB_ROOT=$(TOOLCHAIN_BASE)/nacl_$(BUILD_ARCH_SHORT)_newlib
 
 NNACL_NEWLIB_SDK32=../../../scons-out/nacl-x86-32
 NNACL_NEWLIB_SDK64=../../../scons-out/nacl-x86-64
 
-PNACL_ROOT=$(TC_ROOT)/pnacl_$(BUILD_PLATFORM)_x86
-PNACL_TRANSLATOR_ROOT=$(TC_ROOT)/pnacl_translator
-ARM_ROOT=$(TC_ROOT)/linux_arm-trusted
+PNACL_ROOT=$(TOOLCHAIN_BASE)/pnacl_newlib
+PNACL_TRANSLATOR_ROOT=$(TOOLCHAIN_BASE)/pnacl_translator
+ARM_ROOT=$(TOOLCHAIN_BASE)/arm_trusted
 
 CFLAGS = $(CFLAGS_EXTRA)
 
@@ -232,7 +229,7 @@ $(IT).gcc.opt.arm: $(SRC) $(CPPSRC)
 ######################################################################
 ## NACL-GCC TOOLCHAINS
 ######################################################################
-NACL_GCC=$(NNACL_ROOT)/bin/x86_64-nacl-gcc
+NACL_GCC=$(NNACL_GLIBC_ROOT)/bin/x86_64-nacl-gcc
 NACL_GCC_NEWLIB32=$(NNACL_NEWLIB_ROOT)/bin/x86_64-nacl-gcc \
 		  -B $(NNACL_NEWLIB_SDK32)/lib \
 		  -I $(NNACL_NEWLIB_SDK32)/include
@@ -242,46 +239,42 @@ NACL_GCC_NEWLIB64=$(NNACL_NEWLIB_ROOT)/bin/x86_64-nacl-gcc \
 
 # nacl x86 gcc
 $(IT).nacl.x8632: $(SRC) $(CPPSRC)
-	$(NACL_GCC_NEWLIB32) -O0 -m32 $(CFLAGS) $^ -static -lstdc++ -lm \
-		-lnosys -o $@
+	$(NACL_GCC_NEWLIB32) -O0 -m32 $(CFLAGS) $^ -static -lstdc++ -lm -o $@
 	@$(call LOG_ZIP_SIZE,$@,$(IT))
 
 # nacl optimized x86 gcc
 $(IT).nacl.opt.x8632: $(SRC) $(CPPSRC)
-	$(NACL_GCC_NEWLIB32) -O3 -m32 $(CFLAGS) $^ -static -lstdc++ -lm \
-		-lnosys -o $@
+	$(NACL_GCC_NEWLIB32) -O3 -m32 $(CFLAGS) $^ -static -lstdc++ -lm -o $@
 	@$(call LOG_ZIP_SIZE,$@,$(IT))
 
 # nacl x86 gcc, dynamic
 $(IT).nacl.dyn.x8632: $(SRC) $(CPPSRC)
-	$(NACL_GCC) -O0 -m32 $(CFLAGS) -fPIC -g $^ -lstdc++ -lm  -lnosys -o $@
+	$(NACL_GCC) -O0 -m32 $(CFLAGS) -fPIC -g $^ -lstdc++ -lm -o $@
 	@$(call LOG_ZIP_SIZE,$@,$(IT))
 
 # nacl optimized x86 gcc, dynamic
 $(IT).nacl.dyn.opt.x8632: $(SRC) $(CPPSRC)
-	$(NACL_GCC) -O3 -m32 $(CFLAGS) -fPIC -g $^ -lstdc++ -lm  -lnosys -o $@
+	$(NACL_GCC) -O3 -m32 $(CFLAGS) -fPIC -g $^ -lstdc++ -lm -o $@
 	@$(call LOG_ZIP_SIZE,$@,$(IT))
 
 # nacl x86-64 gcc
 $(IT).nacl.x8664: $(SRC) $(CPPSRC)
-	$(NACL_GCC_NEWLIB64) -O0 -m64 $(CFLAGS) $^  -static -lstdc++ -lm \
-		-lnosys -o $@
+	$(NACL_GCC_NEWLIB64) -O0 -m64 $(CFLAGS) $^  -static -lstdc++ -lm -o $@
 	@$(call LOG_ZIP_SIZE,$@,$(IT))
 
 # nacl optimized x86-64 gcc
 $(IT).nacl.opt.x8664: $(SRC) $(CPPSRC)
-	$(NACL_GCC_NEWLIB64) -O3 -m64 $(CFLAGS) $^  -static -lstdc++ -lm \
-		-lnosys -o $@
+	$(NACL_GCC_NEWLIB64) -O3 -m64 $(CFLAGS) $^  -static -lstdc++ -lm -o $@
 	@$(call LOG_ZIP_SIZE,$@,$(IT))
 
 # nacl x86-64 gcc, dynamic
 $(IT).nacl.dyn.x8664: $(SRC) $(CPPSRC)
-	$(NACL_GCC) -O0 -m64 $(CFLAGS) -fPIC -g $^ -lstdc++ -lm  -lnosys -o $@
+	$(NACL_GCC) -O0 -m64 $(CFLAGS) -fPIC -g $^ -lstdc++ -lm -o $@
 	@$(call LOG_ZIP_SIZE,$@,$(IT))
 
 # nacl optimized x86-64 gcc, dynamic
 $(IT).nacl.dyn.opt.x8664: $(SRC) $(CPPSRC)
-	$(NACL_GCC) -O3 -m64 $(CFLAGS) -fPIC -g $^ -lstdc++ -lm  -lnosys -o $@
+	$(NACL_GCC) -O3 -m64 $(CFLAGS) -fPIC -g $^ -lstdc++ -lm -o $@
 	@$(call LOG_ZIP_SIZE,$@,$(IT))
 
 ######################################################################
@@ -294,6 +287,7 @@ EXTRA_TRANSLATOR_FLAGS=-sfi-zero-based-sandbox
 else
 EXTRA_TRANSLATOR_FLAGS=
 endif
+
 PNACL_TRANSLATOR_FLAGS_FAST=-translate-fast
 
 PNACL_BIN=$(PNACL_ROOT)/bin
@@ -312,11 +306,6 @@ PNACL_FINALIZE=$(PNACL_BIN)/pnacl-finalize
 PNACL_FLAGS=--pnacl-driver-verbose
 
 PNACL_FLAGS_COMMON=$(PNACL_FLAGS) $(CFLAGS)
-ifeq ($(PNACL_LIBMODE), newlib)
-  PNACL_EXTRA_LIB=-lnosys
-else
-  PNACL_EXTRA_LIB=
-endif
 
 %.bc: %.c
 	$(PNACL_CC) -O0 $(PNACL_FLAGS_COMMON) $< -c -o $@
@@ -329,8 +318,7 @@ endif
 	$(PNACL_CXX) -O3 $(PNACL_FLAGS_COMMON) $< -c -o $@
 
 $(IT).unopt.pexe: $(SRC:%.c=%.bc) $(CPPSRC:%.cc=%.bc)
-	$(PNACL_CXX) -O0  $(PNACL_FLAGS_COMMON) $^ \
-	-static -lm $(PNACL_EXTRA_LIB)  -o $@
+	$(PNACL_CXX) -O0  $(PNACL_FLAGS_COMMON) $^ -static -lm -o $@
 	@$(call LOG_ZIP_SIZE,$@,$(IT))
 
 $(IT).unopt.stripped.pexe: $(IT).unopt.pexe
@@ -338,8 +326,7 @@ $(IT).unopt.stripped.pexe: $(IT).unopt.pexe
 	@$(call LOG_ZIP_SIZE,$@,$(IT))
 
 $(IT).opt.pexe: $(SRC:%.c=%.o3.bc) $(CPPSRC:%.cc=%.o3.bc)
-	$(PNACL_CXX) -O3 $(PNACL_FLAGS_COMMON) $^ -static -lm \
-	$(PNACL_EXTRA_LIB) -o $@
+	$(PNACL_CXX) -O3 $(PNACL_FLAGS_COMMON) $^ -static -lm -o $@
 	@$(call LOG_ZIP_SIZE,$@,$(IT))
 
 $(IT).opt.stripped.pexe: $(IT).opt.pexe
@@ -366,8 +353,8 @@ $(IT).pnacl_translator.opt.arm: $(IT).opt.stripped.pexe
 	@$(call LOG_TIME_AND_SIZE,$@,$(IT))
 
 $(IT).pnacl_translator_fast.opt.arm: $(IT).opt.stripped.pexe
-	$(PNACL_TRANSLATOR_SB_EMU) $(PNACL_FLAGS) ${PNACL_TRANSLATOR_FLAGS_FAST} \
-	  $^ -o $@ -arch arm
+	$(PNACL_TRANSLATOR_SB_EMU) $(PNACL_FLAGS) \
+	  $(PNACL_TRANSLATOR_FLAGS_FAST) $^ -o $@ -arch arm
 	@$(call LOG_TIME_AND_SIZE,$@,$(IT))
 
 
@@ -387,13 +374,25 @@ $(IT).pnacl_translator.opt.hw.arm:
 
 $(IT).pnacl_translator_fast.opt.hw.arm:
 	$(PNACL_TRANSLATOR_SB) $(PNACL_FLAGS) $(IT).opt.stripped.pexe \
-	 ${PNACL_TRANSLATOR_FLAGS_FAST} -o $@ -arch arm
+	 $(PNACL_TRANSLATOR_FLAGS_FAST) -o $@ -arch arm
+	@$(call LOG_TIME_AND_SIZE,$@,$(IT))
+
+$(IT).pnacl_translator_1thread.opt.hw.arm:
+	$(PNACL_TRANSLATOR_SB) $(PNACL_FLAGS) $(IT).opt.stripped.pexe \
+	 -o $@ -arch arm -split-module=1
+	@$(call LOG_TIME_AND_SIZE,$@,$(IT))
+
+$(IT).pnacl_translator_fast_1thread.opt.hw.arm:
+	$(PNACL_TRANSLATOR_SB) $(PNACL_FLAGS) $(IT).opt.stripped.pexe \
+	 $(PNACL_TRANSLATOR_FLAGS_FAST) -o $@ -arch arm -split-module=1
 	@$(call LOG_TIME_AND_SIZE,$@,$(IT))
 
 
 .PHONY: $(IT).pnacl_translator.hw.arm
 .PHONY: $(IT).pnacl_translator.opt.hw.arm
 .PHONY: $(IT).pnacl_translator_fast.opt.hw.arm
+.PHONY: $(IT).pnacl_translator_1thread.opt.hw.arm
+.PHONY: $(IT).pnacl_translator_fast_1thread.opt.hw.arm
 
 ######################################################################
 # BITCODE - BACKEND - X8632 (sandboxed and non-sandboxed translators)
@@ -415,10 +414,20 @@ $(IT).pnacl_translator.opt.x8632: $(IT).opt.stripped.pexe
 	@$(call LOG_TIME_AND_SIZE,$@,$(IT))
 
 $(IT).pnacl_translator_fast.opt.x8632: $(IT).opt.stripped.pexe
-	$(PNACL_TRANSLATOR_SB) $(PNACL_FLAGS) ${PNACL_TRANSLATOR_FLAGS_FAST} \
+	$(PNACL_TRANSLATOR_SB) $(PNACL_FLAGS) $(PNACL_TRANSLATOR_FLAGS_FAST) \
 	  $^ -o $@ -arch x86-32
 	@$(call LOG_TIME_AND_SIZE,$@,$(IT))
 
+$(IT).pnacl_translator_1thread.opt.x8632: $(IT).opt.stripped.pexe
+	$(PNACL_TRANSLATOR_SB) $(PNACL_FLAGS) $^ -o $@ -arch x86-32 \
+	  -split-module=1
+	@$(call LOG_TIME_AND_SIZE,$@,$(IT))
+
+$(IT).pnacl_translator_fast_1thread.opt.x8632: $(IT).opt.stripped.pexe
+	$(PNACL_TRANSLATOR_SB) $(PNACL_FLAGS) $(PNACL_TRANSLATOR_FLAGS_FAST) \
+	  $^ -o $@ -arch x86-32 -split-module=1
+	@$(call LOG_TIME_AND_SIZE,$@,$(IT))
+
 
 ######################################################################
 # BITCODE - BACKEND - X8664 (sandboxed and non-sandboxed translators)
@@ -440,6 +449,16 @@ $(IT).pnacl_translator.opt.x8664: $(IT).opt.stripped.pexe
 	@$(call LOG_TIME_AND_SIZE,$@,$(IT))
 
 $(IT).pnacl_translator_fast.opt.x8664: $(IT).opt.stripped.pexe
-	$(PNACL_TRANSLATOR_SB) $(PNACL_FLAGS) ${PNACL_TRANSLATOR_FLAGS_FAST} \
+	$(PNACL_TRANSLATOR_SB) $(PNACL_FLAGS) $(PNACL_TRANSLATOR_FLAGS_FAST) \
 	  $^ -o $@ -arch x86-64
 	@$(call LOG_TIME_AND_SIZE,$@,$(IT))
+
+$(IT).pnacl_translator_1thread.opt.x8664: $(IT).opt.stripped.pexe
+	$(PNACL_TRANSLATOR_SB) $(PNACL_FLAGS) $^ -o $@ -arch x86-64 \
+	  -split-module=1
+	@$(call LOG_TIME_AND_SIZE,$@,$(IT))
+
+$(IT).pnacl_translator_fast_1thread.opt.x8664: $(IT).opt.stripped.pexe
+	$(PNACL_TRANSLATOR_SB) $(PNACL_FLAGS) $(PNACL_TRANSLATOR_FLAGS_FAST) \
+	  $^ -o $@ -arch x86-64 -split-module=1
+	@$(call LOG_TIME_AND_SIZE,$@,$(IT))