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 68 matching lines @@
   OBJDIR := $(OBJDIR)+Min
   BASE_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
 else
   BASE_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
 endif
 
+ifdef TEXTUAL_BITCODE
+  BASE_CXX_DEFINES += -DINPUT_IS_TEXTUAL_BITCODE=1
+  OBJDIR := $(OBJDIR)+Tbc
+  TEXTBC_LIBS = -LLVMNaClBitTestUtils

[jvoung (off chromium), 2015/06/23 22:17:35]

Is this intended to be -LLVM... or should this be -lLLVM...?

Also, isn't it in the LLVM_LIBS_LIST below already? Or is there a link order
issue?

[Karl, 2015/06/23 22:49:51]

(1) I added it because it wasn't in LLVM_LIBS_LIST, and

(2) I didn't want to add it if you are building the sandboxed version of
pnacl-sz.

[jvoung (off chromium), 2015/06/24 01:30:59]

But it is in LLVM_LIBS_LIST? Or am I reading this wrong?

The "-lLLVMNaClBitTestUtils" version is there (just not the
"-LLVMNaClBitTestUtils").
In that case, it shouldn't be in LLVM_LIBS_LIST then (if you agree with my reply
to (1))?

However, it should also be harmless for code size as long as the sandboxed
version doesn't reference code or data from that library, if code size is the
concern.

[Karl, 2015/06/24 15:11:50]

You are right. I didn't see it. I must be blind! I did check using nm, and
nothing is included from that library if you compile just a minimal build. So my
assumption is it isn't a problem.

However, it is worth cleaning up the makefile, and will submit a CL to do this
later today.

+else
+  BASE_CXX_DEFINES += -DINPUT_IS_TEXTUAL_BITCODE=0
+  TEXTBC_LIBS =
+endif
+
 SB_CXX_DEFINES := $(BASE_CXX_DEFINES) -DPNACL_BROWSER_TRANSLATOR=1
 CXX_DEFINES := $(BASE_CXX_DEFINES) -DPNACL_BROWSER_TRANSLATOR=0
 
 ifdef NOASSERT
   ASSERTIONS = -DNDEBUG
 else
   ASSERTIONS =
   OBJDIR := $(OBJDIR)+Asserts
 endif
 
@@ skipping 24 matching lines @@
 # 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
@@ skipping 74 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 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/