Allow pnacl-sz to be compiled to textual bitcode records.

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 86 matching lines @@
 endif
 
 ifdef TSAN
   OBJDIR := $(OBJDIR)+TSan
   CXX_EXTRA += -fsanitize=thread
   LD_EXTRA += -fsanitize=thread
 endif
 
 SB_OBJDIR := $(OBJDIR)+Sandboxed
 
+ifdef TEXTUAL_BITCODE
+  TEXTBC_DEFS = -DINPUT_IS_TEXTUAL_BITCODE

[Jim Stichnoth, 2015/06/21 07:09:34]

Do this like ALLOW_DUMP, i.e.
  -DINPUT_IS_TEXTUAL_BITCODE=1

[Karl, 2015/06/22 19:52:01]

Done.

+  OBJDIR := $(OBJDIR)+Tbc
+  TEXTBC_LIBS = -LLVMNaClBitTestUtils
+else
+  TEXTBC_DEFS =

[Jim Stichnoth, 2015/06/21 07:09:34]

and
  -DINPUT_IS_TEXTUAL_BITCODE=0

Then in the code, use #if instead of #ifdef, or when possible, use
  if (INPUT_IS_TEXTUAL_BITCODE) {...}
so that as much code as possible gets compiled (but trivially dead-code
eliminated) under all configurations, to avoid rot.

[Karl, 2015/06/22 19:52:01]

Done.

+  TEXTBC_LIBS =
+endif
+
+
 $(info -----------------------------------------------)
 $(info Using LLVM_SRC_PATH = $(LLVM_SRC_PATH))
 $(info Using SB_LLVM_PATH = $(SB_LLVM_PATH))
 $(info Using NACL_ROOT = $(NACL_ROOT))
 $(info Using TOOLCHAIN_ROOT = $(TOOLCHAIN_ROOT))
 $(info Using PNACL_TOOLCHAIN_ROOT = $(PNACL_TOOLCHAIN_ROOT))
 $(info Using PNACL_BIN_PATH = $(PNACL_BIN_PATH))
 $(info Using CLANG_PATH = $(CLANG_PATH))
 $(info Using LIBCXX_INSTALL_PATH = $(LIBCXX_INSTALL_PATH))
 $(info Using HOST_ARCH     = $(HOST_ARCH))
 $(info -----------------------------------------------)
 
 LLVM_CXXFLAGS := `$(PNACL_BIN_PATH)/llvm-config --cxxflags`
 SB_LLVM_CXXFLAGS := $(LLVM_CXXFLAGS)
 
 # Listing specific libraries that are needed for pnacl-sz
 # and the unittests, since we build "tools-only" for the
 # sandboxed_translators (which doesn't include every library
 # listed by llvm-config).
 
 LLVM_LIBS_LIST := -lLLVMIRReader -lLLVMBitReader -lLLVMNaClBitTestUtils \
     -lLLVMNaClBitReader -lLLVMNaClBitAnalysis -lLLVMNaClBitWriter \
     -lLLVMAsmParser -lLLVMNaClAnalysis -lLLVMCore -lLLVMSupport
 
 ifeq ($(AUTOCONF), 0)
   # LLVM cmake build
-  LLVM_LIBS := $(LLVM_LIBS_LIST)
+  LLVM_LIBS := $(LLVM_LIBS_LIST) $(TEXTBC_LIBS)
   # For the cmake build, the gtest libs end up in the same place as the LLVM
   # libs, so no "-L..." arg is needed.
   GTEST_LIB_PATH ?=
   CLANG_FORMAT_PATH ?= $(PNACL_BIN_PATH)
 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) \
                    -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
 
 BASE_CXXFLAGS := -std=gnu++11 -Wall -Wextra -Werror -fno-rtti \
         -fno-exceptions $(OPTLEVEL) $(ASSERTIONS) -g -pedantic \
         -Wno-error=unused-parameter $(CXX_EXTRA)
 
 CXXFLAGS := $(LLVM_CXXFLAGS) $(BASE_CXXFLAGS) $(CXX_DEFINES) $(HOST_FLAGS) \
-        $(STDLIB_FLAGS)
+        $(STDLIB_FLAGS) $(TEXTBC_DEFS)
 SB_CXXFLAGS := $(SB_LLVM_CXXFLAGS) $(BASE_CXXFLAGS) $(SB_CXX_DEFINES)
 
 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)
 
 SRCS = \
         IceAssembler.cpp \
         IceAssemblerX8632.cpp \
@@ skipping 46 matching lines @@
 # 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
 endif
 
+# SHOW_BUILD_ATTS is an executable that is run to show what build
+# attributes were used to the build pnacl-sz.
+ifdef TEXTUAL_BITCODE
+  SHOW_BUILD_ATTS = echo "Can't show build attributes when TEXTUAL_BITCODE=1"
+else
+  SHOW_BUILD_ATTS = $(OBJDIR)/pnacl-sz --build-atts
+endif
+
 # 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:"
-        @$(OBJDIR)/pnacl-sz --build-atts
+        @$(SHOW_BUILD_ATTS)
 
 .PHONY: all make_symlink runtime bloat sb
 
 $(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 $^ \
@@ skipping 90 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) $(SB_OBJDIR) build/pnacl-sz.bloat.json
 
 clean-all: clean
         rm -rf build/