Changes from 3.7 merge to files not in upstream

include/llvm/Bitcode/NaCl/NaClAnalyzerBlockDist.h

Index: include/llvm/Bitcode/NaCl/NaClAnalyzerBlockDist.h
diff --git a/include/llvm/Bitcode/NaCl/NaClAnalyzerBlockDist.h b/include/llvm/Bitcode/NaCl/NaClAnalyzerBlockDist.h
index e600d17afc0a5229d770957e8c3b12798373d766..9845fe6a6ae51781bc9749ae3ad55f2e3383df7e 100644
--- a/include/llvm/Bitcode/NaCl/NaClAnalyzerBlockDist.h
+++ b/include/llvm/Bitcode/NaCl/NaClAnalyzerBlockDist.h
@@ -24,9 +24,8 @@ namespace llvm {
 /// Holds block distribution, and nested subblock and record code distributions,
 /// to be collected during analysis.
 class NaClAnalyzerBlockDistElement : public NaClBitcodeBlockDistElement {
-  NaClAnalyzerBlockDistElement(const NaClAnalyzerBlockDistElement&)
-  LLVM_DELETED_FUNCTION;
-  void operator=(const NaClAnalyzerBlockDistElement&) LLVM_DELETED_FUNCTION;
+  NaClAnalyzerBlockDistElement(const NaClAnalyzerBlockDistElement&) = delete;
+  void operator=(const NaClAnalyzerBlockDistElement&) = delete;
 
 public:
   static bool classof(const NaClBitcodeDistElement *Element) {
@@ -83,8 +82,8 @@ private:
 /// Holds block distribution, and nested subblock and record code distributions,
 /// to be collected during analysis.
 class NaClAnalyzerBlockDist : public NaClBitcodeBlockDist {
-  NaClAnalyzerBlockDist(const NaClAnalyzerBlockDist&) LLVM_DELETED_FUNCTION;
-  void operator=(const NaClAnalyzerBlockDist&) LLVM_DELETED_FUNCTION;
+  NaClAnalyzerBlockDist(const NaClAnalyzerBlockDist&) = delete;
+  void operator=(const NaClAnalyzerBlockDist&) = delete;
 public:
   NaClAnalyzerBlockDist(NaClAnalyzerBlockDistElement &Sentinel)
       : NaClBitcodeBlockDist(&Sentinel)