diff options
| author | zack <zack@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-03-02 01:03:47 +0000 |
|---|---|---|
| committer | zack <zack@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-03-02 01:03:47 +0000 |
| commit | a45495831fc0a10be05ced025adc81e8224a608e (patch) | |
| tree | 43f54cdf446fa1bfa1add9a724d589f75f644c16 /gcc/cp | |
| parent | a19b96682e7d8a5423d9a32aa4623cf90bb56fb3 (diff) | |
| download | gcc-a45495831fc0a10be05ced025adc81e8224a608e.tar.gz | |
* gcc.c, cp/lang-specs.h, f/lang-specs.h, java/lang-specs.h,
objc/lang-specs.h: Add zero initializer for cpp_spec field to
all array elements.
* cp/lang-specs.h: Don't put an #ifdef inside the initializer
list; set a default for CPLUSPLUS_CPP_SPEC and use it.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@40173 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/cp/lang-specs.h | 27 |
2 files changed, 21 insertions, 13 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 053c227cf62..fb100a7ca90 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,10 @@ +2001-03-01 Zack Weinberg <zackw@stanford.edu> + + * lang-specs.h: Add zero initializer for cpp_spec field to + all array elements that need one. Don't put an #ifdef inside + the initializer list; set a default for CPLUSPLUS_CPP_SPEC and + use it. + 2001-03-01 Nathan Sidwell <nathan@codesourcery.com> Implement using decls inside template functions. diff --git a/gcc/cp/lang-specs.h b/gcc/cp/lang-specs.h index c8e708b9f58..55c1f749dab 100644 --- a/gcc/cp/lang-specs.h +++ b/gcc/cp/lang-specs.h @@ -22,12 +22,16 @@ Boston, MA 02111-1307, USA. */ /* This is the contribution to the `default_compilers' array in gcc.c for g++. */ - {".cc", "@c++"}, - {".cp", "@c++"}, - {".cxx", "@c++"}, - {".cpp", "@c++"}, - {".c++", "@c++"}, - {".C", "@c++"}, +#ifndef CPLUSPLUS_CPP_SPEC +#define CPLUSPLUS_CPP_SPEC 0 +#endif + + {".cc", "@c++", 0}, + {".cp", "@c++", 0}, + {".cxx", "@c++", 0}, + {".cpp", "@c++", 0}, + {".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. */ @@ -50,13 +54,10 @@ Boston, MA 02111-1307, USA. */ %{ansi:-D__STRICT_ANSI__}}\ %{ansi:-trigraphs -$}\ %(cc1_options) %2 %{+e1*}\ - %{!fsyntax-only:%(invoke_as)}}}}" -#ifdef CPLUSPLUS_CPP_SPEC - , CPLUSPLUS_CPP_SPEC -#endif - }, - {".ii", "@c++-cpp-output"}, + %{!fsyntax-only:%(invoke_as)}}}}", + CPLUSPLUS_CPP_SPEC}, + {".ii", "@c++-cpp-output", 0}, {"@c++-cpp-output", "%{!M:%{!MM:%{!E:\ cc1plus -fpreprocessed %i %(cc1_options) %2 %{+e*}\ - %{!fsyntax-only:%(invoke_as)}}}}"}, + %{!fsyntax-only:%(invoke_as)}}}}", 0}, |