From: Neil Booth Date: Wed, 1 Jan 2003 16:24:28 +0000 (+0000) Subject: re PR preprocessor/8880 (__WCHAR_TYPE__ macro incorrectly set to "long int" with... X-Git-Tag: releases/gcc-3.2.2~147 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=05c0c2c63ad7d5ec699aa46d2ca2dfcfc297973a;p=thirdparty%2Fgcc.git re PR preprocessor/8880 (__WCHAR_TYPE__ macro incorrectly set to "long int" with -fshort-wchar) PR preprocessor/8880 * gcc.c (cpp_unique_options): Handle -fshort-wchar later so it overrides any target CPU specs. From-SVN: r60752 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d7198bef607a..6025d668b387 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2003-01-01 Neil Booth + + PR preprocessor/8880 + * gcc.c (cpp_unique_options): Handle -fshort-wchar later so it + overrides any target CPU specs. + 2002-12-28 John David Anglin * pa.h (TARGET_SOM): Define if not defined. diff --git a/gcc/gcc.c b/gcc/gcc.c index 8a5bfeeb67cb..7845fc3f013f 100644 --- a/gcc/gcc.c +++ b/gcc/gcc.c @@ -688,10 +688,11 @@ static const char *cpp_unique_options = %{!undef:%{!ansi:%{!std=*:%p}%{std=gnu*:%p}} %P} %{trigraphs}\ %{Os:-D__OPTIMIZE_SIZE__} %{O*:%{!O0:-D__OPTIMIZE__}}\ %{fno-inline|O0|!O*:-D__NO_INLINE__} %{ffast-math:-D__FAST_MATH__}\ - %{fshort-wchar:-U__WCHAR_TYPE__ -D__WCHAR_TYPE__=short\\ unsigned\\ int}\ %{ffreestanding:-D__STDC_HOSTED__=0} %{fno-hosted:-D__STDC_HOSTED__=0}\ %{!ffreestanding:%{!fno-hosted:-D__STDC_HOSTED__=1}} %{remap}\ - %{g3:-dD} %{H} %C %{D*&U*&A*} %{i*} %Z %i\ + %{g3:-dD} %{H} %C\ + %{fshort-wchar:-U__WCHAR_TYPE__ -D__WCHAR_TYPE__=short\\ unsigned\\ int}\ + %{D*&U*&A*} %{i*} %Z %i\ %{E|M|MM:%W{o*}}"; /* This contains cpp options which are common with cc1_options and are passed