Changes from 3.7 merge to files not in upstream

lib/Bitcode/NaCl/Analysis/NaClObjDump.cpp

 //===-- NaClObjDump.cpp - Dump PNaCl bitcode contents ---------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 
 #include "llvm/ADT/STLExtras.h"
@@ skipping 532 matching lines @@
     unsigned Alignment = NaClPossibleLoadStoreAlignments[i];
     if (PNaClABIProps::isAllowedAlignment(&DL, Alignment, Ty)) {
       ValidAlignments.push_back(Alignment);
     }
   }
 }
 
 /// Top-level class to parse bitcode file and transform to
 /// corresponding disassembled code.
 class NaClDisTopLevelParser : public NaClBitcodeParser {
-  NaClDisTopLevelParser(const NaClDisTopLevelParser&) LLVM_DELETED_FUNCTION;
-  void operator=(const NaClDisTopLevelParser&) LLVM_DELETED_FUNCTION;
+  NaClDisTopLevelParser(const NaClDisTopLevelParser&) = delete;
+  void operator=(const NaClDisTopLevelParser&) = delete;
 
 public:
   NaClDisTopLevelParser(NaClBitcodeHeader &Header,
                         NaClBitstreamCursor &Cursor,
                         naclbitc::ObjDumpStream &ObjDump)
       : NaClBitcodeParser(Cursor),
         Mod("ObjDump", getGlobalContext()),
         ObjDump(ObjDump),
         AbbrevListener(this),
         DL(&Mod),
@@ skipping 2998 matching lines @@
     ObjDump.Error() << "Expected 1 top level block in bitcode: Found:"
                     << NumBlocksRead << "\n";
     ErrorsFound = true;
   }
 
   ObjDump.Flush();
   return ErrorsFound || Parser.GetNumErrors() > 0;
 }
 
 }