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..450cad4c217d73ed27822f9e2dbc8182b327ae24 100644
--- a/Makefile.standalone
+++ b/Makefile.standalone
@@ -104,6 +104,16 @@ 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))
@@ -130,7 +140,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 ?=
@@ -158,7 +168,7 @@ BASE_CXXFLAGS := -std=gnu++11 -Wall -Wextra -Werror -fno-rtti \
 	-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 \
@@ -225,6 +235,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.
+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 +250,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