diff options
| author | Neil Booth <neil@daikokuya.co.uk> | 2002-08-01 06:25:06 +0000 |
|---|---|---|
| committer | Neil Booth <neil@gcc.gnu.org> | 2002-08-01 06:25:06 +0000 |
| commit | abecfc8f7b738d589ff9cb67655b13262a79fb0a (patch) | |
| tree | 313155df97996072fed86db9c94a225526e987d9 /gcc/cp/lang-specs.h | |
| parent | 4078b403a7dc806f4521f3600b524bed55309515 (diff) | |
| download | gcc-abecfc8f7b738d589ff9cb67655b13262a79fb0a.zip gcc-abecfc8f7b738d589ff9cb67655b13262a79fb0a.tar.gz gcc-abecfc8f7b738d589ff9cb67655b13262a79fb0a.tar.bz2 | |
c-common.c (cb_register_builtins): If C++, define __EXCEPTIONS, __DEPRECATED and __GXX_ABI_VERSION as appropriate.
* c-common.c (cb_register_builtins): If C++, define
__EXCEPTIONS, __DEPRECATED and __GXX_ABI_VERSION as appropriate.
* gcc.c (cpp_unique_options): Remove __GXX_ABI_VERSION.
cp:
* lang-specs.h: Simplify in accordance with new code in
c-common.c.
From-SVN: r55924
Diffstat (limited to 'gcc/cp/lang-specs.h')
| -rw-r--r-- | gcc/cp/lang-specs.h | 26 |
1 files changed, 7 insertions, 19 deletions
diff --git a/gcc/cp/lang-specs.h b/gcc/cp/lang-specs.h index f35ff71..7b87116 100644 --- a/gcc/cp/lang-specs.h +++ b/gcc/cp/lang-specs.h @@ -33,28 +33,16 @@ Boston, MA 02111-1307, USA. */ {".c++", "@c++", 0}, {".C", "@c++", 0}, {"@c++", - /* cc1plus has an integrated ISO C preprocessor. We should invoke - the external preprocessor if -save-temps is given. */ + /* We should convert -ansi to -std=c++98 even if -fpreprocessed, + to get dollars in identifiers correct. */ "%{E|M|MM:cc1plus -E %{!no-gcc:-D__GNUG__=%v1}\ - %{!Wno-deprecated:-D__DEPRECATED}\ - %{!fno-exceptions:-D__EXCEPTIONS}\ - %{ansi:-D__STRICT_ANSI__ -trigraphs -$} %(cpp_options) %2\ - %(cpp_debug_options)}\ + %{ansi:-std=c++98} %(cpp_options) %2 %(cpp_debug_options)}\ %{!E:%{!M:%{!MM:\ - %{save-temps:cc1plus -E \ - %{!no-gcc:-D__GNUG__=%v1}\ - %{!Wno-deprecated:-D__DEPRECATED}\ - %{!fno-exceptions:-D__EXCEPTIONS}\ - %{ansi:-D__STRICT_ANSI__ -trigraphs -$}\ - %(cpp_options) %2 %b.ii \n}\ + %{save-temps:cc1plus -E %{!no-gcc:-D__GNUG__=%v1}\ + %{ansi:-std=c++98} %(cpp_options) %2 %b.ii \n}\ cc1plus %{save-temps:-fpreprocessed %b.ii}\ - %{!save-temps:%(cpp_unique_options)\ - %{!no-gcc:-D__GNUG__=%v1} \ - %{!Wno-deprecated:-D__DEPRECATED}\ - %{!fno-exceptions:-D__EXCEPTIONS}\ - %{ansi:-D__STRICT_ANSI__}}\ - %{ansi:-trigraphs -$}\ - %(cc1_options) %2 %{+e1*}\ + %{!save-temps:%(cpp_unique_options) %{!no-gcc:-D__GNUG__=%v1}}\ + %{ansi:-std=c++98} %(cc1_options) %2 %{+e1*}\ %{!fsyntax-only:%(invoke_as)}}}}", CPLUSPLUS_CPP_SPEC}, {".ii", "@c++-cpp-output", 0}, |