From: Per Bothner <per@bothner.com>
Date: Mon, 3 Nov 2003 07:24:28 +0000 (-0800)
Subject: c-opts.c (needValue): Do cpp_find_main_file before processing any imacros flags...
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d8ccee1ee42845b71e2e5b8b99d689512383797f;p=gcc.git

c-opts.c (needValue): Do cpp_find_main_file before processing any imacros flags...


	* c-opts.c (needValue):  Do cpp_find_main_file before processing
	any imacros flags, so pfile->main_file is set for the latter.

From-SVN: r73212
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 09c59c1546a..928acd5f671 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-02  Per Bothner  <per@bothner.com>
+
+	* c-opts.c (needValue):  Do cpp_find_main_file before processing
+	any imacros flags, so pfile->main_file is set for the latter.
+
 2003-11-03  Andreas Jaeger  <aj@suse.de>
 	    Zack Weinberg  <zack@codesourcery.com>
 
diff --git a/gcc/c-opts.c b/gcc/c-opts.c
index 4473eaf49d3..bbabe891b66 100644
--- a/gcc/c-opts.c
+++ b/gcc/c-opts.c
@@ -1392,6 +1392,10 @@ add_prefixed_path (const char *suffix, size_t chain)
 static bool
 finish_options (const char *tif)
 {
+  this_input_filename = tif;
+  if (! cpp_find_main_file (parse_in, this_input_filename))
+    return false;
+
   if (!cpp_opts->preprocessed)
     {
       size_t i;
@@ -1441,9 +1445,6 @@ finish_options (const char *tif)
     }
 
   include_cursor = 0;
-  this_input_filename = tif;
-  if (! cpp_find_main_file (parse_in, this_input_filename))
-    return false;
   push_command_line_include ();
   return true;
 }