Changes from 3.7 merge to files not in upstream

include/llvm/Bitcode/NaCl/NaClBitcodeAbbrevDist.h

Index: include/llvm/Bitcode/NaCl/NaClBitcodeAbbrevDist.h
diff --git a/include/llvm/Bitcode/NaCl/NaClBitcodeAbbrevDist.h b/include/llvm/Bitcode/NaCl/NaClBitcodeAbbrevDist.h
index 932b15faa0cdbd95e09af4a8168cb64632255931..e9bbc61bab7864624f3dbde971a31a5db9303ca1 100644
--- a/include/llvm/Bitcode/NaCl/NaClBitcodeAbbrevDist.h
+++ b/include/llvm/Bitcode/NaCl/NaClBitcodeAbbrevDist.h
@@ -24,9 +24,8 @@ namespace llvm {
 /// index of a bitcode record. Note: Uses naclbitc::UNABBREV_RECORD index
 /// to denote bitcode records that did not use an abbreviation.
 class NaClBitcodeAbbrevDistElement : public NaClBitcodeDistElement {
-  NaClBitcodeAbbrevDistElement(const NaClBitcodeAbbrevDistElement&)
-  LLVM_DELETED_FUNCTION;
-  void operator=(const NaClBitcodeAbbrevDistElement&) LLVM_DELETED_FUNCTION;
+  NaClBitcodeAbbrevDistElement(const NaClBitcodeAbbrevDistElement&) = delete;
+  void operator=(const NaClBitcodeAbbrevDistElement&) = delete;
 
 public:
   static bool classof(const NaClBitcodeDistElement *Element) {