Changes from 3.7 merge to files not in upstream

tools/pnacl-abicheck/pnacl-abicheck.cpp

 //===-- pnacl-abicheck.cpp - Check PNaCl bitcode ABI ----------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This tool checks files for compliance with the PNaCl bitcode ABI
 //
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Analysis/NaCl.h"
 #include "llvm/IR/DataLayout.h"
 #include "llvm/IR/LLVMContext.h"
 #include "llvm/IR/Module.h"
 #include "llvm/IRReader/IRReader.h"
 #include "llvm/Pass.h"
-#include "llvm/PassManager.h"
+#include "llvm/IR/LegacyPassManager.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/FormattedStream.h"
 #include "llvm/Support/SourceMgr.h"
 #include <string>
 
 using namespace llvm;
 
 static cl::opt<std::string>
 InputFilename(cl::Positional, cl::desc("<input bitcode>"), cl::init("-"));
 
@@ skipping 49 matching lines @@
   PNaClABIErrorReporter ABIErrorReporter;
   ABIErrorReporter.setNonFatal();
   bool ErrorsFound = false;
 
   std::unique_ptr<ModulePass> ModuleChecker(
       createPNaClABIVerifyModulePass(&ABIErrorReporter));
   ModuleChecker->doInitialization(*Mod);
   ModuleChecker->runOnModule(*Mod);
   ErrorsFound |= CheckABIVerifyErrors(ABIErrorReporter, "Module");
 
-  std::unique_ptr<FunctionPassManager> PM(new FunctionPassManager(&*Mod));
-  PM->add(new DataLayoutPass());
+  std::unique_ptr<legacy::FunctionPassManager> PM(
+      new legacy::FunctionPassManager(&*Mod));
   PM->add(createPNaClABIVerifyFunctionsPass(&ABIErrorReporter));
 
   PM->doInitialization();
   for (Module::iterator I = Mod->begin(), E = Mod->end(); I != E; ++I) {
     PM->run(*I);
     ErrorsFound |=
         CheckABIVerifyErrors(ABIErrorReporter, "Function " + I->getName());
   }
   PM->doFinalization();
 
   return ErrorsFound ? 1 : 0;
 }