Changes from 3.7 merge to files not in upstream

lib/Transforms/NaCl/RemoveAsmMemory.cpp

 //===- RemoveAsmMemory.cpp - Remove ``asm("":::"memory")`` ----------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This pass removes all instances of ``asm("":::"memory")``.
@@ skipping 27 matching lines @@
   AsmDirectivesVisitor() : ModifiedFunction(false) {}
   ~AsmDirectivesVisitor() {}
   bool modifiedFunction() const { return ModifiedFunction; }
 
   /// Only Call Instructions are ever inline assembly directives.
   void visitCallInst(CallInst &CI);
 
 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;
 };
 }
 
 char RemoveAsmMemory::ID = 0;
 INITIALIZE_PASS(RemoveAsmMemory, "remove-asm-memory",
                 "remove all instances of ``asm(\"\":::\"memory\")``", false,
                 false)
 
 bool RemoveAsmMemory::runOnFunction(Function &F) {
   AsmDirectivesVisitor AV;
@@ skipping 10 matching lines @@
   // sequentially consistent fence. Other passes rewrite this fence to
   // an equivalent stable NaCl intrinsic, meaning that this assembly can
   // be removed.
   CI.eraseFromParent();
   ModifiedFunction = true;
 }
 
 namespace llvm {
 FunctionPass *createRemoveAsmMemoryPass() { return new RemoveAsmMemory(); }
 }