diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b2eb9506485..ceb9e108a9f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-03  Manuel López-Ibáñez  <manu@gcc.gnu.org>
+
+	* diagnostic.c (diagnostic_show_locus): Honor override_column when
+	placing the caret.
+
 2014-12-02  Dmitry Vyukov  <dvyukov@google.com>
 
 	* asan.c: (asan_finish_file): Use default priority for constructors
diff --git a/gcc/diagnostic.c b/gcc/diagnostic.c
index f7f8aaa23c0..0c8fbe5f766 100644
--- a/gcc/diagnostic.c
+++ b/gcc/diagnostic.c
@@ -310,6 +310,8 @@ diagnostic_show_locus (diagnostic_context * context,
 
   context->last_location = diagnostic->location;
   s = expand_location_to_spelling_point (diagnostic->location);
+  if (diagnostic->override_column)
+    s.column = diagnostic->override_column;
   line = location_get_source_line (s, &line_width);
   if (line == NULL || s.column > line_width)
     return;