Changes from 3.7 merge to files not in upstream

include/llvm/Bitcode/NaCl/NaClBitcodeHeader.h

Index: include/llvm/Bitcode/NaCl/NaClBitcodeHeader.h
diff --git a/include/llvm/Bitcode/NaCl/NaClBitcodeHeader.h b/include/llvm/Bitcode/NaCl/NaClBitcodeHeader.h
index 85d9c657879c9ffd4a66ff31ae146ceb32460bb7..50ca5aaed86e65b132b5055ccfb4d6cfbdc74bab 100644
--- a/include/llvm/Bitcode/NaCl/NaClBitcodeHeader.h
+++ b/include/llvm/Bitcode/NaCl/NaClBitcodeHeader.h
@@ -31,8 +31,8 @@ class MemoryObject;
 // The serialized format has 2 fixed subfields (ID:type and data length) and the
 // variable-length data subfield
 class NaClBitcodeHeaderField {
-  NaClBitcodeHeaderField(const NaClBitcodeHeaderField &) LLVM_DELETED_FUNCTION;
-  void operator=(const NaClBitcodeHeaderField &)LLVM_DELETED_FUNCTION;
+  NaClBitcodeHeaderField(const NaClBitcodeHeaderField &) = delete;
+  void operator=(const NaClBitcodeHeaderField &) = delete;
 
 public:
   // Defines the ID associated with the value. Valid values are in
@@ -151,8 +151,8 @@ private:
 
 /// \brief Class holding parsed header fields in PNaCl bitcode file.
 class NaClBitcodeHeader {
-  NaClBitcodeHeader(const NaClBitcodeHeader &) LLVM_DELETED_FUNCTION;
-  void operator=(const NaClBitcodeHeader &) LLVM_DELETED_FUNCTION;
+  NaClBitcodeHeader(const NaClBitcodeHeader &) = delete;
+  void operator=(const NaClBitcodeHeader &) = delete;
 
   // The set of parsed header fields. The header takes ownership of
   // all fields in this vector.