Subzero: Change the name llvm2ice to the more appropriate 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> LLVM_BIN_PATH=<path> \
 #        LIBCXX_INSTALL_PATH=<path> CLANG_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 109 matching lines @@
         IceLiveness.cpp \
         IceOperand.cpp \
         IceRegAlloc.cpp \
         IceRNG.cpp \
         IceTargetLowering.cpp \
         IceTargetLoweringX8632.cpp \
         IceThreading.cpp \
         IceTimerTree.cpp \
         IceTranslator.cpp \
         IceTypes.cpp \
-        llvm2ice.cpp \
+        main.cpp \

[Karl, 2015/02/26 17:03:34]

Should the tab be removed here?

[Jim Stichnoth, 2015/02/26 17:11:33]

Tabs are required in makefiles.  The other files also have tabs, but they're
just not highlighted in this view.

[Jim Stichnoth, 2015/02/26 17:13:43]

Sorry, to clarify, I mean the other .cpp files in the list above main.cpp.  (not
the actual contents of non-makefiles)

[Karl, 2015/02/26 17:18:28]

Not for line 130! Like the previous 22 lines that doesn't have one.

[Jim Stichnoth, 2015/02/26 17:31:15]

Please check your local copy of Makefile.standalone, you will find that lines
108-131 all start with a tab character.  Rietveld only highlights tab characters
in lines that were changed.

I looked at the rules again, and it seems that a tab character is only required
for commands, so assignment lines like this could get away with spaces only. 
That's probably a good idea (with 2-space indentation), but for a separate CL. 
(Maybe the same CL that fixes our python scripts to use 2-space indents...)

         PNaClTranslator.cpp
 
 ifndef MINIMAL
   SRCS += IceConverter.cpp \
         IceTypeConverter.cpp
 endif
 
 OBJS=$(patsubst %.cpp, $(OBJDIR)/%.o, $(SRCS))
 
 UNITTEST_SRCS = \
         BitcodeMunge.cpp \
         IceELFSectionTest.cpp \
         IceParseInstsTest.cpp
 
 UNITTEST_OBJS = $(patsubst %.cpp, $(OBJDIR)/unittest/%.o, $(UNITTEST_SRCS))
-UNITTEST_LIB_OBJS = $(filter-out $(OBJDIR)/llvm2ice.o,$(OBJS))
+UNITTEST_LIB_OBJS = $(filter-out $(OBJDIR)/main.o,$(OBJS))
 
 # Keep all the first target so it's the default.
-all: $(OBJDIR)/llvm2ice make_symlink runtime
+all: $(OBJDIR)/pnacl-sz make_symlink runtime
 
 # Creates symbolic link so that testing is easier. Also runs
-# llvm2ice to verify that the defines flags have valid values,
+# pnacl-sz to verify that the defines flags have valid values,
 # as well as describe the corresponding build attributes.
-make_symlink: $(OBJDIR)/llvm2ice
-        rm -rf llvm2ice
-        ln -s $(OBJDIR)/llvm2ice
+make_symlink: $(OBJDIR)/pnacl-sz
+        rm -rf pnacl-sz
+        ln -s $(OBJDIR)/pnacl-sz
         @echo "Build Attributes:"
-        @$(OBJDIR)/llvm2ice --build-atts
+        @$(OBJDIR)/pnacl-sz --build-atts
 
 .PHONY: all make_symlink runtime bloat
 
-$(OBJDIR)/llvm2ice: $(OBJS)
+$(OBJDIR)/pnacl-sz: $(OBJS)
         $(CXX) $(LDFLAGS) -o $@ $^ $(LLVM_LDFLAGS) \
                -Wl,-rpath=$(abspath $(LIBCXX_INSTALL_PATH)/lib)
 
 # TODO(stichnot): Be more precise than "*.h" here and elsewhere.
 $(OBJS): $(OBJDIR)/%.o: src/%.cpp src/*.h src/*.def
         $(CXX) -c $(CXXFLAGS) $< -o $@
 
 $(OBJDIR)/run_unittests: $(UNITTEST_OBJS) $(UNITTEST_LIB_OBJS)
         $(CXX) $(LDFLAGS) -o $@ $^ $(LLVM_LDFLAGS) -lgtest -lgtest_main -ldl \
                -Wl,-rpath=$(abspath $(LIBCXX_INSTALL_PATH)/lib)
@@ skipping 22 matching lines @@
 runtime: $(RT_OBJ)
 
 # Use runtime.is.built so that build-runtime.py is invoked only once
 # even in a parallel build.
 .INTERMEDIATE: runtime.is.built
 $(RT_OBJ): runtime.is.built
 runtime.is.built: $(RT_SRC)
         @echo ================ Building Subzero runtime ================
         ./pydir/build-runtime.py -v
 
-check-lit: $(OBJDIR)/llvm2ice make_symlink
+check-lit: $(OBJDIR)/pnacl-sz make_symlink
         LLVM_BIN_PATH=$(LLVM_BIN_PATH) \
         BINUTILS_BIN_PATH=$(BINUTILS_BIN_PATH) \
         $(LLVM_SRC_PATH)/utils/lit/lit.py -sv tests_lit
 
 check-unit: $(OBJDIR)/run_unittests
         $(OBJDIR)/run_unittests
 
 ifdef MINIMAL
 check: check-lit check-unit runtime
         @echo "Crosstests ignored, minimal build"
 else
 check: check-lit check-unit runtime
         (cd crosstest; ./runtests.sh)
 endif
 
 FORMAT_BLACKLIST =
 # Add one of the following lines for each source file to ignore.
 FORMAT_BLACKLIST += ! -name IceParseInstsTest.cpp
 format:
         $(LLVM_BIN_PATH)/clang-format -style=LLVM -i \
         `find . -regex '.*\.\(c\|h\|cpp\)' $(FORMAT_BLACKLIST)`
 
 format-diff:
         git diff -U0 `git merge-base HEAD master` | \
         PATH=$(LLVM_BIN_PATH):$(PATH) \
         $(LLVM_SRC_PATH)/../clang/tools/clang-format/clang-format-diff.py \
         -p1 -style=LLVM -i
 
 bloat: make_symlink
-        nm -C -S -l llvm2ice | \
-        bloat/bloat.py --nm-output=/dev/stdin syms > build/llvm2ice.bloat.json
-        @echo See Subzero size breakdown in bloat/llvm2ice.bloat.html
+        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 llvm2ice *.o $(OBJDIR) build/llvm2ice.bloat.json
+        rm -rf pnacl-sz *.o $(OBJDIR) build/pnacl-sz.bloat.json
 
 clean-all: clean
         rm -rf build/