Refactor Subzero initialization and add a browser callback handler.

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> LLVM_BIN_PATH=<path> \
 #        LIBCXX_INSTALL_PATH=<path> CLANG_PATH=<path> \
 #        BINUTILS_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/
 # directories of LLVM, Clang in tools/clang/, etc.
 # Alternatively, if you're building vs. a binary download of LLVM, then
 # LLVM_SRC_PATH can point to the main untarred directory.
 LLVM_SRC_PATH ?= ../llvm
 
 # LLVM_BIN_PATH is the directory where binaries are placed by the LLVM build
 # process. It should contain the tools like clang, clang-format, llc,
 # llvm-as, llvm-config, llvm-mc, pnacl-bcdis, and pnacl-freeze.
 # It also contains developer libraries like libLLVMSupport.a.
 # The default reflects a configure + make build.
 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
 # building the host binaries in conjuction with clang.
 LIBCXX_INSTALL_PATH ?= $(PNACL_TOOLCHAIN_ROOT)
 
 # The location of binutils tools (e.g., objdump) for testing.
 BINUTILS_BIN_PATH ?= $(shell readlink -e $(PNACL_TOOLCHAIN_ROOT)/bin)
 
 HOST_ARCH ?= x86_64
@@ skipping 16 matching lines @@
 # The list of CXX defines that are dependent on build parameters.
 CXX_DEFINES =
 CXX_EXTRA =
 LD_EXTRA =
 
 ifdef MINIMAL
   NOASSERT = 1
   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
   ASSERTIONS = -DNDEBUG
 else
   ASSERTIONS =
   OBJDIR := $(OBJDIR)+Asserts
 endif
 
 ifdef TSAN
   OBJDIR := $(OBJDIR)+TSan
   CXX_EXTRA += -fsanitize=thread
   LD_EXTRA += -fsanitize=thread
 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))
 $(info Using BINUTILS_BIN_PATH = $(BINUTILS_BIN_PATH))
 $(info Using HOST_ARCH     = $(HOST_ARCH))
 $(info -----------------------------------------------)
 
 LLVM_CXXFLAGS := `$(LLVM_BIN_PATH)/llvm-config --cxxflags`
 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++
 
 CXXFLAGS := $(LLVM_CXXFLAGS) -std=gnu++11 -Wall -Wextra -Werror -fno-rtti \
         -fno-exceptions $(OPTLEVEL) $(ASSERTIONS) $(CXX_DEFINES) -g \
         $(HOST_FLAGS) -pedantic -Wno-error=unused-parameter \
         -I$(LIBCXX_INSTALL_PATH)/include/c++/v1 $(CXX_EXTRA)
 LDFLAGS := $(HOST_FLAGS) -L$(LIBCXX_INSTALL_PATH)/lib -Wl,--gc-sections \
         $(LD_EXTRA)
 
 SRCS = \
         assembler.cpp \
         assembler_ia32.cpp \
+        IceBrowserCompileServer.cpp \
         IceCfg.cpp \
         IceCfgNode.cpp \
+        IceCompiler.cpp \
+        IceCompileServer.cpp \
         IceELFObjectWriter.cpp \
         IceELFSection.cpp \
         IceFixups.cpp \
         IceGlobalContext.cpp \
         IceGlobalInits.cpp \
         IceInst.cpp \
         IceInstX8632.cpp \
         IceIntrinsics.cpp \
         IceLiveness.cpp \
         IceOperand.cpp \
@@ skipping 118 matching lines @@
 bloat: make_symlink
         nm -C -S -l pnacl-sz | \
         bloat/bloat.py --nm-output=/dev/stdin syms > build/pnacl-sz.bloat.json
         @echo See Subzero size breakdown in bloat/pnacl-sz.bloat.html
 
 clean:
         rm -rf pnacl-sz *.o $(OBJDIR) build/pnacl-sz.bloat.json
 
 clean-all: clean
         rm -rf build/