Changes from 3.7 merge to files not in upstream

include/llvm/Bitcode/NaCl/NaClBitcodeBitsDist.h

Index: include/llvm/Bitcode/NaCl/NaClBitcodeBitsDist.h
diff --git a/include/llvm/Bitcode/NaCl/NaClBitcodeBitsDist.h b/include/llvm/Bitcode/NaCl/NaClBitcodeBitsDist.h
index 4c96aa9693c80f8966eceeba19bff117f5a08a55..3067bebff1139528f54da713d949593d4bfec2a7 100644
--- a/include/llvm/Bitcode/NaCl/NaClBitcodeBitsDist.h
+++ b/include/llvm/Bitcode/NaCl/NaClBitcodeBitsDist.h
@@ -25,10 +25,8 @@ namespace llvm {
 /// bits used by each record. Also tracks the number to times an
 /// abbreviation was used to parse the corresponding record.
 class NaClBitcodeBitsDistElement : public NaClBitcodeDistElement {
-  NaClBitcodeBitsDistElement(const NaClBitcodeBitsDistElement&)
-      LLVM_DELETED_FUNCTION;
-  void operator=(const NaClBitcodeBitsDistElement&)
-      LLVM_DELETED_FUNCTION;
+  NaClBitcodeBitsDistElement(const NaClBitcodeBitsDistElement&) = delete;
+  void operator=(const NaClBitcodeBitsDistElement&) = delete;
 
 public:
   static bool classof(const NaClBitcodeDistElement *Dist) {