aboutsummaryrefslogtreecommitdiff
path: root/bfd
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2007-09-01 06:09:20 +0000
committerH.J. Lu <hjl.tools@gmail.com>2007-09-01 06:09:20 +0000
commit399347457c16712c193406d56fe31287d2f2afa6 (patch)
treec15ca99f43f4a5195ee70d79104e8fc368e631af /bfd
parent7f3e0549a5aaabd13f4191fc81739fa657e35843 (diff)
downloadfsf-binutils-gdb-399347457c16712c193406d56fe31287d2f2afa6.zip
fsf-binutils-gdb-399347457c16712c193406d56fe31287d2f2afa6.tar.gz
fsf-binutils-gdb-399347457c16712c193406d56fe31287d2f2afa6.tar.bz2
bfd/
2007-08-31 H.J. Lu <hongjiu.lu@intel.com> PR ld/4986 * dwarf2.c (new_line_sorts_after): Also compare line number. ld/testsuite/ 2007-08-31 H.J. Lu <hongjiu.lu@intel.com> PR ld/4986 * ld-x86-64/line.exp: New * ld-x86-64/undefined.s: Likewise.
Diffstat (limited to 'bfd')
-rw-r--r--bfd/ChangeLog7
-rw-r--r--bfd/dwarf2.c3
2 files changed, 8 insertions, 2 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 2aec877..26508d8 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-31 H.J. Lu <hongjiu.lu@intel.com>
+
+ PR ld/4986
+ * dwarf2.c (new_line_sorts_after): Also compare line number.
+
2007-08-31 Jesse Michael <jmichael@suse.de>
* mach-o.c (bfd_mach_o_make_bfd_section): Fix test for non
@@ -9,7 +14,7 @@
narrowing instructions.
2007-08-28 Mark Shinwell <shinwell@codesourcery.com>
- Joseph Myers <joseph@codesourcery.com>
+ Joseph Myers <joseph@codesourcery.com>
* elf32-arm.c (elf32_arm_compare_mapping): Compare first on vma,
then on type.
diff --git a/bfd/dwarf2.c b/bfd/dwarf2.c
index 37d68f9..7f5f397 100644
--- a/bfd/dwarf2.c
+++ b/bfd/dwarf2.c
@@ -917,7 +917,8 @@ new_line_sorts_after (struct line_info *new_line, struct line_info *line)
{
return (new_line->address > line->address
|| (new_line->address == line->address
- && new_line->end_sequence < line->end_sequence));
+ && (new_line->line > line->line
+ || new_line->end_sequence < line->end_sequence)));
}