Fix PNaCl-local files after merging LLVM 3.4

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 11 matching lines @@
 // Its interface is exactly the same as StreamableMemoryObject.
 
 class ThreadedStreamingCache : public llvm::StreamableMemoryObject {
  public:
   explicit ThreadedStreamingCache(llvm::StreamingMemoryObject *S);
   virtual uint64_t getBase() const LLVM_OVERRIDE { return 0; }
   virtual uint64_t getExtent() const LLVM_OVERRIDE;
   virtual int readByte(uint64_t address, uint8_t* ptr) const LLVM_OVERRIDE;
   virtual int readBytes(uint64_t address,
                         uint64_t size,
-                        uint8_t* buf,
-                        uint64_t* copied) const LLVM_OVERRIDE;
+                        uint8_t* buf) const LLVM_OVERRIDE;
   virtual const uint8_t *getPointer(uint64_t address,
                                     uint64_t size) const LLVM_OVERRIDE {
     // This could be fixed by ensuring the bytes are fetched and making a copy,
     // requiring that the bitcode size be known, or otherwise ensuring that
     // the memory doesn't go away/get reallocated, but it's
     // not currently necessary. Users that need the pointer don't stream.
     llvm_unreachable("getPointer in streaming memory objects not allowed");
     return NULL;
   }
   virtual bool isValidAddress(uint64_t address) const LLVM_OVERRIDE;
@@ skipping 24 matching lines @@
   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;
 };
 
 #endif // THREADEDSTREAMINGCACHE_H