Changes from 3.7 merge to files not in upstream

include/llvm/Bitcode/NaCl/NaClBitcodeAbbrevDist.h

 //===-- NaClBitcodeAbbrevDist.h ---------------------------------------------===//
 //      Defines distribution maps for abbreviations associated with
 //      bitcode records.
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // Defines distribution maps for tracking abbreviations associated
 // with bitcode records.
 
 #ifndef LLVM_BITCODE_NACL_NACLBITCODEABBREVDIST_H
 #define LLVM_BITCODE_NACL_NACLBITCODEABBREVDIST_H
 
 #include "llvm/Bitcode/NaCl/NaClBitcodeDist.h"
 #include "llvm/Bitcode/NaCl/NaClCompressCodeDist.h"
 
 namespace llvm {
 
 /// Collects the number of instances associated with a given abbreviation
 /// 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) {
     return Element->getKind() >= RDE_AbbrevDist &&
         Element->getKind() < RDE_AbbrevDistLast;
   }
 
   explicit NaClBitcodeAbbrevDistElement(unsigned BlockID=0)
       : NaClBitcodeDistElement(RDE_AbbrevDist),
         CodeDist(BlockID, &NaClCompressCodeDistElement::Sentinel) {
@@ skipping 70 matching lines @@
 
 private:
   // The block id associated with the abbreviations in this
   // distribution map.
   unsigned BlockID;
 };
 
 }
 
 #endif