[SCM] archer-jankratochvil-fedora18: Merge remote-tracking branch 'archer/archer-tromey-dwz-multifile-rebase' into archer-jankratochvil-fedora18

[jkratoch@sourceware.org]

The branch, archer-jankratochvil-fedora18 has been updated
       via  b478323cbd38598902fa2efb1794192d7ba627b1 (commit)
       via  4b3c3eb4fc52d4bb0605a21128ed7641be6dae3a (commit)
      from  f07a2a24c493eebc9df6b7c9ca8c7fe0813aaffd (commit)

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

- Log -----------------------------------------------------------------
commit b478323cbd38598902fa2efb1794192d7ba627b1
Merge: f07a2a2 4b3c3eb
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Fri Jul 6 19:00:56 2012 +0200

    Merge remote-tracking branch 'archer/archer-tromey-dwz-multifile-rebase' into archer-jankratochvil-fedora18

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

Summary of changes:
 gdb/dwarf2read.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

First 500 lines of diff:
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 447dc25..603b669 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -17564,8 +17564,9 @@ dwarf2_find_containing_comp_unit (sect_offset offset,
 
       mid_cu = dwarf2_per_objfile->all_comp_units[mid];
       cu_off = &mid_cu->offset;
-      if (mid_cu->is_dwz >= offset_in_dwz
-	  && cu_off->sect_off >= offset.sect_off)
+      if (mid_cu->is_dwz > offset_in_dwz
+	  || (mid_cu->is_dwz == offset_in_dwz
+	      && cu_off->sect_off >= offset.sect_off))
 	high = mid;
       else
 	low = mid + 1;


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