Changes from 3.7 merge to files not in upstream

lib/Transforms/NaCl/ResolvePNaClIntrinsics.cpp

 //===- ResolvePNaClIntrinsics.cpp - Resolve calls to PNaCl intrinsics ----====//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This pass resolves calls to PNaCl stable bitcode intrinsics. It is
@@ skipping 13 matching lines @@
 #include "llvm/IR/InlineAsm.h"
 #include "llvm/IR/Instructions.h"
 #include "llvm/IR/IntrinsicInst.h"
 #include "llvm/IR/Intrinsics.h"
 #include "llvm/IR/Module.h"
 #include "llvm/IR/NaClAtomicIntrinsics.h"
 #include "llvm/IR/Value.h"
 #include "llvm/Pass.h"
 #include "llvm/Support/Compiler.h"
 #include "llvm/Support/Debug.h"
+#include "llvm/Support/raw_ostream.h"
 #include "llvm/Transforms/NaCl.h"
 #include "llvm/Transforms/Utils/Local.h"
 #if defined(PNACL_BROWSER_TRANSLATOR)
 #include "native_client/src/untrusted/nacl/pnacl.h"
 #endif
 
 using namespace llvm;
 
 namespace {
 class ResolvePNaClIntrinsics : public FunctionPass {
@@ skipping 435 matching lines @@
   return Changed;
 }
 
 char ResolvePNaClIntrinsics::ID = 0;
 INITIALIZE_PASS(ResolvePNaClIntrinsics, "resolve-pnacl-intrinsics",
                 "Resolve PNaCl intrinsic calls", false, false)
 
 FunctionPass *llvm::createResolvePNaClIntrinsicsPass() {
   return new ResolvePNaClIntrinsics();
 }