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..76b1d144ee89139b5188f53d50b121f37017f88d 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

[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
 
@@ -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 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 +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