Changes from 3.7 merge to files not in upstream

lib/Bitcode/NaCl/Writer/NaClValueEnumerator.h

Index: lib/Bitcode/NaCl/Writer/NaClValueEnumerator.h
diff --git a/lib/Bitcode/NaCl/Writer/NaClValueEnumerator.h b/lib/Bitcode/NaCl/Writer/NaClValueEnumerator.h
index 46080df2a574a07264426452074b2eb8856dd57a..fc64bcd398ab548f11750b4239b5d951a6a45177 100644
--- a/lib/Bitcode/NaCl/Writer/NaClValueEnumerator.h
+++ b/lib/Bitcode/NaCl/Writer/NaClValueEnumerator.h
@@ -84,8 +84,8 @@ private:
   /// \brief Integer type use for PNaCl conversion of pointers.
   Type *IntPtrType;
 
-  NaClValueEnumerator(const NaClValueEnumerator &) LLVM_DELETED_FUNCTION;
-  void operator=(const NaClValueEnumerator &) LLVM_DELETED_FUNCTION;
+  NaClValueEnumerator(const NaClValueEnumerator &) = delete;
+  void operator=(const NaClValueEnumerator &) = delete;
 public:
   NaClValueEnumerator(const Module *M);