Index: Makefile.standalone |
diff --git a/Makefile.standalone b/Makefile.standalone |
index 201a8e4501fb04ed142bce617f7304ceedd239b3..01f47144b7709999db2d2b24524f852a12b3edf5 100644 |
--- a/Makefile.standalone |
+++ b/Makefile.standalone |
@@ -410,7 +410,7 @@ sb_make_symlink: $(NEXES) |
.PHONY: all compile_only make_symlink runtime bloat sb docs help \ |
help-check-lit help-check-xtest exists-nonsfi-x8632 \ |
- exists-nonsfi-arm32 exists-sbtc exists-spec |
+ exists-nonsfi-arm32 exists-nonsfi-mips32 exists-sbtc exists-spec |
Jim Stichnoth
2016/06/22 19:14:16
I'm not sure we should bother with the "nonsfi" fe
|
compile_only: $(OBJS) |
@@ -531,7 +531,7 @@ check-xtest check-xtest-lite: $(OBJDIR)/pnacl-sz make_symlink runtime |
@echo "Crosstests disabled, minimal build" |
else |
check-xtest: $(OBJDIR)/pnacl-sz make_symlink runtime \ |
- exists-nonsfi-x8632 exists-nonsfi-arm32 crosstest/test_arith_ll.ll |
+ exists-nonsfi-x8632 exists-nonsfi-arm32 exists-nonsfi-mips32 crosstest/test_arith_ll.ll |
# Do all native/sse2 tests, but only test_vector_ops for native/sse4.1. |
# For (slow) sandboxed tests, limit to Om1/sse4.1. |
# run.py (used to run the sandboxed xtests) does not support |
@@ -549,11 +549,13 @@ check-xtest: $(OBJDIR)/pnacl-sz make_symlink runtime \ |
-i x8664,native,sse4.1,test_vector_ops \ |
-i x8664,sandbox,sse4.1,Om1 \ |
-i arm32 \ |
+ -i mips32 \ |
Jim Stichnoth
2016/06/22 19:14:16
I don't think any of the MIPS cross tests are read
|
+ -i mips32,native \ |
-e arm32,sandbox,hwdiv-arm |
PNACL_BIN_PATH=$(PNACL_BIN_PATH) \ |
$(LLVM_SRC_PATH)/utils/lit/lit.py -sv $(CHECK_XTEST_TESTS) |
check-xtest-lite: $(OBJDIR)/pnacl-sz make_symlink runtime \ |
- exists-nonsfi-x8632 exists-nonsfi-arm32 crosstest/test_arith_ll.ll |
+ exists-nonsfi-x8632 exists-nonsfi-arm32 exists-nonsfi-mips32 crosstest/test_arith_ll.ll |
# Do all native/sse2/neon tests, which are relatively fast. |
# Limit to test_global+mem_intrin for sandbox+nonsfi because sandbox and |
# nonsfi builds are slow, and test_global and mem_intrin are the most |
@@ -604,6 +606,11 @@ ifeq ($(TARGET),arm32) |
SETUP=SetupGccArmOpt |
SPEC := --filetype=obj |
endif |
+ifeq ($(TARGET),mips32) |
+ TARGETFLAG=mips32 |
+ SETUP=SetupGccMipsOpt |
+ SPEC := --filetype=obj |
+endif |
SPECFLAGS := -O2 |
SPECRUN := --run |
%.spec2k: % $(OBJDIR)/pnacl-sz make_symlink runtime |
@@ -614,6 +621,9 @@ check-spec: exists-spec $(ALLSPEC:=.spec2k) |
check: check-lit check-unit check-xtest |
+NONSFI_LOADER_MIPS32 =\ |
+ $(NACL_ROOT)/scons-out/opt-linux-mips32/obj/src/nonsfi/loader/nonsfi_loader |
+ |
NONSFI_LOADER_X8632 = \ |
$(NACL_ROOT)/scons-out/opt-linux-x86-32/obj/src/nonsfi/loader/nonsfi_loader |
NONSFI_LOADER_ARM32 = \ |
@@ -637,6 +647,14 @@ exists-nonsfi-arm32: |
exit 1 ; \ |
fi |
+exists-nonsfi-mips32: |
+ @if [ ! -f $(NONSFI_LOADER_MIPS32) ] ; then \ |
+ echo "Missing file $(NONSFI_LOADER_MIPS32)"; \ |
+ echo "Consider running './scons platform=mips nonsfi_loader'" \ |
+ "in the native_client directory."; \ |
+ exit 1 ; \ |
+ fi |
+ |
exists-sbtc: |
@if [ ! -f $(SBTC_LIBFILE) ] ; then \ |
echo "Missing file $(SBTC_LIBFILE)"; \ |
@@ -654,7 +672,7 @@ exists-spec: |
fi |
check-presubmit presubmit: exists-nonsfi-x8632 exists-nonsfi-arm32 \ |
- exists-sbtc exists-spec |
+ exists-nonsfi-mips32 exists-sbtc exists-spec |
# Make sure clang-format gets run. |
+make -f Makefile.standalone format |
# Verify MINIMAL build, plus proper usage of REQUIRES in lit tests. |
@@ -704,7 +722,7 @@ check-presubmit presubmit: exists-nonsfi-x8632 exists-nonsfi-arm32 \ |
echo Success |
presubmit-lite: exists-nonsfi-x8632 exists-nonsfi-arm32 \ |
- exists-sbtc exists-spec |
+ exists-nonsfi-mips32 exists-sbtc exists-spec |
# Make sure clang-format gets run. |
+make -f Makefile.standalone format |
# Verify MINIMAL build, plus proper usage of REQUIRES in lit tests. |