Index: symtab.c
===================================================================
RCS file: /cvs/src/src/gdb/symtab.c,v
retrieving revision 1.122
diff -u -p -r1.122 symtab.c
--- symtab.c	8 Nov 2003 00:13:03 -0000	1.122
+++ symtab.c	19 Nov 2003 18:04:15 -0000
@@ -698,6 +698,8 @@ find_pc_sect_psymtab (CORE_ADDR pc, asec
     if (pc >= pst->textlow && pc < pst->texthigh)
       {
 	struct partial_symtab *tpst;
+       struct partial_symtab *best_pst = pst;
+       struct partial_symbol *best_psym = NULL;
 
 	/* An objfile that has its functions reordered might have
 	   many partial symbol tables containing the PC, but
@@ -710,6 +712,11 @@ find_pc_sect_psymtab (CORE_ADDR pc, asec
 	if (msymbol == NULL)
 	  return (pst);
 
+       /* The code range of partial symtabs sometimes overlap, so
+          we need to check all partial symtabs and find the one that
+          fits better for the given PC address. We select the partial
+          symtab that contains a symbol which address is closest to
+          the PC address.  */
 	for (tpst = pst; tpst != NULL; tpst = tpst->next)
 	  {
 	    if (pc >= tpst->textlow && pc < tpst->texthigh)
@@ -721,9 +728,19 @@ find_pc_sect_psymtab (CORE_ADDR pc, asec
 		    && SYMBOL_VALUE_ADDRESS (p)
 		    == SYMBOL_VALUE_ADDRESS (msymbol))
 		  return (tpst);
+                 if (p != NULL)
+                   {
+                     if (best_psym == NULL
+                         || SYMBOL_VALUE_ADDRESS (p)
+                              > SYMBOL_VALUE_ADDRESS (best_psym))
+                       {
+                         best_psym = p;
+                         best_pst = tpst;
+                       }
+                   }
 	      }
 	  }
-	return (pst);
+       return best_pst;
       }
   }
   return (NULL);