Changes from 3.7 merge to files not in upstream

include/llvm/Analysis/NaCl.h

 //===-- NaCl.h - NaCl Analysis ---------------------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 
 #ifndef LLVM_ANALYSIS_NACL_H
 #define LLVM_ANALYSIS_NACL_H
 
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/raw_ostream.h"
 #include <string>
 
 namespace llvm {
 
 class FunctionPass;
 class ModulePass;
 extern cl::opt<bool> PNaClABIAllowDebugMetadata;
 
 class PNaClABIErrorReporter {
-  PNaClABIErrorReporter(const PNaClABIErrorReporter&) LLVM_DELETED_FUNCTION;
-  void operator=(const PNaClABIErrorReporter&) LLVM_DELETED_FUNCTION;
+  PNaClABIErrorReporter(const PNaClABIErrorReporter&) = delete;
+  void operator=(const PNaClABIErrorReporter&) = delete;
  public:
   PNaClABIErrorReporter() : ErrorCount(0), Errors(ErrorString),
                             UseFatalErrors(true) {}
   ~PNaClABIErrorReporter() {}
   // Return the number of verification errors from the last run.
   int getErrorCount() const { return ErrorCount; }
   // Print the error messages to O
   void printErrors(llvm::raw_ostream &O) {
     Errors.flush();
     O << ErrorString;
@@ skipping 28 matching lines @@
 
 FunctionPass *createPNaClABIVerifyFunctionsPass(
     PNaClABIErrorReporter *Reporter);
 ModulePass *createPNaClABIVerifyModulePass(PNaClABIErrorReporter *Reporter,
                                            bool StreamingMode = false);
 
 }
 
 
 #endif