From f9c656237c3b2ca35e849a5cd38579ab671895dd Mon Sep 17 00:00:00 2001 From: Nathanael Nerode Date: Sun, 28 Nov 2004 23:29:41 +0000 Subject: [PATCH] re PR preprocessor/17651 (Erroneous preprocessor output with -g when generating dependencies) 2004-11-28 Nathanael Nerode PR preprocessor/17651 * c-opts.c (sanitize_cpp_opts): Make flag_no_output imply flag_no_line_commands. * c-ppoutput.c (pp_file_change): Remove now-redundant check of flag_no_output. From-SVN: r91436 --- gcc/c-opts.c | 2 ++ gcc/c-ppoutput.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) 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) -- 2.30.2