Changes from 3.7 merge to files not in upstream

include/llvm/Bitcode/NaCl/NaClObjDumpStream.h

Index: include/llvm/Bitcode/NaCl/NaClObjDumpStream.h
diff --git a/include/llvm/Bitcode/NaCl/NaClObjDumpStream.h b/include/llvm/Bitcode/NaCl/NaClObjDumpStream.h
index fa8575f7951d2d0b5a9ae71dd92889fa43aae1de..fd119ca66510eedf693aea2b018eed3004eed9f9 100644
--- a/include/llvm/Bitcode/NaCl/NaClObjDumpStream.h
+++ b/include/llvm/Bitcode/NaCl/NaClObjDumpStream.h
@@ -240,8 +240,8 @@ public:
   /// into the base stream. Finally, it calls virtual method MyApply
   /// to do the actions of the directive.
   class Directive {
-    Directive(const Directive&) LLVM_DELETED_FUNCTION;
-    void operator=(const Directive&) LLVM_DELETED_FUNCTION;
+    Directive(const Directive&) = delete;
+    void operator=(const Directive&) = delete;
   public:
     /// Creates a directive for the given stream.
     explicit Directive(TextFormatter *Formatter)
@@ -759,8 +759,8 @@ private:
 /// RecordWidth).  On the other hand, we assume that the assembly is
 /// formatted by the caller (i.e. owner of this object).
 class ObjDumpStream {
-  ObjDumpStream(const ObjDumpStream&) LLVM_DELETED_FUNCTION;
-  void operator=(const ObjDumpStream&) LLVM_DELETED_FUNCTION;
+  ObjDumpStream(const ObjDumpStream&) = delete;
+  void operator=(const ObjDumpStream&) = delete;
 public:
   /// The default number of error messages that will be printed before
   /// execution is stopped due to too many errors.