diff options
| author | Neil Booth <neilb@earthling.net> | 2000-11-26 10:48:50 +0000 |
|---|---|---|
| committer | Neil Booth <neil@gcc.gnu.org> | 2000-11-26 10:48:50 +0000 |
| commit | 056487e74726a9e9067792ca058744366801ea50 (patch) | |
| tree | 19c1903975465b332e8493e4d43d5dc97114c91d /gcc/cp | |
| parent | 7dcae299c7bdc0e17fce1b330739889a15ff1ca7 (diff) | |
| download | gcc-056487e74726a9e9067792ca058744366801ea50.zip gcc-056487e74726a9e9067792ca058744366801ea50.tar.gz gcc-056487e74726a9e9067792ca058744366801ea50.tar.bz2 | |
Makefile.in: Remove MAYBE_CPPLIB and maybe_cpplib.
* Makefile.in: Remove MAYBE_CPPLIB and maybe_cpplib.
* c-decl.c: Remove parse_in declaration.
* c-lang.c: Similarly.
* c-lex.c: Similarly.
* c-parse.in: Similarly.
* c-pragma.c: Similarly.
* configure.in: Similarly.
* cp/Make-lang.in: Similarly.
* cp/spew.c: Similarly.
* cp/decl2.c: Remove check for lang-c++ option.
* cp/lang-specs.h: Remove -lang-c++ from cc1plus command line.
* cp/lex.c (lang_init_options): With cpp_reader_init, default to C++.
* c-lex.h: Add declaration of parse_in.
* cppinit.c: Call set_lang after allocating pfile->pending.
* configure: Regenerate.
From-SVN: r37754
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/Make-lang.in | 4 | ||||
| -rw-r--r-- | gcc/cp/decl2.c | 2 | ||||
| -rw-r--r-- | gcc/cp/lang-specs.h | 4 | ||||
| -rw-r--r-- | gcc/cp/lex.c | 2 | ||||
| -rw-r--r-- | gcc/cp/spew.c | 2 |
5 files changed, 5 insertions, 9 deletions
diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in index 7ad2b82..75e3b6c 100644 --- a/gcc/cp/Make-lang.in +++ b/gcc/cp/Make-lang.in @@ -103,9 +103,9 @@ CXX_OBJS = cp/call.o cp/decl.o cp/errfn.o cp/expr.o cp/pt.o cp/typeck2.o \ cp-warn = cc1plus$(exeext): $(CXX_OBJS) $(CXX_C_OBJS) $(BACKEND) \ - $(MAYBE_CPPLIB) $(LIBDEPS) + libcpp.a $(LIBDEPS) $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ \ - $(CXX_OBJS) $(CXX_C_OBJS) $(BACKEND) $(MAYBE_CPPLIB) $(LIBS) + $(CXX_OBJS) $(CXX_C_OBJS) $(BACKEND) libcpp.a $(LIBS) # Special build rules. $(srcdir)/cp/cfns.h: $(srcdir)/cp/cfns.gperf diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c index a66bb95b..c73cec3 100644 --- a/gcc/cp/decl2.c +++ b/gcc/cp/decl2.c @@ -573,8 +573,6 @@ lang_decode_option (argc, argv) if (!strcmp (p, "-ftraditional") || !strcmp (p, "-traditional")) /* ignore */; - else if (!strcmp (p, "-lang-c++")) - /* ignore - cpplib needs to see this */; else if (p[0] == '-' && p[1] == 'f') { /* Some kind of -f option. diff --git a/gcc/cp/lang-specs.h b/gcc/cp/lang-specs.h index 1f1428b..7e83eec 100644 --- a/gcc/cp/lang-specs.h +++ b/gcc/cp/lang-specs.h @@ -38,7 +38,7 @@ Boston, MA 02111-1307, USA. */ %{save-temps:cpp0 -lang-c++ %{ansi:-trigraphs -$ -D__STRICT_ANSI__}\ %(cpp_options) %b.ii \n}\ cc1plus %{save-temps:-fpreprocessed %b.ii}\ - %{!save-temps:%(cpp_options)} -lang-c++\ + %{!save-temps:%(cpp_options)}\ %{!no-gcc:-D__GNUG__=%v1}\ %{fnew-abi:-D__GXX_ABI_VERSION=100}\ %{ansi:-trigraphs -$ -D__STRICT_ANSI__}\ @@ -47,5 +47,5 @@ Boston, MA 02111-1307, USA. */ {".ii", "@c++-cpp-output"}, {"@c++-cpp-output", "%{!M:%{!MM:%{!E:\ - cc1plus -lang-c++ -fpreprocessed %i %(cc1_options) %2 %{+e*}\ + cc1plus -fpreprocessed %i %(cc1_options) %2 %{+e*}\ %{!fsyntax-only:%(invoke_as)}}}}"}, diff --git a/gcc/cp/lex.c b/gcc/cp/lex.c index 6498e7b..79919f9 100644 --- a/gcc/cp/lex.c +++ b/gcc/cp/lex.c @@ -247,7 +247,7 @@ void lang_init_options () { cpp_init (); - cpp_reader_init (&parse_in, CLK_GNUC89); + cpp_reader_init (&parse_in, CLK_GNUCXX); /* Default exceptions on. */ flag_exceptions = 1; diff --git a/gcc/cp/spew.c b/gcc/cp/spew.c index e05b6f6..070cf2f 100644 --- a/gcc/cp/spew.c +++ b/gcc/cp/spew.c @@ -45,8 +45,6 @@ Boston, MA 02111-1307, USA. */ #define SPEW_INLINE inline #endif -extern cpp_reader parse_in; - /* This takes a token stream that hasn't decided much about types and tries to figure out as much as it can, with excessive lookahead and backtracking. */ |