diff --git a/include/llvm/Support/raw_ostream.h b/include/llvm/Support/raw_ostream.h
index 852f7db4a17..1eb92ed0ffa 100644
--- a/include/llvm/Support/raw_ostream.h
+++ b/include/llvm/Support/raw_ostream.h
@@ -84,6 +84,8 @@ public:
     if (OutBufCur >= OutBufEnd)
       flush_impl();
     *OutBufCur++ = C;
+    if (Unbuffered)
+      flush_impl();
     return *this;
   }
 
@@ -91,6 +93,8 @@ public:
     if (OutBufCur >= OutBufEnd)
       flush_impl();
     *OutBufCur++ = C;
+    if (Unbuffered)
+      flush_impl();
     return *this;
   }
 
@@ -98,6 +102,8 @@ public:
     if (OutBufCur >= OutBufEnd)
       flush_impl();
     *OutBufCur++ = C;
+    if (Unbuffered)
+      flush_impl();
     return *this;
   }