diff --git a/include/llvm/Support/raw_ostream.h b/include/llvm/Support/raw_ostream.h
index 709a063e2ae..2b4b17d7b29 100644
--- a/include/llvm/Support/raw_ostream.h
+++ b/include/llvm/Support/raw_ostream.h
@@ -175,7 +175,10 @@ public:
   virtual void flush_impl();
   
   /// close - Manually flush the stream and close the file.
-  void close();  
+  void close();
+  
+  /// tell - Return the current offset with the file.
+  uint64_t tell();
 };
   
 /// raw_stdout_ostream - This is a stream that always prints to stdout.
diff --git a/lib/Support/raw_ostream.cpp b/lib/Support/raw_ostream.cpp
index a8e6c782bc9..b10677e3f27 100644
--- a/lib/Support/raw_ostream.cpp
+++ b/lib/Support/raw_ostream.cpp
@@ -253,6 +253,14 @@ void raw_fd_ostream::close() {
   FD = -1;
 }
 
+uint64_t raw_fd_ostream::tell() {
+  // We have to take into account the bytes waiting in the buffer.  For now
+  // we do the easy thing and just flush the buffer before getting the
+  // current file offset.
+  flush();  
+  return (uint64_t) lseek(FD, 0, SEEK_CUR);
+}
+
 //===----------------------------------------------------------------------===//
 //  raw_stdout/err_ostream
 //===----------------------------------------------------------------------===//