Refactor Subzero initialization and add a browser callback handler.

Makefile.standalone

Index: Makefile.standalone
diff --git a/Makefile.standalone b/Makefile.standalone
index 22273501943f5e249c8f15021ae24381254264dc..f4f1066ed71f9fa178c256fa0c53a7cd96063ac8 100644
--- a/Makefile.standalone
+++ b/Makefile.standalone
@@ -22,15 +22,18 @@ LLVM_SRC_PATH ?= ../llvm
 LLVM_BIN_PATH ?= $(shell readlink -e \
 	../../out/llvm_x86_64_linux_work/Release+Asserts/bin)
 
+# NACL_ROOT is the root of the native client repository.
+NACL_ROOT= $(shell readlink -e ../../../)

[Jim Stichnoth, 2015/03/13 04:55:00]

Maybe we can do something like this?

python -c "import sys; sys.path.insert(0, 'pydir'); import utils; print
utils.FindBaseNaCl()"

or maybe there's a more attractive way of doing it.

[jvoung (off chromium), 2015/03/18 15:39:09]

Done.

Another similar way would be to outline the snippet to a tiny wrapper script
like "pydir/find_nacl_base.py".

+
 # PNACL_TOOLCHAIN_ROOT is the location of the PNaCl toolchain.
 # This is used as the default root for finding binutils, libcxx, etc.
 PNACL_TOOLCHAIN_ROOT = $(shell readlink -e \
-	../../../toolchain/linux_x86/pnacl_newlib)
+	$(NACL_ROOT)/toolchain/linux_x86/pnacl_newlib)
 
 # CLANG_PATH is the location of the clang compiler to use for building
 # the host binaries.
 CLANG_PATH ?= $(shell readlink -e \
-	../../../../third_party/llvm-build/Release+Asserts/bin)
+	$(NACL_ROOT)/../third_party/llvm-build/Release+Asserts/bin)
 
 # LIBCXX_INSTALL_PATH is the directory where libc++ is located. It should
 # contain header files and corresponding libraries. This is used for
@@ -67,11 +70,11 @@ ifdef MINIMAL
   OBJDIR := $(OBJDIR)+Min
   CXX_DEFINES += -DALLOW_DUMP=0 -DALLOW_LLVM_CL=0 -DALLOW_LLVM_IR=0 \
 	-DALLOW_LLVM_IR_AS_INPUT=0 -DALLOW_DISABLE_IR_GEN=0 \
-        -DALLOW_MINIMAL_BUILD=1
+        -DALLOW_MINIMAL_BUILD=1 -DPNACL_BROWSER_TRANSLATOR=0
 else
   CXX_DEFINES += -DALLOW_DUMP=1 -DALLOW_LLVM_CL=1 -DALLOW_LLVM_IR=1 \
 	-DALLOW_LLVM_IR_AS_INPUT=1 -DALLOW_DISABLE_IR_GEN=1 \
-        -DALLOW_MINIMAL_BUILD=0
+        -DALLOW_MINIMAL_BUILD=0 -DPNACL_BROWSER_TRANSLATOR=0
 endif
 
 ifdef NOASSERT
@@ -90,6 +93,7 @@ endif
 $(info -----------------------------------------------)
 $(info Using LLVM_SRC_PATH = $(LLVM_SRC_PATH))
 $(info Using LLVM_BIN_PATH = $(LLVM_BIN_PATH))
+$(info Using NACL_ROOT = $(NACL_ROOT))
 $(info Using PNACL_TOOLCHAIN_ROOT = $(PNACL_TOOLCHAIN_ROOT))
 $(info Using CLANG_PATH = $(CLANG_PATH))
 $(info Using LIBCXX_INSTALL_PATH = $(LIBCXX_INSTALL_PATH))
@@ -102,6 +106,9 @@ LLVM_LDFLAGS := `$(LLVM_BIN_PATH)/llvm-config --libs` \
                 `$(LLVM_BIN_PATH)/llvm-config --ldflags` \
                 `$(LLVM_BIN_PATH)/llvm-config --system-libs`
 
+# TODO(jvoung): Make a standalone build target w/ DPNACL_BROWSER_TRANSLATOR=1
+# with CXX=pnacl-clang++, and the right flags.
+
 # It's recommended that CXX matches the compiler you used to build LLVM itself.
 CCACHE := `command -v ccache`
 CXX := CCACHE_CPP2=yes $(CCACHE) $(CLANG_PATH)/clang++
@@ -116,8 +123,11 @@ LDFLAGS := $(HOST_FLAGS) -L$(LIBCXX_INSTALL_PATH)/lib -Wl,--gc-sections \
 SRCS = \
 	assembler.cpp \
 	assembler_ia32.cpp \
+	IceBrowserCompileServer.cpp \
 	IceCfg.cpp \
 	IceCfgNode.cpp \
+	IceCompiler.cpp \
+	IceCompileServer.cpp \
 	IceELFObjectWriter.cpp \
 	IceELFSection.cpp \
 	IceFixups.cpp \