Changes from 3.7 merge to files not in upstream

lib/Transforms/NaCl/RemoveAsmMemory.cpp

Index: lib/Transforms/NaCl/RemoveAsmMemory.cpp
diff --git a/lib/Transforms/NaCl/RemoveAsmMemory.cpp b/lib/Transforms/NaCl/RemoveAsmMemory.cpp
index 5224fcabb2ce770eb1ba49cb94a24154f63409c3..eb7a32c9d3f0a5ab11e6852f734c1b39ea0e0457 100644
--- a/lib/Transforms/NaCl/RemoveAsmMemory.cpp
+++ b/lib/Transforms/NaCl/RemoveAsmMemory.cpp
@@ -45,9 +45,8 @@ public:
 private:
   bool ModifiedFunction;
 
-  AsmDirectivesVisitor(const AsmDirectivesVisitor &) LLVM_DELETED_FUNCTION;
-  AsmDirectivesVisitor &operator=(
-      const AsmDirectivesVisitor &) LLVM_DELETED_FUNCTION;
+  AsmDirectivesVisitor(const AsmDirectivesVisitor &) = delete;
+  AsmDirectivesVisitor &operator=(const AsmDirectivesVisitor &) = delete;
 };
 }