Changes from 3.7 merge to files not in upstream

include/llvm/Analysis/NaCl/PNaClABIVerifyModule.h

 //===- PNaClABIVerifyModule.h - Verify PNaCl ABI rules ----------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // Verify module-level PNaCl ABI requirements (specifically those that do not
 // require looking at the function bodies).
 //
 //
 //===----------------------------------------------------------------------===//
 
 #ifndef LLVM_ANALYSIS_NACL_PNACLABIVERIFYMODULE_H
 #define LLVM_ANALYSIS_NACL_PNACLABIVERIFYMODULE_H
 
 #include "llvm/ADT/StringMap.h"
 #include "llvm/Analysis/NaCl.h"
 #include "llvm/IR/Module.h"
 #include "llvm/Pass.h"
 
 namespace llvm {
 
 class PNaClAllowedIntrinsics;
 
 // This pass should not touch function bodies, to stay streaming-friendly
 class PNaClABIVerifyModule : public ModulePass {
-  PNaClABIVerifyModule(const PNaClABIVerifyModule&) LLVM_DELETED_FUNCTION;
-  void operator=(const PNaClABIVerifyModule&) LLVM_DELETED_FUNCTION;
+  PNaClABIVerifyModule(const PNaClABIVerifyModule&) = delete;
+  void operator=(const PNaClABIVerifyModule&) = delete;
  public:
   static char ID;
   PNaClABIVerifyModule() :
       ModulePass(ID),
       Reporter(new PNaClABIErrorReporter),
       ReporterIsOwned(true),
       StreamingMode(false),
       SeenEntryPoint(false) {
     initializePNaClABIVerifyModulePass(*PassRegistry::getPassRegistry());
   }
@@ skipping 25 matching lines @@
 
   void checkGlobalIsFlattened(const GlobalVariable *GV);
   PNaClABIErrorReporter *Reporter;
   bool ReporterIsOwned;
   bool StreamingMode;
   bool SeenEntryPoint;
 };
 
 }
 #endif  // LLVM_ANALYSIS_NACL_PNACLABIVERIFYMODULE_H