diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 024914af0fc..ee59322d5b8 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -73,6 +73,15 @@ Fri Mar  8 06:48:45 2002  Richard Kenner  <kenner@vlsi1.ultra.nyu.edu>
 
 	* config/mips/mips.h (SUBTARGET_CPP_SIZE_SPEC): Simplify.
 
+2002-03-07  Matt Hiller  <hiller@redhat.com>
+
+	* gensupport.c (first_dir_md_include): Renamed from include;
+	change all references.
+	(last_dir_md_include): Renamed from last_include; change all
+	references.
+	(init_md_reader): Unconditionally initialize base_dir whether or
+	not filename is a relative path.
+
 2002-03-07  Alexandre Oliva  <aoliva@redhat.com>
 
 	* config/fp-bit.c (_unord_f2): Compile it in even if
diff --git a/gcc/gensupport.c b/gcc/gensupport.c
index 415df01775a..d7cb6732145 100644
--- a/gcc/gensupport.c
+++ b/gcc/gensupport.c
@@ -76,10 +76,10 @@ struct file_name_list
     const char *fname;
   };
 
-struct file_name_list *include = 0;     /* First dir to search */
+struct file_name_list *first_dir_md_include = 0;  /* First dir to search */
         /* First dir to search for <file> */
 struct file_name_list *first_bracket_include = 0;
-struct file_name_list *last_include = 0;        /* Last in chain */
+struct file_name_list *last_dir_md_include = 0;        /* Last in chain */
 
 static void remove_constraints PARAMS ((rtx));
 static void process_rtx PARAMS ((rtx, int));
@@ -227,7 +227,7 @@ process_include (desc, lineno)
   struct file_name_list *stackp;
   int flen;
 
-  stackp = include;
+  stackp = first_dir_md_include;
 
   /* If specified file name is absolute, just open it.  */
   if (IS_ABSOLUTE_PATHNAME (filename) || !stackp)
@@ -981,11 +981,11 @@ init_md_reader_args (argc, argv)
 		dirtmp = (struct file_name_list *)
 		  xmalloc (sizeof (struct file_name_list));
 		dirtmp->next = 0;	/* New one goes on the end */
-		if (include == 0)
-		  include = dirtmp;
+		if (first_dir_md_include == 0)
+		  first_dir_md_include = dirtmp;
 		else
-		  last_include->next = dirtmp;
-		last_include = dirtmp;	/* Tail follows the last one */
+		  last_dir_md_include->next = dirtmp;
+		last_dir_md_include = dirtmp;	/* Tail follows the last one */
 		if (argv[i][1] == 'I' && argv[i][2] != 0)
 		  dirtmp->fname = argv[i] + 2;
 		else if (i + 1 == argc)
@@ -1015,12 +1015,9 @@ init_md_reader (filename)
   int c;
   char *lastsl;
 
-  if (!IS_ABSOLUTE_PATHNAME (filename))
-    {
-      lastsl = strrchr (filename, '/');
-      if (lastsl != NULL) 
-	base_dir = save_string (filename, lastsl - filename + 1 );
-    }
+  lastsl = strrchr (filename, '/');
+  if (lastsl != NULL) 
+    base_dir = save_string (filename, lastsl - filename + 1 );
 
   read_rtx_filename = filename;
   input_file = fopen (filename, "r");