Changes from 3.7 merge to files not in upstream

include/llvm/Bitcode/NaCl/NaClBitcodeSubblockDist.h

Index: include/llvm/Bitcode/NaCl/NaClBitcodeSubblockDist.h
diff --git a/include/llvm/Bitcode/NaCl/NaClBitcodeSubblockDist.h b/include/llvm/Bitcode/NaCl/NaClBitcodeSubblockDist.h
index 0ca8de570ace02378afa48f777853f6189dcdb75..7729edffe423b3d03341f0e6de371536c8c3a478 100644
--- a/include/llvm/Bitcode/NaCl/NaClBitcodeSubblockDist.h
+++ b/include/llvm/Bitcode/NaCl/NaClBitcodeSubblockDist.h
@@ -23,7 +23,7 @@ namespace llvm {
 /// block.
 class NaClBitcodeSubblockDistElement : public NaClBitcodeDistElement {
   NaClBitcodeSubblockDistElement(const NaClBitcodeSubblockDistElement &)
-  LLVM_DELETED_FUNCTION;
+  = delete;
   void operator=(const NaClBitcodeSubblockDistElement&);
 
 public:
@@ -53,8 +53,8 @@ public:
 /// defined) block. Assumes distribution elements are instances of
 /// NaClBitcodeSubblockDistElement.
 class NaClBitcodeSubblockDist : public NaClBitcodeDist {
-  NaClBitcodeSubblockDist(const NaClBitcodeSubblockDist&) LLVM_DELETED_FUNCTION;
-  void operator=(const NaClBitcodeSubblockDist&) LLVM_DELETED_FUNCTION;
+  NaClBitcodeSubblockDist(const NaClBitcodeSubblockDist&) = delete;
+  void operator=(const NaClBitcodeSubblockDist&) = delete;
 
 public:
   static bool classof(const NaClBitcodeDist *Dist) {