Changes from 3.7 merge to files not in upstream

include/llvm/Bitcode/NaCl/NaClBitcodeValueDist.h

Index: include/llvm/Bitcode/NaCl/NaClBitcodeValueDist.h
diff --git a/include/llvm/Bitcode/NaCl/NaClBitcodeValueDist.h b/include/llvm/Bitcode/NaCl/NaClBitcodeValueDist.h
index 2ec08841ef79a8d47a592798fd39fc0eaa250872..c992627f5e62129b419369f5cea1bc87d78135ec 100644
--- a/include/llvm/Bitcode/NaCl/NaClBitcodeValueDist.h
+++ b/include/llvm/Bitcode/NaCl/NaClBitcodeValueDist.h
@@ -45,9 +45,8 @@ NaClValueRangeType GetNaClValueRange(NaClValueRangeIndexType RangeIndex);
 
 /// Defines the distribution of range indices.
 class NaClBitcodeValueDistElement : public NaClBitcodeDistElement {
-  NaClBitcodeValueDistElement(const NaClBitcodeValueDistElement&)
-  LLVM_DELETED_FUNCTION;
-  void operator=(const NaClBitcodeValueDistElement&) LLVM_DELETED_FUNCTION;
+  NaClBitcodeValueDistElement(const NaClBitcodeValueDistElement&) = delete;
+  void operator=(const NaClBitcodeValueDistElement&) = delete;
 
 public:
   static bool classof(const NaClBitcodeDistElement *Element) {
@@ -82,8 +81,8 @@ public:
 /// Defines the distribution of values for a set of value indices for
 /// bitcode records.
 class NaClBitcodeValueDist : public NaClBitcodeDist {
-  NaClBitcodeValueDist(const NaClBitcodeValueDist&) LLVM_DELETED_FUNCTION;
-  void operator=(const NaClBitcodeValueDist&) LLVM_DELETED_FUNCTION;
+  NaClBitcodeValueDist(const NaClBitcodeValueDist&) = delete;
+  void operator=(const NaClBitcodeValueDist&) = delete;
 
 public:
   static bool classof(const NaClBitcodeDist *Dist) {
@@ -125,9 +124,9 @@ private:
 /// for each element.
 class NaClBitcodeValueIndexDistElement : public NaClBitcodeDistElement {
   NaClBitcodeValueIndexDistElement(
-      const NaClBitcodeValueIndexDistElement&) LLVM_DELETED_FUNCTION;
+      const NaClBitcodeValueIndexDistElement&) = delete;
   void operator=(
-      const NaClBitcodeValueIndexDistElement&) LLVM_DELETED_FUNCTION;
+      const NaClBitcodeValueIndexDistElement&) = delete;
 
 public:
   static bool classof(const NaClBitcodeDistElement *Element) {