* psymtab.c (read_psymtabs_with_fullname): Don't call

	psymtab_to_fullname if the basenames are different.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6db6cdf6a40bb8f8e92d30e541be41587014c354..ad754fc52a4d5927558927e062e1102c47a642c9 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-03  Doug Evans  <dje@google.com>
+
+       * psymtab.c (read_psymtabs_with_fullname): Don't call
+       psymtab_to_fullname if the basenames are different.
+
 2013-04-03  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
        * NEWS (Changes in GDB 7.6): Update the data-disassemble for "fullname".

diff --git a/gdb/psymtab.c b/gdb/psymtab.c
index de8a3ccd736f5c866223a6ee4c3fb4ed4ace92d2..1d5f0ee42d90f6a42f2405d74225f2e2899b6a08 100644 (file)
--- a/gdb/psymtab.c
+++ b/gdb/psymtab.c
@@ -1114,7 +1114,11 @@ read_psymtabs_with_fullname (struct objfile *objfile, const char *fullname)
       if (p->anonymous)
        continue;
 
-      if (filename_cmp (fullname, psymtab_to_fullname (p)) == 0)
+      /* psymtab_to_fullname tries to open the file which is slow.
+        Don't call it if we know the basenames don't match.  */
+      if ((basenames_may_differ
+          || filename_cmp (lbasename (fullname), lbasename (p->filename)) == 0)
+         && filename_cmp (fullname, psymtab_to_fullname (p)) == 0)
        psymtab_to_symtab (objfile, p);
     }
 }