Rebased PNaCl localmods in LLVM to 223109

Makefile.rules

 #===-- Makefile.rules - Common make rules 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 all of the LLVM makefiles.  For details on how to use
@@ skipping 304 matching lines @@
 endif
 
 ifeq ($(ENABLE_LIBCPP),1)
   CXX.Flags +=  -stdlib=libc++
   LD.Flags +=  -stdlib=libc++
 endif
 
 ifeq ($(ENABLE_CXX1Y),1)
   CXX.Flags += -std=c++1y
 else
-  ifeq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW))
-    # MinGW and Cygwin are a bit stricter and lack things like
-    # 'strdup', 'stricmp', etc in c++11 mode.
+  ifeq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW NativeClient))
+    # MinGW, Cygwin, and NativeClient+newlib are a bit stricter and
+    # lack things like 'strdup', 'stricmp', etc in c++11 mode.
     CXX.Flags += -std=gnu++11
  else
     CXX.Flags += -std=c++11
  endif
 endif
 
 ifeq ($(ENABLE_WERROR),1)
   CXX.Flags += -Werror
   C.Flags += -Werror
 endif
@@ skipping 319 matching lines @@
     ifneq ($(DARWIN_MAJVERS),4)
       LD.Flags += $(RPATH) -Wl,@executable_path/../lib
     endif
     ifeq ($(RC_XBS),YES)
       TempFile := $(shell mkdir -p ${OBJROOT}/dSYMs ; mktemp ${OBJROOT}/dSYMs/llvm-lto.XXXXXX)
       LD.Flags += -Wl,-object_path_lto -Wl,$(TempFile)
     endif
   endif
 endif
 
+#@LOCALMOD-BEGIN
+ifeq ($(PNACL_BROWSER_TRANSLATOR),1)
+  CPP.Flags += -DPNACL_BROWSER_TRANSLATOR
+  # NOTE: we specify --noirt to tell the driver that we should link
+  # against private (non-stable, non-IRT) libraries for the
+  # sandboxed translator.  This could have been specified directly,
+  # except that LLVM slips in -lpthread elsewhere in the build system,
+  # and we need it to use -lpthread_private instead.
+  LIBS += -Wl,--noirt -lsrpc -limc_syscalls -lplatform -lgio -lpthread
+  ifeq ($(USE_TCMALLOC),1)
+    # Note: -ltcmalloc_minimal needs to stay last on the link line
+    LIBS += -ltcmalloc_minimal
+    CXX.Flags += -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free
+    C.Flags += -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free
+  endif
+endif
+# @LOCALMOD-END
 
 #----------------------------------------------------------
 # Options To Invoke Tools
 #----------------------------------------------------------
 
 ifdef EXTRA_LD_OPTIONS
 LD.Flags += $(EXTRA_LD_OPTIONS)
 endif
 
 ifndef NO_PEDANTIC
@@ skipping 1478 matching lines @@
         $(Echo) "ProjLibsPaths: " '$(ProjLibsPaths)'
         $(Echo) "ProjLibsOptions: " '$(ProjLibsOptions)'
 
 ###
 # Debugging
 
 # General debugging rule, use 'make dbg-print-XXX' to print the
 # definition, value and origin of XXX.
 make-print-%:
         $(error PRINT: $(value $*) = "$($*)" (from $(origin $*)))