Changes from 3.7 merge to files not in upstream

tools/pnacl-llc/ThreadedStreamingCache.h

 //==- ThreadedStreamingCache.h - Cache for StreamingMemoryObject -*- C++ -*-==//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 
 #ifndef THREADEDSTREAMINGCACHE_H
@@ skipping 50 matching lines @@
 
   llvm::StreamingMemoryObject *Streamer;
   // Cached data for addresses [CacheBase, CacheBase + kCacheSize)
   mutable std::vector<unsigned char> Cache;
   // The MemoryObject is at least this size. Used as a cache for isValidAddress.
   mutable uint64_t MinObjectSize;
   // Current base address for the cache.
   mutable uint64_t CacheBase;
 
   ThreadedStreamingCache(
-      const ThreadedStreamingCache&) LLVM_DELETED_FUNCTION;
-  void operator=(const ThreadedStreamingCache&) LLVM_DELETED_FUNCTION;
+      const ThreadedStreamingCache&) = delete;
+  void operator=(const ThreadedStreamingCache&) = delete;
 };
 
 } // namespace llvm
 
 #endif // THREADEDSTREAMINGCACHE_H