From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 17948 invoked by alias); 6 Jul 2012 17:01:03 -0000 Mailing-List: contact archer-commits-help@sourceware.org; run by ezmlm Sender: Precedence: bulk List-Post: List-Help: List-Subscribe: Received: (qmail 17919 invoked by uid 9674); 6 Jul 2012 17:01:02 -0000 Date: Fri, 06 Jul 2012 17:01:00 -0000 Message-ID: <20120706170102.17900.qmail@sourceware.org> From: jkratoch@sourceware.org To: archer-commits@sourceware.org Subject: [SCM] archer-jankratochvil-fedora18: Merge remote-tracking branch 'archer/archer-tromey-dwz-multifile-rebase' into archer-jankratochvil-fedora18 X-Git-Refname: refs/heads/archer-jankratochvil-fedora18 X-Git-Reftype: branch X-Git-Oldrev: f07a2a24c493eebc9df6b7c9ca8c7fe0813aaffd X-Git-Newrev: b478323cbd38598902fa2efb1794192d7ba627b1 X-SW-Source: 2012-q3/txt/msg00004.txt.bz2 List-Id: 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 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.