Wed Dec 9 15:33:01 1998 Dave Brolley <brolley@cygnus.com>

	* lex.c (lang_init_options): Initialize cpplib.
	* decl2.c (parse_options,cpp_initialized): Removed.
	(lang_decode_option): Move initialization of cpplib to
	lang_init_options.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@24221 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index fc5d228..bc6665d 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+Wed Dec  9 15:33:01 1998  Dave Brolley  <brolley@cygnus.com>
+
+       * lex.c (lang_init_options): Initialize cpplib.
+       * decl2.c (parse_options,cpp_initialized): Removed.
+       (lang_decode_option): Move initialization of cpplib to
+       lang_init_options.
+
 1998-12-09  Mark Mitchell  <mark@markmitchell.com>
 
        * decl.c (grokdeclarator): Update the name of the TEMPLATE_DECL, as

diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index 9fc24fe..570d292 100644 (file)
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -46,8 +46,6 @@ Boston, MA 02111-1307, USA.  */
 #if USE_CPPLIB
 #include "cpplib.h"
 extern cpp_reader  parse_in;
-extern cpp_options parse_options;
-static int cpp_initialized;
 #endif
 
 static tree get_sentry PROTO((tree));
@@ -523,13 +521,6 @@ lang_decode_option (argc, argv)
   int strings_processed;
   char *p = argv[0];
 #if USE_CPPLIB
-  if (! cpp_initialized)
-    {
-      cpp_reader_init (&parse_in);
-      parse_in.opts = &parse_options;
-      cpp_options_init (&parse_options);
-      cpp_initialized = 1;
-    }
   strings_processed = cpp_handle_option (&parse_in, argc, argv);
 #else
   strings_processed = 0;

diff --git a/gcc/cp/lex.c b/gcc/cp/lex.c
index 48085bd..4c11871 100644 (file)
--- a/gcc/cp/lex.c
+++ b/gcc/cp/lex.c
@@ -388,6 +388,12 @@ char *cplus_tree_code_name[] = {
 void
 lang_init_options ()
 {
+#if USE_CPPLIB
+  cpp_reader_init (&parse_in);
+  parse_in.opts = &parse_options;
+  cpp_options_init (&parse_options);
+#endif
+
   /* Default exceptions on.  */
   flag_exceptions = 1;
 }