diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7a1772bb87e..029af4bc803 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2001-03-04  Neil Booth  <neil@daikokuya.demon.co.uk>
+
+	* cppfiles.c (search_from): Special case the empty string.
+
 2001-03-04  Neil Booth  <neil@daikokuya.demon.co.uk>
 
 	* cppfiles.c (_cpp_execute_include): Don't make a null-terminated
diff --git a/gcc/cppfiles.c b/gcc/cppfiles.c
index 0dfd9d0db66..7f15a8d24ca 100644
--- a/gcc/cppfiles.c
+++ b/gcc/cppfiles.c
@@ -804,7 +804,11 @@ search_from (pfile, inc)
   if (CPP_OPTION (pfile, ignore_srcdir))
     return CPP_OPTION (pfile, quote_include);
 
-  dlen = basename (inc->name) - inc->name;
+  /* basename () on Solaris returns "." for an empty string.  */
+  dlen = 0;
+  if (inc->name[0] != '\0')
+    dlen = basename (inc->name) - inc->name;
+
   if (dlen)
     {
       /* We don't guarantee NAME is null-terminated.  This saves