re PR preprocessor/8880 (__WCHAR_TYPE__ macro incorrectly set to "long int" with...

	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 d7198bef607ae9dac563f61f4895731e6c7b6ed9..6025d668b3871e56f361722108397ea5d3a61d2e 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2003-01-01  Neil Booth  <neil@daikokuya.co.uk>
+
+       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  <dave.anglin@nrc.ca>
 
        * pa.h (TARGET_SOM): Define if not defined.

diff --git a/gcc/gcc.c b/gcc/gcc.c
index 8a5bfeeb67cb5ab70a6b19dd1465d31eed1314a0..7845fc3f013f04cca8b3f01099ccc395cb4cc151 100644 (file)
--- 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