Use the installed/downloaded objdump instead of work-dir one.

Makefile.standalone

@@ -3,7 +3,8 @@
 # invocation of make, like:
 #
 #   make LLVM_SRC_PATH=<path> LLVM_BIN_PATH=<path> \
-#        LIBCXX_INSTALL_PATH=<path> CLANG_PATH=<path> ...
+#        LIBCXX_INSTALL_PATH=<path> CLANG_PATH=<path> \
+#        BINUTILS_BIN_PATH=<path> ...
 #
 
 # LLVM_SRC_PATH is the path to the root of the checked out source code. This
@@ -14,23 +15,30 @@
 LLVM_SRC_PATH ?= ../llvm
 
 # LLVM_BIN_PATH is the directory where binaries are placed by the LLVM build
-# process. It should contain the tools like opt, llc and clang. The default
-# reflects a debug build with autotools (configure & make).
+# process. It should contain the tools like clang, clang-format, llc,
+# llvm-as, llvm-config, llvm-mc, pnacl-bcdis, and pnacl-freeze.
+# It also contains developer libraries like libLLVMSupport.a.
+# The default reflects a configure + make build.
 LLVM_BIN_PATH ?= $(shell readlink -e \
 	../../out/llvm_x86_64_linux_work/Release+Asserts/bin)
 
-# LIBCXX_INSTALL_PATH is the directory where libc++ is located. It should
-# contain header files and corresponding libraries
-LIBCXX_INSTALL_PATH ?= $(shell readlink -e \
+# PNACL_TOOLCHAIN_ROOT is the location of the PNaCl toolchain.
+# This is used as the default root for finding binutils, libcxx, etc.
+PNACL_TOOLCHAIN_ROOT = $(shell readlink -e \
 	../../../toolchain/linux_x86/pnacl_newlib)
 
-# CLANG_PATH is the location of the clang compiler to use.
+# CLANG_PATH is the location of the clang compiler to use for building
+# the host binaries.
 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_work/binutils)
+# LIBCXX_INSTALL_PATH is the directory where libc++ is located. It should
+# contain header files and corresponding libraries. This is used for
+# building the host binaries in conjuction with clang.
+LIBCXX_INSTALL_PATH ?= $(PNACL_TOOLCHAIN_ROOT)
+
+# The location of binutils tools (e.g., objdump) for testing.
+BINUTILS_BIN_PATH ?= $(shell readlink -e $(PNACL_TOOLCHAIN_ROOT)/bin)
 
 HOST_ARCH ?= x86_64
 ifeq ($(HOST_ARCH),x86_64)
@@ -82,8 +90,9 @@ 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 PNACL_TOOLCHAIN_ROOT = $(PNACL_TOOLCHAIN_ROOT))
 $(info Using CLANG_PATH = $(CLANG_PATH))
+$(info Using LIBCXX_INSTALL_PATH = $(LIBCXX_INSTALL_PATH))
 $(info Using BINUTILS_BIN_PATH = $(BINUTILS_BIN_PATH))
 $(info Using HOST_ARCH     = $(HOST_ARCH))
 $(info -----------------------------------------------)
@@ -200,7 +209,7 @@ runtime: $(RT_OBJ)
 $(RT_OBJ): runtime.is.built
 runtime.is.built: $(RT_SRC)
 	@echo ================ Building Subzero runtime ================
-	./pydir/build-runtime.py -v
+	./pydir/build-runtime.py -v --pnacl-root $(PNACL_TOOLCHAIN_ROOT)
 
 check-lit: $(OBJDIR)/pnacl-sz make_symlink
 	LLVM_BIN_PATH=$(LLVM_BIN_PATH) \

pydir/build-runtime.py

@@ -37,12 +37,12 @@ def main():
     argparser.add_argument('--verbose', '-v', dest='verbose',
                            action='store_true',
                            help='Display some extra debugging output')
+    argparser.add_argument('--pnacl-root', dest='pnacl_root',
+                           help='Path to PNaCl toolchain binaries.')
     args = argparser.parse_args()
     nacl_root = FindBaseNaCl()
-    os.environ['PATH'] = (
-        '{root}/toolchain/linux_x86/pnacl_newlib/bin{sep}' +
-        '{path}'
-        ).format(root=nacl_root, sep=os.pathsep, path=os.environ['PATH'])
+    os.environ['PATH'] = ('{root}/bin{sep}{path}'
+        ).format(root=args.pnacl_root, sep=os.pathsep, path=os.environ['PATH'])
     srcdir = (
         '{root}/toolchain_build/src/subzero/runtime'
         ).format(root=nacl_root)

pydir/run-pnacl-sz.py

@@ -121,7 +121,7 @@ def main():
       cmd += ['-o', asm_temp.name]
     if args.disassemble:
       # Show wide instruction encodings, diassemble, and show relocs.
-      cmd += (['&&', os.path.join(binutils_bin_path, 'objdump')] +
+      cmd += (['&&', os.path.join(binutils_bin_path, 'le32-nacl-objdump')] +
               args.dis_flags +
               ['-w', '-d', '-r', '-Mintel', asm_temp.name])
 

tests_lit/lit.cfg

@@ -129,7 +129,7 @@ for tool in llvmbintools:
                         tool)
   config.substitutions.append((tool, substitution))
 
-binutilsbintools = [r"\bobjdump\b",]
+binutilsbintools = [r"\ble32-nacl-objdump\b",]
 
 for tool in binutilsbintools:
   # The re.sub() line is adapted from one of LLVM's lit.cfg files.

tests_lit/llvm2ice_tests/elf_container.ll

@@ -16,7 +16,7 @@
 
 ; Add a run that shows relocations in code inline.
 ; RUN: %p2i -i %s --filetype=obj --args -O2 --verbose none -o %t \
-; RUN:   && objdump -w -d -r -Mintel %t \
+; RUN:   && le32-nacl-objdump -w -d -r -Mintel %t \
 ; RUN:   | FileCheck --check-prefix=TEXT-RELOCS %s
 
 ; Use intrinsics to test external calls.