Subzero: switch from llvm-objdump to objdump for lit tests (for LLVM merge)

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 10 matching lines @@
 
 # LIBCXX_INSTALL_PATH is the directory where libc++ is located. It should
 # contain header files and corresponding libraries
 LIBCXX_INSTALL_PATH ?= $(shell readlink -e \
         ../../../toolchain/linux_x86/pnacl_newlib)
 
 # CLANG_PATH is the location of the clang compiler to use.
 CLANG_PATH ?= $(shell readlink -e \
         ../../../../third_party/llvm-build/Release+Asserts/bin)
 
+# The location of binutils tools (e.g., objdump).
+BINUTILS_BIN_PATH ?= $(shell readlink -e \
+        ../../out/binutils_pnacl_x86_64_linux_install/bin)

[Karl, 2015/02/16 18:50:13]

Why is this different than other lines suchas LLVM_PATH (i.e. uses
...linux_work/Release+Asserts/bin versus ....linux_install/bin). Shouldn't we
consistently be using one or the other (i.e. work or install directories)?

[jvoung (off chromium), 2015/02/17 22:17:04]

Okay making it the work directory too (I originally had trouble finding where
the binary was, then used "find").

+
 HOST_ARCH ?= x86_64
 ifeq ($(HOST_ARCH),x86_64)
   HOST_FLAGS = -m64 -stdlib=libc++
 else
   ifeq ($(HOST_ARCH),x86)
     HOST_FLAGS = -m32 -stdlib=libc++
   endif
 endif
 
 ifdef DEBUG
@@ skipping 32 matching lines @@
   OBJDIR := $(OBJDIR)+TSan
   CXX_EXTRA += -fsanitize=thread
   LD_EXTRA += -fsanitize=thread
 endif
 
 $(info -----------------------------------------------)
 $(info Using LLVM_SRC_PATH = $(LLVM_SRC_PATH))
 $(info Using LLVM_BIN_PATH = $(LLVM_BIN_PATH))
 $(info Using LIBCXX_INSTALL_PATH = $(LIBCXX_INSTALL_PATH))
 $(info Using CLANG_PATH = $(CLANG_PATH))
+$(info Using BINUTILS_BIN_PATH = $(BINUTILS_BIN_PATH))
 $(info Using HOST_ARCH     = $(HOST_ARCH))
 $(info -----------------------------------------------)
 
 LLVM_CXXFLAGS := `$(LLVM_BIN_PATH)/llvm-config --cxxflags`
 LLVM_LDFLAGS := `$(LLVM_BIN_PATH)/llvm-config --libs` \
                 `$(LLVM_BIN_PATH)/llvm-config --ldflags` \
                 `$(LLVM_BIN_PATH)/llvm-config --system-libs`
 
 # It's recommended that CXX matches the compiler you used to build LLVM itself.
 CCACHE := `command -v ccache`
@@ skipping 88 matching lines @@
 $(UNITTEST_OBJS): | $(OBJDIR)/unittest
 
 $(OBJDIR):
         @mkdir -p $@
 
 $(OBJDIR)/unittest: $(OBJDIR)
         @mkdir -p $@
 
 check-lit: $(OBJDIR)/llvm2ice 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
         @echo "Crosstests ignored, minimal build"
 else
 check: check-lit check-unit
@@ skipping 16 matching lines @@
 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
 
 clean:
         rm -rf llvm2ice *.o $(OBJDIR) build/llvm2ice.bloat.json
 
 clean-all: clean
         rm -rf build/