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

Makefile.standalone

Index: Makefile.standalone
diff --git a/Makefile.standalone b/Makefile.standalone
index 5f2686ba8f7788db34b49715bed3689905a65640..c90641368ea0abd6f17feb6bc35eb2e6919aebd7 100644
--- a/Makefile.standalone
+++ b/Makefile.standalone
@@ -86,6 +86,15 @@ else
     -DALLOW_MINIMAL_BUILD=0
 endif
 
+ifdef TEXTUAL_BITCODE
+  BASE_CXX_DEFINES += -DINPUT_IS_TEXTUAL_BITCODE=1
+  OBJDIR := $(OBJDIR)+Tbc
+  TEXTBC_LIBS = -LLVMNaClBitTestUtils
+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
 
@@ -130,7 +139,7 @@ LLVM_LIBS_LIST := -lLLVMIRReader -lLLVMBitReader -lLLVMNaClBitTestUtils \
 
 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 ?=
@@ -225,6 +234,14 @@ 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.

[Jim Stichnoth, 2015/06/22 20:02:47]

"to the" ==> "to" ?

[Karl, 2015/06/22 20:20:37]

Done.

+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.
@@ -232,7 +249,7 @@ 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