From 32810ba3df092f3890cb115a162a82afec947966 Mon Sep 17 00:00:00 2001 From: Neil Booth Date: Sun, 10 Mar 2002 21:10:21 +0000 Subject: [PATCH] re PR preprocessor/5899 (-M disables -dM) PR preprocessor/5899 * cppinit.c (init_dependency_output): Don't ignore -dM etc. From-SVN: r50545 --- gcc/ChangeLog | 5 +++++ gcc/cppinit.c | 10 ++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 53833dc00b4..6d98f862c77 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2002-03-10 Neil Booth + + PR preprocessor/5899 + * cppinit.c (init_dependency_output): Don't ignore -dM etc. + 2002-03-10 Kaveh R. Ghazi * mbchar.c (JIS_state_table, JIS_action_table): Const-ify. diff --git a/gcc/cppinit.c b/gcc/cppinit.c index 38681672524..7c7f782eaae 100644 --- a/gcc/cppinit.c +++ b/gcc/cppinit.c @@ -1881,15 +1881,13 @@ init_dependency_output (pfile) CPP_OPTION (pfile, print_deps_append) = 1; } else if (CPP_OPTION (pfile, deps_file) == 0) - /* If -M or -MM was seen, default output to wherever was specified - with -o. out_fname is non-NULL here. */ + /* If -M or -MM was seen without -MF, default output to wherever + was specified with -o. out_fname is non-NULL here. */ CPP_OPTION (pfile, deps_file) = CPP_OPTION (pfile, out_fname); - /* When doing dependencies, we should suppress all output, including - -dM, -dI etc. */ + /* When doing dependencies, suppress normal preprocessed output. + Still do -dM, -dI etc. as e.g. glibc depends on this. */ CPP_OPTION (pfile, no_output) = 1; - CPP_OPTION (pfile, dump_macros) = 0; - CPP_OPTION (pfile, dump_includes) = 0; } /* Handle --help output. */ -- 2.30.2