Changes from 3.7 merge to files not in upstream

include/llvm/Bitcode/NaCl/NaClBitcodeSizeDist.h

Index: include/llvm/Bitcode/NaCl/NaClBitcodeSizeDist.h
diff --git a/include/llvm/Bitcode/NaCl/NaClBitcodeSizeDist.h b/include/llvm/Bitcode/NaCl/NaClBitcodeSizeDist.h
index 8491ba43c85a8da2bf39b7294b1c5505178870d2..0155d94b65f6c32a7ca60b278cb594a4b9f7e7b3 100644
--- a/include/llvm/Bitcode/NaCl/NaClBitcodeSizeDist.h
+++ b/include/llvm/Bitcode/NaCl/NaClBitcodeSizeDist.h
@@ -22,9 +22,8 @@ namespace llvm {
 /// Collects the number of bitcode record instances with the same number
 /// of elements in the vector of values, with nested value distribution maps.
 class NaClBitcodeSizeDistElement : public NaClBitcodeDistElement {
-  NaClBitcodeSizeDistElement(const NaClBitcodeSizeDistElement&)
-  LLVM_DELETED_FUNCTION;
-  void operator=(const NaClBitcodeSizeDistElement&) LLVM_DELETED_FUNCTION;
+  NaClBitcodeSizeDistElement(const NaClBitcodeSizeDistElement&) = delete;
+  void operator=(const NaClBitcodeSizeDistElement&) = delete;
 
 public:
   static bool classof(const NaClBitcodeDistElement *Element) {