Changes from 3.7 merge to files not in upstream

tools/pnacl-abicheck/pnacl-abicheck.cpp

Index: tools/pnacl-abicheck/pnacl-abicheck.cpp
diff --git a/tools/pnacl-abicheck/pnacl-abicheck.cpp b/tools/pnacl-abicheck/pnacl-abicheck.cpp
index 20c80637dbfd46d92d71a482b33ede568b3dff35..ed326b5332495a42fae368d93626eeed4a07d2c5 100644
--- a/tools/pnacl-abicheck/pnacl-abicheck.cpp
+++ b/tools/pnacl-abicheck/pnacl-abicheck.cpp
@@ -17,7 +17,7 @@
 #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"
@@ -87,8 +87,8 @@ int main(int argc, char **argv) {
   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();