Little IMI fixes.

[Geoffrey Keating]

These fixes fix, respectively, the incorrect error messages that Mark
noticed, and the bootstrap failure with --enable-intermodule that
Richard and others have found.

[FYI, the weird errors you were seeing are what happens when you try
to build GCC without defining IN_GCC.  Working out why is an exercise
left to the reader; it took me about 4 hours...]

Bootstrapped (with --enable-intermodule) and tested on powerpc-darwin.

-- 
- Geoffrey Keating <geoffk@apple.com>

====================
Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ChangeLog,v
retrieving revision 2.503
diff -u -p -u -p -r2.503 ChangeLog
--- ChangeLog	15 Jul 2003 01:04:17 -0000	2.503
+++ ChangeLog	15 Jul 2003 05:28:54 -0000
@@ -1,3 +1,9 @@
+2003-07-14  Geoffrey Keating  <geoffk@apple.com>
+
+	* c-opts.c (push_command_line_include): Don't free deferred_opts,
+	we'll need it.
+	(finish_options): Reset init_cursor.
+
 2003-07-14  Mark Mitchell  <mark@codesourcery.com>
 
 	PR debug/11098
Index: c-opts.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/c-opts.c,v
retrieving revision 1.72
diff -u -p -u -p -r1.72 c-opts.c
--- c-opts.c	11 Jul 2003 08:33:03 -0000	1.72
+++ c-opts.c	15 Jul 2003 05:28:54 -0000
@@ -1418,6 +1418,7 @@ finish_options (void)
 	}
     }
 
+  include_cursor = 0;
   push_command_line_include ();
 }
 
@@ -1438,7 +1439,6 @@ push_command_line_include (void)
 
   if (include_cursor == deferred_count)
     {
-      free (deferred_opts);
       /* Restore the line map from <command line>.  */
       cpp_change_file (parse_in, LC_RENAME, main_input_filename);
       /* -Wunused-macros should only warn about macros defined hereafter.  */
====================