[SCM] archer-jankratochvil-absdir: Merge branch 'xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal' into xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal-macrorel

[jkratoch@sourceware.org]

The branch, archer-jankratochvil-absdir has been updated
       via  672aaf87ea140eacbb7c6af61b443aaee3860a09 (commit)
       via  466546359251c6dc1f09ded0c0314478eacb8fe9 (commit)
       via  23e12ae6e5969bcb0a150e87794c9373e7206065 (commit)
      from  167f5462d519d3d878841e544d50f180866cbe47 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit 672aaf87ea140eacbb7c6af61b443aaee3860a09
Merge: 167f546 4665463
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Sun Jan 27 23:00:32 2013 +0100

    Merge branch 'xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal' into xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal-macrorel

commit 466546359251c6dc1f09ded0c0314478eacb8fe9
Merge: 7960ae6 23e12ae
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Sun Jan 27 23:00:31 2013 +0100

    Merge branch 'xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab' into xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal

commit 23e12ae6e5969bcb0a150e87794c9373e7206065
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Sun Jan 27 22:59:50 2013 +0100

    .

-----------------------------------------------------------------------

Summary of changes:
 gdb/psymtab.c |   12 ++++--------
 gdb/symtab.c  |    8 +++-----
 2 files changed, 7 insertions(+), 13 deletions(-)

First 500 lines of diff:
diff --git a/gdb/psymtab.c b/gdb/psymtab.c
index dcf5570..2965e9f 100644
--- a/gdb/psymtab.c
+++ b/gdb/psymtab.c
@@ -1391,16 +1391,12 @@ expand_symtabs_matching_via_partial
 	  if (ps->anonymous)
 	    continue;
 
-	  if (!(*file_matcher) (ps->filename, data, 0))
-	    continue;
-
 	  /* Before we invoke realpath, which can get expensive when many
 	     files are involved, do a quick comparison of the basenames.  */
-	  if (!basenames_may_differ
-	      && !(*file_matcher) (lbasename (ps->filename), data, 1))
-	    continue;
-
-	  if (!(*file_matcher) (psymtab_to_fullname (ps), data, 0))
+	  if (!(*file_matcher) (ps->filename, data, 0)
+	      && (basenames_may_differ
+		  || (*file_matcher) (lbasename (ps->filename), data, 1))
+	      && !(*file_matcher) (psymtab_to_fullname (ps), data, 0))
 	    continue;
 	}
 
diff --git a/gdb/symtab.c b/gdb/symtab.c
index 744b276..0b42e6e 100644
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -3275,16 +3275,13 @@ sources_info (char *ignore, int from_tty)
 }
 
 /* Compare FILE against all the NFILES entries of FILES.  If BASENAMES is
-   non-zero compare only lbasename of everything.  */
+   non-zero compare only lbasename of FILES.  */
 
 static int
 file_matches (const char *file, char *files[], int nfiles, int basenames)
 {
   int i;
 
-  if (basenames)
-    file = lbasename (file);
-
   if (file != NULL && nfiles != 0)
     {
       for (i = 0; i < nfiles; i++)
@@ -3609,7 +3606,8 @@ search_symbols (char *regexp, enum search_domain kind,
 	       a substring of symtab_to_fullname as it may contain "./" etc.  */
 	    if ((file_matches (real_symtab->filename, files, nfiles, 0)
 		 || ((basenames_may_differ
-		      || file_matches (real_symtab->filename, files, nfiles, 1))
+		      || file_matches (lbasename (real_symtab->filename),
+				       files, nfiles, 1))
 		     && file_matches (symtab_to_fullname (real_symtab),
 				      files, nfiles, 0)))
 		&& ((!datum.preg_p


hooks/post-receive
--
Repository for Project Archer.