mirrors/binutils-gdb
0
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2025-01-18 14:04:24 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

PR binutils/11512

Browse Source 
* coffgen.c (coff_find_nearest_line): Incldue the section address
        of function name symbols in address comparisons.
This commit is contained in:
Nick Clifton 2010-04-27 14:42:50 +00:00
parent 4ba3f0345f
commit 4d9e2b2774
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bfd/ChangeLog
View File

@ -1,3 +1,9 @@
2010-04-27 Nick Clifton <nickc@redhat.com>
PR binutils/11512
* coffgen.c (coff_find_nearest_line): Incldue the section address
of function name symbols in address comparisons.
2010-04-27 Nick Clifton <nickc@redhat.com> 2010-04-27 Nick Clifton <nickc@redhat.com>
* po/fr.po: Updated French translation. * po/fr.po: Updated French translation.

10
bfd/coffgen.c
View File

@ -2152,6 +2152,7 @@ coff_find_nearest_line (bfd *abfd,
maxdiff = (bfd_vma) 0 - (bfd_vma) 1; maxdiff = (bfd_vma) 0 - (bfd_vma) 1;
while (1) while (1)
{ {
bfd_vma file_addr;
combined_entry_type *p2; combined_entry_type *p2;
for (p2 = p + 1 + p->u.syment.n_numaux; for (p2 = p + 1 + p->u.syment.n_numaux;
@ -2170,11 +2171,16 @@ coff_find_nearest_line (bfd *abfd,
} }
} }
file_addr = (bfd_vma) p2->u.syment.n_value;
/* PR 11512: Include the section address of the function name symbol. */
if (p2->u.syment.n_scnum > 0)
file_addr += coff_section_from_bfd_index (abfd,
p2->u.syment.n_scnum)->vma;
/* We use <= MAXDIFF here so that if we get a zero length /* We use <= MAXDIFF here so that if we get a zero length
file, we actually use the next file entry. */ file, we actually use the next file entry. */
if (p2 < pend if (p2 < pend
&& offset + sec_vma >= (bfd_vma) p2->u.syment.n_value && offset + sec_vma >= file_addr
&& offset + sec_vma - (bfd_vma) p2->u.syment.n_value <= maxdiff) && offset + sec_vma - file_addr <= maxdiff)
{ {
*filename_ptr = (char *) p->u.syment._n._n_n._n_offset; *filename_ptr = (char *) p->u.syment._n._n_n._n_offset;
maxdiff = offset + sec_vma - p2->u.syment.n_value; maxdiff = offset + sec_vma - p2->u.syment.n_value;