Changes from 3.7 merge to files not in upstream

include/llvm/Analysis/NaCl.h

Index: include/llvm/Analysis/NaCl.h
diff --git a/include/llvm/Analysis/NaCl.h b/include/llvm/Analysis/NaCl.h
index 035b5e7b811f8ada2d9ff314eea4fccfe4c4257d..eb894ef9b64a2bc1c0cbad81eb29962812c08bd0 100644
--- a/include/llvm/Analysis/NaCl.h
+++ b/include/llvm/Analysis/NaCl.h
@@ -22,8 +22,8 @@ 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) {}