diff --git a/include/llvm/Support/raw_ostream.h b/include/llvm/Support/raw_ostream.h
index 1eb92ed0ffa..85746599005 100644
--- a/include/llvm/Support/raw_ostream.h
+++ b/include/llvm/Support/raw_ostream.h
@@ -82,7 +82,7 @@ public:
 
   raw_ostream &operator<<(char C) {
     if (OutBufCur >= OutBufEnd)
-      flush_impl();
+      return write(C);
     *OutBufCur++ = C;
     if (Unbuffered)
       flush_impl();
@@ -91,7 +91,7 @@ public:
 
   raw_ostream &operator<<(unsigned char C) {
     if (OutBufCur >= OutBufEnd)
-      flush_impl();
+      return write(C);
     *OutBufCur++ = C;
     if (Unbuffered)
       flush_impl();
@@ -100,7 +100,7 @@ public:
 
   raw_ostream &operator<<(signed char C) {
     if (OutBufCur >= OutBufEnd)
-      flush_impl();
+      return write(C);
     *OutBufCur++ = C;
     if (Unbuffered)
       flush_impl();
@@ -132,6 +132,7 @@ public:
     return this->operator<<(ftostr(N));
   }
 
+  raw_ostream &write(unsigned char C);
   raw_ostream &write(const char *Ptr, unsigned Size);
 
   // Formatted output, see the format() function in Support/Format.h.
diff --git a/lib/Support/raw_ostream.cpp b/lib/Support/raw_ostream.cpp
index 5a99a0cf403..43f46837d37 100644
--- a/lib/Support/raw_ostream.cpp
+++ b/lib/Support/raw_ostream.cpp
@@ -63,10 +63,7 @@ raw_ostream &raw_ostream::operator<<(unsigned long N) {
 
 raw_ostream &raw_ostream::operator<<(long N) {
   if (N <  0) {
-    if (OutBufCur >= OutBufEnd)
-      flush_impl();
-    *OutBufCur++ = '-';
-    
+    *this << '-';
     N = -N;
   }
   
@@ -91,10 +88,7 @@ raw_ostream &raw_ostream::operator<<(unsigned long long N) {
 
 raw_ostream &raw_ostream::operator<<(long long N) {
   if (N <  0) {
-    if (OutBufCur >= OutBufEnd)
-      flush_impl();
-    *OutBufCur++ = '-';
-    
+    *this << '-';
     N = -N;
   }
   
@@ -106,6 +100,12 @@ raw_ostream &raw_ostream::operator<<(const void *P) {
   return *this << format("%p", P);
 }
 
+raw_ostream &raw_ostream::write(unsigned char C) {
+  if (OutBufCur >= OutBufEnd)
+    flush_impl();
+
+  *OutBufCur++ = C;
+}
 
 raw_ostream &raw_ostream::write(const char *Ptr, unsigned Size) {
   if (OutBufCur+Size > OutBufEnd)