diff --git a/gcc/c-opts.c b/gcc/c-opts.c
index 8eef6bfbf00..a0bc0f6c010 100644
--- a/gcc/c-opts.c
+++ b/gcc/c-opts.c
@@ -1222,11 +1222,13 @@ sanitize_cpp_opts (void)
 
   /* Disable -dD, -dN and -dI if normal output is suppressed.  Allow
      -dM since at least glibc relies on -M -dM to work.  */
+  /* Also, flag_no_output implies flag_no_line_commands, always. */
   if (flag_no_output)
     {
       if (flag_dump_macros != 'M')
 	flag_dump_macros = 0;
       flag_dump_includes = 0;
+      flag_no_line_commands = 1;
     }
 
   cpp_opts->unsigned_char = !flag_signed_char;
diff --git a/gcc/c-ppoutput.c b/gcc/c-ppoutput.c
index 64b27a75f62..996c5f02534 100644
--- a/gcc/c-ppoutput.c
+++ b/gcc/c-ppoutput.c
@@ -370,7 +370,7 @@ pp_file_change (const struct line_map *map)
 {
   const char *flags = "";
 
-  if (flag_no_line_commands || flag_no_output)
+  if (flag_no_line_commands)
     return;
 
   if (map != NULL)