Subzero: Change the name llvm2ice to the more appropriate pnacl-sz.

Makefile.standalone

Index: Makefile.standalone
diff --git a/Makefile.standalone b/Makefile.standalone
index 5f652bdc9a2c53547b95efe6528dc43a22e960eb..afaec7e4f03c3bedb46c804bbf83cf92acb84e3e 100644
--- a/Makefile.standalone
+++ b/Makefile.standalone
@@ -127,7 +127,7 @@ SRCS = \
 	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
@@ -143,23 +143,23 @@ UNITTEST_SRCS = \
 	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)
 
@@ -202,7 +202,7 @@ 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
@@ -232,12 +232,12 @@ format-diff:
 	-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/