Changes from 3.7 merge to files not in upstream

lib/Bitcode/NaCl/Analysis/NaClObjDump.cpp

Index: lib/Bitcode/NaCl/Analysis/NaClObjDump.cpp
diff --git a/lib/Bitcode/NaCl/Analysis/NaClObjDump.cpp b/lib/Bitcode/NaCl/Analysis/NaClObjDump.cpp
index 3699f1f5bda143009f77b8197f4cd12baeae727c..3f0aa604bc168513965857b84baeb605cce5365a 100644
--- a/lib/Bitcode/NaCl/Analysis/NaClObjDump.cpp
+++ b/lib/Bitcode/NaCl/Analysis/NaClObjDump.cpp
@@ -550,8 +550,8 @@ static void NaClGetExpectedLoadStoreAlignment(
 /// 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,