Changes from 3.7 merge to files not in upstream

include/llvm/IR/NaClAtomicIntrinsics.h

Index: include/llvm/IR/NaClAtomicIntrinsics.h
diff --git a/include/llvm/IR/NaClAtomicIntrinsics.h b/include/llvm/IR/NaClAtomicIntrinsics.h
index cc7387be077ce1bf0c1fa411ef2381e1905730fe..a0091b845579f83e9b480085f812d3e0055453d4 100644
--- a/include/llvm/IR/NaClAtomicIntrinsics.h
+++ b/include/llvm/IR/NaClAtomicIntrinsics.h
@@ -67,9 +67,9 @@ public:
 private:
   AtomicIntrinsic I[NumAtomicIntrinsics][NumAtomicIntrinsicOverloadTypes];
 
-  AtomicIntrinsics() LLVM_DELETED_FUNCTION;
-  AtomicIntrinsics(const AtomicIntrinsics &) LLVM_DELETED_FUNCTION;
-  AtomicIntrinsics &operator=(const AtomicIntrinsics &) LLVM_DELETED_FUNCTION;
+  AtomicIntrinsics() = delete;
+  AtomicIntrinsics(const AtomicIntrinsics &) = delete;
+  AtomicIntrinsics &operator=(const AtomicIntrinsics &) = delete;
 };
 
 /// Operations that can be represented by the @llvm.nacl.atomic.rmw