From 5c8d90405f04cdd193273d30ead2a0c08d766e36 Mon Sep 17 00:00:00 2001 From: Alexandre Oliva Date: Tue, 7 Oct 2003 21:14:14 +0000 Subject: [PATCH] re PR bootstrap/12173 (IRIX 6 O32 (with as) bootstrap failure due to gcc -g -E warning) 2003-10-07 Alexandre Oliva * gcc.c (cpp_options): Only pass -fworking-directory for -g* if not overridden. Fixes PR bootstrap/12173. From-SVN: r72201 --- gcc/ChangeLog | 6 ++++++ gcc/gcc.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b858dc69d84..c1170906812 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2003-10-07 Alexandre Oliva + + * gcc.c (cpp_options): Only pass -fworking-directory for -g* if + not overridden. + Fixes PR bootstrap/12173. + 2003-10-07 Zack Weinberg * errors.c: Don't include coretypes.h or tm.h. diff --git a/gcc/gcc.c b/gcc/gcc.c index 31f3d43bbee..764ccd1f9e8 100644 --- a/gcc/gcc.c +++ b/gcc/gcc.c @@ -755,7 +755,7 @@ static const char *cpp_unique_options = in turn cause preprocessor symbols to be defined specially. */ static const char *cpp_options = "%(cpp_unique_options) %1 %{m*} %{std*} %{ansi} %{W*&pedantic*} %{w} %{f*}\ - %{g*} %{O*} %{undef}"; + %{g*:%{!g0:%{!fno-working-directory:-fworking-directory}}} %{O*} %{undef}"; /* This contains cpp options which are not passed when the preprocessor output will be used by another program. */