Changes from 3.7 merge to files not in upstream

include/llvm/Bitcode/NaCl/NaClBitstreamReader.h

Index: include/llvm/Bitcode/NaCl/NaClBitstreamReader.h
diff --git a/include/llvm/Bitcode/NaCl/NaClBitstreamReader.h b/include/llvm/Bitcode/NaCl/NaClBitstreamReader.h
index f73b1bc2f4595526fdc8246f339b6299b40f206d..05cd91eb2aa92af2eb788d8c7289919604754b2e 100644
--- a/include/llvm/Bitcode/NaCl/NaClBitstreamReader.h
+++ b/include/llvm/Bitcode/NaCl/NaClBitstreamReader.h
@@ -73,9 +73,9 @@ private:
 
   // True if filler should be added to byte align records.
   bool AlignBitcodeRecords = false;
+  NaClBitstreamReader(const NaClBitstreamReader&) = delete;
+  void operator=(const NaClBitstreamReader&) = delete;
 
-  NaClBitstreamReader(const NaClBitstreamReader&) LLVM_DELETED_FUNCTION;
-  void operator=(const NaClBitstreamReader&) LLVM_DELETED_FUNCTION;
 
   void initFromHeader(NaClBitcodeHeader &Header) {
     InitialAddress = Header.getHeaderSize();
@@ -198,8 +198,8 @@ typedef SmallVector<uint64_t, 8> NaClBitcodeRecordVector;
 /// to allow the readers to update internals of the bit stream reader
 /// appropriately.
 class NaClAbbrevListener {
-  NaClAbbrevListener(const NaClAbbrevListener&) LLVM_DELETED_FUNCTION;
-  void operator=(const NaClAbbrevListener&) LLVM_DELETED_FUNCTION;
+  NaClAbbrevListener(const NaClAbbrevListener&) = delete;
+  void operator=(const NaClAbbrevListener&) = delete;
 public:
   NaClAbbrevListener() {}
   virtual ~NaClAbbrevListener() {}
@@ -294,8 +294,8 @@ private:
   /// This tracks the codesize of parent blocks.
   SmallVector<Block, 8> BlockScope;
 
-  NaClBitstreamCursor(const NaClBitstreamCursor &) LLVM_DELETED_FUNCTION;
-  NaClBitstreamCursor &operator=(const NaClBitstreamCursor &) LLVM_DELETED_FUNCTION;
+  NaClBitstreamCursor(const NaClBitstreamCursor &) = delete;
+  NaClBitstreamCursor &operator=(const NaClBitstreamCursor &) = delete;
 
 public:
   NaClBitstreamCursor() : ErrHandler(new ErrorHandler(*this)) {