Changes from 3.7 merge to files not in upstream

lib/Transforms/NaCl/NoExitRuntime.cpp

 //===- NoExitRuntime.cpp - Expand i64 and wider integer types -------------===//

[jvoung (off chromium), 2015/05/26 20:39:45]

comment seems to be copy-pasted, but I guess that's from emscripten?

[Derek Schuff, 2015/05/26 22:01:32]

It is from emscripten, we should fix upstream

 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===------------------------------------------------------------------===//
 //
 //===------------------------------------------------------------------===//
 
 #include "llvm/ADT/PostOrderIterator.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/SmallString.h"
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/Analysis/ConstantFolding.h"
 #include "llvm/Analysis/InstructionSimplify.h"
 #include "llvm/IR/DataLayout.h"
 #include "llvm/IR/Function.h"
 #include "llvm/IR/IRBuilder.h"
 #include "llvm/IR/Instructions.h"
 #include "llvm/IR/IntrinsicInst.h"
 #include "llvm/IR/Module.h"
 #include "llvm/Pass.h"
 #include "llvm/IR/CFG.h"
-#include "llvm/Target/TargetLibraryInfo.h"
+#include "llvm/Analysis/TargetLibraryInfo.h"
 #include "llvm/Transforms/NaCl.h"
 #include "llvm/Transforms/Utils/Local.h"
 #include <map>
 
 #include "llvm/Support/raw_ostream.h"
 
 #ifdef NDEBUG
 #undef assert
 #define assert(x) { if (!(x)) report_fatal_error(#x); }
 #endif
@@ skipping 50 matching lines @@
   for (unsigned i = 0; i < ToErase.size(); i++) {
     ToErase[i]->eraseFromParent();
   }
 
   return true;
 }
 
 ModulePass *llvm::createNoExitRuntimePass() {
   return new NoExitRuntime();
 }
-