Subzero: Provide "make sb" target for sandboxed pnacl-sz.

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 74 matching lines @@
 ifdef MINIMAL
   NOASSERT = 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
 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
 endif
 
-SB_CXX_DEFINES := $(BASE_CXX_DEFINES) -DPNACL_BROWSER_TRANSLATOR=1
+# TODO(stichnot): Also work up a -DPNACL_BROWSER_TRANSLATOR=1 version of a
+# sandboxed translator.
+SB_CXX_DEFINES := $(BASE_CXX_DEFINES) -DPNACL_BROWSER_TRANSLATOR=0
 CXX_DEFINES := $(BASE_CXX_DEFINES) -DPNACL_BROWSER_TRANSLATOR=0
 
 ifdef NOASSERT
   ASSERTIONS = -DNDEBUG
 else
   ASSERTIONS =
   OBJDIR := $(OBJDIR)+Asserts
 endif
 
 ifdef UBSAN
@@ skipping 83 matching lines @@
 else
   # LLVM autoconf build
   LLVM_LIBS := -lLLVM-3.7svn
   GTEST_LIB_PATH ?= -L../../out/llvm_x86_64_linux_work/Release+Asserts/lib
   CLANG_FORMAT_PATH ?= ../../out/llvm_x86_64_linux_work/Release+Asserts/bin
 endif
 
 LLVM_LDFLAGS := $(LLVM_LIBS) \
                 `$(PNACL_BIN_PATH)/llvm-config --ldflags` \
                 `$(PNACL_BIN_PATH)/llvm-config --system-libs`
-SB_LLVM_LDFLAGS := $(LLVM_LIBS_LIST) \
+SB_LLVM_LDFLAGS := -Wl,--start-group $(LLVM_LIBS_LIST) -Wl,--end-group \
                    -L$(SB_LLVM_PATH)/lib
 
 CCACHE := `command -v ccache`
 CXX := CCACHE_CPP2=yes $(CCACHE) $(CLANG_PATH)/clang++
 SB_CXX := CCACHE_CPP2=yes $(CCACHE) $(PNACL_BIN_PATH)/pnacl-clang++
 SB_TRANSLATE := $(PNACL_BIN_PATH)/pnacl-translate
+SB_FINALIZE := $(PNACL_BIN_PATH)/pnacl-finalize --no-strip-syms
 
 # Extra warnings that LLVM's build system adds in addition to -Wall.
 LLVM_EXTRA_WARNINGS := -Wcovered-switch-default
 
 # Use g++ to compile, to check for errors/warnings that clang++ might have
 # missed.  It's unlikely to link, unless LLVM was also built with g++, so the
 # compile_only target should be used.  Note: This ifdef section is deliberately
 # placed here instead of with the other ifdef sections, so that its redefinition
 # of CXX/STDLIB_FLAGS/LLVM_EXTRA_WARNINGS follows their normal definitions.
 ifdef GPLUSPLUS
   CXX := CCACHE_CPP2=yes $(CCACHE) g++
   STDLIB_FLAGS :=
   LLVM_EXTRA_WARNINGS := \
     -Wcast-qual \
     -Wno-comment \
     -Wno-long-long \
     -Wno-maybe-uninitialized \
     -Wno-missing-field-initializers \
     -Wno-unused-parameter \
     -Wwrite-strings
   OBJDIR := $(OBJDIR)+Gplusplus
 endif
 
 BASE_CXXFLAGS := -std=gnu++11 -Wall -Wextra -Werror -fno-rtti \
   -fno-exceptions $(OPTLEVEL) $(ASSERTIONS) -g -pedantic \
   $(LLVM_EXTRA_WARNINGS) $(CXX_EXTRA)
 
 CXXFLAGS := $(LLVM_CXXFLAGS) $(BASE_CXXFLAGS) $(CXX_DEFINES) $(HOST_FLAGS) \
   $(STDLIB_FLAGS)
-SB_CXXFLAGS := $(SB_LLVM_CXXFLAGS) $(BASE_CXXFLAGS) $(SB_CXX_DEFINES)
+SB_CXXFLAGS := $(SB_LLVM_CXXFLAGS) $(BASE_CXXFLAGS) $(SB_CXX_DEFINES) \
+               -Wno-unknown-pragmas -I$(NACL_ROOT)
 
 LDFLAGS := $(HOST_FLAGS) -L$(LIBCXX_INSTALL_PATH)/lib -Wl,--gc-sections \
   $(LD_EXTRA) $(STDLIB_FLAGS)
 # Not specifying -Wl,--gc-sections but instead doing bitcode linking GC w/ LTO.
 SB_LDFLAGS := $(LINKOPTLEVEL) $(LD_EXTRA)
 
 # List the target-specific source files first, which generally take longer to
 # compile, in the hope of improving parallel build time.
 SRCS = \
   IceAssemblerARM32.cpp \
@@ skipping 75 matching lines @@
 UNITTEST_OBJS = $(patsubst %.cpp, $(OBJDIR)/unittest/%.o, $(UNITTEST_SRCS))
 UNITTEST_LIB_OBJS = $(filter-out $(OBJDIR)/main.o,$(OBJS))
 
 # Keep all the first target so it's the default.
 all: $(OBJDIR)/pnacl-sz make_symlink runtime
 
 ifdef TSAN
 sb:
         @echo "Skipping pnacl-sz.*.nexe: TSAN isn't supported under NaCl."
 else
