Modify how textual bitcode is injected into pnacl-sz.

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

[Karl, 2015/07/21 21:07:01]

Removed this. No longer a build flag (its now a CL flag).

-  BASE_CXX_DEFINES += -DINPUT_IS_TEXTUAL_BITCODE=1
+  BASE_CXX_DEFINES += -DACCEPT_TEXTUAL_PNACL_BITCODE=1
   OBJDIR := $(OBJDIR)+Tbc
 else
-  BASE_CXX_DEFINES += -DINPUT_IS_TEXTUAL_BITCODE=0
+  BASE_CXX_DEFINES += -DACCEPT_TEXTUAL_PNACL_BITCODE=0
 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
@@ skipping 124 matching lines @@
 
 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

[Karl, 2015/07/21 21:07:01]

Simplified this. TEXTUAL_BITCODE is no longer a build option, only a CL flag.

   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
@@ skipping 108 matching lines @@
 
 docs:
         doxygen Doxyfile
         @echo See file://`pwd`/docs/html/index.html
 
 clean:
         rm -rf pnacl-sz *.o $(OBJDIR) $(SB_OBJDIR) build/pnacl-sz.bloat.json
 
 clean-all: clean
         rm -rf build/ docs/