Changes from 3.7 merge to files not in upstream

include/llvm/Bitcode/NaCl/NaClBitcodeCodeDist.h

Index: include/llvm/Bitcode/NaCl/NaClBitcodeCodeDist.h
diff --git a/include/llvm/Bitcode/NaCl/NaClBitcodeCodeDist.h b/include/llvm/Bitcode/NaCl/NaClBitcodeCodeDist.h
index 7181851c081afa05eb8751f96d987e7a274e78ad..6f794116482ad35b0679592ef52002bee4e53afa 100644
--- a/include/llvm/Bitcode/NaCl/NaClBitcodeCodeDist.h
+++ b/include/llvm/Bitcode/NaCl/NaClBitcodeCodeDist.h
@@ -24,9 +24,9 @@ namespace llvm {
 class NaClBitcodeCodeDistElement
     : public NaClBitcodeBitsAndAbbrevsDistElement {
   NaClBitcodeCodeDistElement(const NaClBitcodeCodeDistElement&)
-      LLVM_DELETED_FUNCTION;
+      = delete;
   void operator=(const NaClBitcodeCodeDistElement&)
-      LLVM_DELETED_FUNCTION;
+      = delete;
 
 public:
   static bool classof(const NaClBitcodeDistElement *Element) {
@@ -60,10 +60,8 @@ public:
 // particular blockID. Assumes distribution elements are instances of
 // NaClBitcodeCodeDistElement.
 class NaClBitcodeCodeDist : public NaClBitcodeDist {
-  NaClBitcodeCodeDist(const NaClBitcodeCodeDist&)
-      LLVM_DELETED_FUNCTION;
-  void operator=(const NaClBitcodeCodeDist&)
-      LLVM_DELETED_FUNCTION;
+  NaClBitcodeCodeDist(const NaClBitcodeCodeDist&) = delete;
+  void operator=(const NaClBitcodeCodeDist&) = delete;
 
 public:
   static bool classof(const NaClBitcodeDist *Dist) {