Adjust paths for host_x86_32/bin -> bin and for switch to 64-bit.

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/
 # directories of LLVM, Clang in tools/clang/, etc.
 # Alternatively, if you're building vs. a binary download of LLVM, then
 # LLVM_SRC_PATH can point to the main untarred directory.
 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).
 LLVM_BIN_PATH ?= $(shell readlink -e \
-        ../../out/llvm_i686_linux_work/Release+Asserts/bin)
+        ../../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 \
-        ../../../toolchain/linux_x86/pnacl_newlib/host_x86_32)
+        ../../../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)
 
-HOST_ARCH ?= x86
+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
 
 $(info -----------------------------------------------)
 $(info Using LLVM_SRC_PATH = $(LLVM_SRC_PATH))
@@ skipping 78 matching lines @@
   CLANG_FORMAT_DIFF = clang-format-diff.py
 else
   CLANG_FORMAT_DIFF = /usr/lib/clang-format/clang-format-diff.py
 endif
 format-diff:
         git diff -U0 `git merge-base HEAD master` | \
         $(CLANG_FORMAT_DIFF) -p1 -style=LLVM -i
 
 clean:
         rm -rf llvm2ice *.o build/