Changes from 3.7 merge to files not in upstream

include/llvm/Analysis/NaCl/PNaClABIVerifyFunctions.h

Index: include/llvm/Analysis/NaCl/PNaClABIVerifyFunctions.h
diff --git a/include/llvm/Analysis/NaCl/PNaClABIVerifyFunctions.h b/include/llvm/Analysis/NaCl/PNaClABIVerifyFunctions.h
index db9b99bd65b78e3386b3a1e2365278221819655d..f456d2ffd471aba55375ade520230705d5aa0843 100644
--- a/include/llvm/Analysis/NaCl/PNaClABIVerifyFunctions.h
+++ b/include/llvm/Analysis/NaCl/PNaClABIVerifyFunctions.h
@@ -28,8 +28,8 @@ namespace llvm {
 // Checks that examine anything in the function body should be in
 // FunctionPasses to make them streaming-friendly.
 class PNaClABIVerifyFunctions : public FunctionPass {
-  PNaClABIVerifyFunctions(const PNaClABIVerifyFunctions&) LLVM_DELETED_FUNCTION;
-  void operator=(const PNaClABIVerifyFunctions&) LLVM_DELETED_FUNCTION;
+  PNaClABIVerifyFunctions(const PNaClABIVerifyFunctions&) = delete;
+  void operator=(const PNaClABIVerifyFunctions&) = delete;
  public:
   static char ID;
   PNaClABIVerifyFunctions() :
@@ -51,7 +51,6 @@ class PNaClABIVerifyFunctions : public FunctionPass {
   }
   virtual void getAnalysisUsage(AnalysisUsage &Info) const {
     Info.setPreservesAll();
-    Info.addRequired<DataLayoutPass>();
   }
   bool runOnFunction(Function &F);
   virtual void print(raw_ostream &O, const Module *M) const;