-sb: $(SB_OBJDIR)/pnacl-sz.x86-32.nexe
+sb: $(SB_OBJDIR)/pnacl-sz.x8632.nexe \
+    $(SB_OBJDIR)/pnacl-sz.x8664.nexe \
+    sb_make_symlink
 endif
 
 # SHOW_BUILD_ATTS is an executable that is run to show what build
 # attributes were used to build pnacl-sz.
 SHOW_BUILD_ATTS = $(OBJDIR)/pnacl-sz --build-atts
 
 # Creates symbolic link so that testing is easier. Also runs
 # pnacl-sz to verify that the defines flags have valid values,
 # as well as describe the corresponding build attributes.
 make_symlink: $(OBJDIR)/pnacl-sz
         rm -rf pnacl-sz
         ln -s $(OBJDIR)/pnacl-sz
         @echo "Build Attributes:"
         @$(SHOW_BUILD_ATTS)
 
+sb_make_symlink: $(SB_OBJDIR)/pnacl-sz.x8632.nexe \
+                 $(SB_OBJDIR)/pnacl-sz.x8664.nexe
+        rm -rf pnacl-sz.x8632.nexe pnacl-sz.x8664.nexe
+        ln -s $(SB_OBJDIR)/pnacl-sz.x8632.nexe
+        ln -s $(SB_OBJDIR)/pnacl-sz.x8664.nexe
+
 .PHONY: all compile_only make_symlink runtime bloat sb docs help \
   help-check-lit help-check-xtest
 
 compile_only: $(OBJS)
 
 $(OBJDIR)/pnacl-sz: $(OBJS)
         $(CXX) $(LDFLAGS) -o $@ $^ $(LLVM_LDFLAGS) \
           -Wl,-rpath=$(abspath $(LIBCXX_INSTALL_PATH)/lib)
 
-$(SB_OBJDIR)/pnacl-sz.x86-32.nexe: $(SB_OBJS)
-        $(eval PNACL_SZ_BASE := $(patsubst %.nexe, %, $@))
-        $(SB_CXX) $(SB_LDFLAGS) -o $(PNACL_SZ_BASE).nonfinal.pexe $^ \
-          $(SB_LLVM_LDFLAGS)
-        $(SB_TRANSLATE) -arch x86-32 $(PNACL_SZ_BASE).nonfinal.pexe -o $@ \
-          --allow-llvm-bitcode-input
+$(SB_OBJDIR)/pnacl-sz.nonfinal.pexe: $(SB_OBJS)
+        $(SB_CXX) $(SB_LDFLAGS) -o $@ $^ $(SB_LLVM_LDFLAGS)
+
+$(SB_OBJDIR)/pnacl-sz.pexe: $(SB_OBJDIR)/pnacl-sz.nonfinal.pexe
+        $(SB_FINALIZE) $^ -o $@
+
+$(SB_OBJDIR)/pnacl-sz.x8632.nexe: $(SB_OBJDIR)/pnacl-sz.pexe
+        $(SB_TRANSLATE) -arch x86-32 $^ -o $@
+

[John, 2016/02/25 02:36:56]

Arm32?? Totally optional, and up to you.

[Jim Stichnoth, 2016/02/25 05:32:20]

I thought to do that a little later, when there's a better chance for testing.

+$(SB_OBJDIR)/pnacl-sz.x8664.nexe: $(SB_OBJDIR)/pnacl-sz.pexe
+        $(SB_TRANSLATE) -arch x86-64 $^ -o $@
 
 src/IceRegistersARM32.def: pydir/gen_arm32_reg_tables.py
         python $< > $@
 
 # TODO(stichnot): Be more precise than "*.h" here and elsewhere.
 $(OBJS): $(OBJDIR)/%.o: src/%.cpp src/*.h src/*.def
         $(CXX) -c $(CXXFLAGS) $< -o $@
 
 $(SB_OBJS): $(SB_OBJDIR)/%.o: src/%.cpp src/*.h src/*.def
         $(SB_CXX) -c $(SB_CXXFLAGS) $< -o $@
@@ skipping 120 matching lines @@
 
 check-spec: $(ALLSPEC:=.spec2k)
 
 check: check-lit check-unit check-xtest
 
 check-presubmit presubmit:
 # Make sure clang-format gets run.
         +make -f Makefile.standalone format
 # Verify MINIMAL build, plus proper usage of REQUIRES in lit tests.
         +make -f Makefile.standalone \
-          MINIMAL=1 check
+          MINIMAL=1 sb check
 # Check that there are no g++ build errors or warnings.
         +make -f Makefile.standalone \
           GPLUSPLUS=1 compile_only
 # Check the x86 assembler unit tests.
         +make -f Makefile.standalone \
           DEBUG=1 CHECK_X86_ASM=1 check-unit
 # Run lit tests, cross tests, unit tests, and spec2k/x86-32.
         +make -f Makefile.standalone \
-          check check-spec
+          check check-spec sb
 # Run spec2k/x86-64.
         +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.
@@ skipping 45 matching lines @@
 help:
         @cat Makefile.standalone-help/help.txt
 
 help-check-lit:
         @cat Makefile.standalone-help/check-lit.txt
 
 help-check-xtest:
         @cat Makefile.standalone-help/check-xtest.txt
 
 clean:
-        rm -rf pnacl-sz *.o $(OBJDIR) $(SB_OBJDIR) build/pnacl-sz.bloat.json
+        rm -rf pnacl-sz pnacl-sz.x8632.nexe pnacl-sz.x8664.nexe *.o \
+          $(OBJDIR) $(SB_OBJDIR) build/pnacl-sz.bloat.json
 
 clean-all: clean
         rm -rf build/  crosstest/Output/