From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 11635 invoked by alias); 7 Jun 2008 12:18:51 -0000 Received: (qmail 11610 invoked by uid 367); 7 Jun 2008 12:18:50 -0000 Date: Sat, 07 Jun 2008 12:18:00 -0000 Message-ID: <20080607121850.11595.qmail@sourceware.org> From: cagney@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Don't align the module's load address. X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 9d9ce378409bbd2c2ea56101bb4e549f9e977a82 X-Git-Newrev: 9e102f1cd6ceeef293733e313656ef47e8bd7118 Mailing-List: contact frysk-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: frysk-cvs-owner@sourceware.org Reply-To: frysk@sourceware.org X-SW-Source: 2008-q2/txt/msg00352.txt.bz2 The branch, master has been updated via 9e102f1cd6ceeef293733e313656ef47e8bd7118 (commit) from 9d9ce378409bbd2c2ea56101bb4e549f9e977a82 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit 9e102f1cd6ceeef293733e313656ef47e8bd7118 Author: Andrew Cagney Date: Sat Jun 7 08:17:32 2008 -0400 Don't align the module's load address. frysk-imports/elfutils/libdwfl/ChangeLog 2008-06-07 Andrew Cagney * dwfl_module_getdwarf.c (open_elf): Don't align the module's load address. Bug frysk/6599, redhat/450218. ----------------------------------------------------------------------- Summary of changes: frysk-imports/elfutils/libdwfl/ChangeLog | 3 +++ .../elfutils/libdwfl/dwfl_module_getdwarf.c | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) First 500 lines of diff: diff --git a/frysk-imports/elfutils/libdwfl/ChangeLog b/frysk-imports/elfutils/libdwfl/ChangeLog index d70c3da..ac95d68 100644 --- a/frysk-imports/elfutils/libdwfl/ChangeLog +++ b/frysk-imports/elfutils/libdwfl/ChangeLog @@ -1,5 +1,8 @@ 2008-06-07 Andrew Cagney + * dwfl_module_getdwarf.c (open_elf): Don't align the module's load + address. Bug frysk/6599, redhat/450218. + * dwfl_module_getsrc.c (dwfl_module_getsrc): Remove bias from address. Fix frysk/6600, redhat/450229. diff --git a/frysk-imports/elfutils/libdwfl/dwfl_module_getdwarf.c b/frysk-imports/elfutils/libdwfl/dwfl_module_getdwarf.c index 663d256..1d75754 100644 --- a/frysk-imports/elfutils/libdwfl/dwfl_module_getdwarf.c +++ b/frysk-imports/elfutils/libdwfl/dwfl_module_getdwarf.c @@ -96,8 +96,9 @@ open_elf (Dwfl_Module *mod, struct dwfl_file *file) goto elf_error; if (ph->p_type == PT_LOAD) { - file->bias = ((mod->low_addr & -ph->p_align) - - (ph->p_vaddr & -ph->p_align)); + // Align the vaddr. + Dwarf_Addr vaddr = ph->p_vaddr & -ph->p_align; + file->bias = (mod->low_addr - vaddr); break; } } hooks/post-receive -- frysk system monitor/debugger