Rebased PNaCl localmods in LLVM to 223109

Makefile.config.in

 #===-- Makefile.config - Local configuration for LLVM ------*- Makefile -*--===#
 #
 #                     The LLVM Compiler Infrastructure
 #
 # This file is distributed under the University of Illinois Open Source
 # License. See LICENSE.TXT for details.
 #
 #===------------------------------------------------------------------------===#
 #
 # This file is included by Makefile.common.  It defines paths and other
@@ skipping 45 matching lines @@
 LLVM_SRC_ROOT   := $(call realpath, @abs_top_srcdir@)
 LLVM_OBJ_ROOT   := $(call realpath, @abs_top_builddir@)
 PROJ_SRC_ROOT   := $(LLVM_SRC_ROOT)
 PROJ_SRC_DIR    := $(LLVM_SRC_ROOT)$(patsubst $(PROJ_OBJ_ROOT)%,%,$(PROJ_OBJ_DIR))
 
 ifneq ($(CLANG_SRC_ROOT),)
   CLANG_SRC_ROOT:= $(call realpath, $(CLANG_SRC_ROOT))
   PROJ_SRC_DIR  := $(patsubst $(LLVM_SRC_ROOT)/tools/clang%,$(CLANG_SRC_ROOT)%,$(PROJ_SRC_DIR))
 endif
 
+ifneq ($(SUBZERO_SRC_ROOT),)
+  PROJ_SRC_DIR  := $(patsubst $(LLVM_SRC_ROOT)/tools/subzero%,$(SUBZERO_SRC_ROOT)%,$(PROJ_SRC_DIR))
+endif
+
 prefix          := @prefix@
 PROJ_prefix     := $(prefix)
 program_prefix  := @program_prefix@
 PROJ_VERSION    := $(LLVMVersion)
 else
 ifndef PROJ_SRC_ROOT
 $(error Projects must define PROJ_SRC_ROOT)
 endif
 ifndef PROJ_OBJ_ROOT
 $(error Projects must define PROJ_OBJ_ROOT)
@@ skipping 340 matching lines @@
 
 # Flags to control building support for OProfile JIT API
 USE_OPROFILE := @USE_OPROFILE@
 
 ifeq ($(USE_INTEL_JITEVENTS), 1)
   OPTIONAL_COMPONENTS += IntelJITEvents
 endif
 ifeq ($(USE_OPROFILE), 1)
   OPTIONAL_COMPONENTS += OProfileJIT
 endif