Changes from 3.7 merge to files not in upstream

lib/Transforms/NaCl/PNaClABISimplify.cpp

 //===-- PNaClABISimplify.cpp - Lists PNaCl ABI simplification passes ------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This file implements the meta-passes "-pnacl-abi-simplify-preopt"
 // and "-pnacl-abi-simplify-postopt".  It lists their constituent
 // passes.
 //
 //===----------------------------------------------------------------------===//
 
 #include "llvm/ADT/Triple.h"
 #include "llvm/Analysis/NaCl.h"
-#include "llvm/PassManager.h"
+#include "llvm/IR/LegacyPassManager.h"
 #include "llvm/Transforms/IPO.h"
 #include "llvm/Transforms/NaCl.h"
 #include "llvm/Transforms/Scalar.h"
 
 using namespace llvm;
 
 static cl::opt<bool>
 EnableSjLjEH("enable-pnacl-sjlj-eh",
              cl::desc("Enable use of SJLJ-based C++ exception handling "
                       "as part of the pnacl-abi-simplify passes"),
@@ skipping 201 matching lines @@
   if (!isEmscripten) // Dead prototypes ignored by JSBackend.
     PM.add(createStripDeadPrototypesPass());
 
   // Eliminate simple dead code that the post-opt passes could have created.
   PM.add(createDeadCodeEliminationPass());
 
   // This should be the last step before PNaCl ABI validation.
   if (!isEmscripten)
     PM.add(createCleanupUsedGlobalsMetadataPass());
 }