From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 12407 invoked by alias); 1 Jun 2012 19:46:44 -0000 Mailing-List: contact archer-commits-help@sourceware.org; run by ezmlm Sender: Precedence: bulk List-Post: List-Help: List-Subscribe: Received: (qmail 12366 invoked by uid 306); 1 Jun 2012 19:46:41 -0000 Date: Fri, 01 Jun 2012 19:46:00 -0000 Message-ID: <20120601194641.12340.qmail@sourceware.org> From: tromey@sourceware.org To: archer-commits@sourceware.org Subject: [SCM] archer-tromey-dwz-multifile: macros in the .dwz file always refer to strings in the same file X-Git-Refname: refs/heads/archer-tromey-dwz-multifile X-Git-Reftype: branch X-Git-Oldrev: fda83c61dfd47e965129840c53ceca5420711a06 X-Git-Newrev: 672cdd999e229e46a31520e9897af0303314cc1d X-SW-Source: 2012-q2/txt/msg00036.txt.bz2 List-Id: The branch, archer-tromey-dwz-multifile has been updated via 672cdd999e229e46a31520e9897af0303314cc1d (commit) from fda83c61dfd47e965129840c53ceca5420711a06 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit 672cdd999e229e46a31520e9897af0303314cc1d Author: Tom Tromey Date: Fri Jun 1 13:45:58 2012 -0600 macros in the .dwz file always refer to strings in the same file ----------------------------------------------------------------------- Summary of changes: gdb/dwarf2read.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) First 500 lines of diff: diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index 8e3453e..66b0110 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -16062,7 +16062,7 @@ dwarf_decode_macro_bytes (bfd *abfd, gdb_byte *mac_ptr, gdb_byte *mac_end, struct macro_source_file *current_file, struct line_header *lh, char *comp_dir, struct dwarf2_section_info *section, - int section_is_gnu, + int section_is_gnu, int section_is_dwz, unsigned int offset_size, struct objfile *objfile, htab_t include_hash) @@ -16273,6 +16273,7 @@ dwarf_decode_macro_bytes (bfd *abfd, gdb_byte *mac_ptr, gdb_byte *mac_end, struct dwarf2_section_info *include_section = section; struct dwarf2_section_info alt_section; gdb_byte *include_mac_end = mac_end; + int is_dwz = section_is_dwz; *slot = mac_ptr; @@ -16286,13 +16287,14 @@ dwarf_decode_macro_bytes (bfd *abfd, gdb_byte *mac_ptr, gdb_byte *mac_end, include_bfd = dwz->macro.asection->owner; include_section = &dwz->macro; include_mac_end = dwz->macro.buffer + dwz->macro.size; + is_dwz = 1; } dwarf_decode_macro_bytes (include_bfd, include_section->buffer + offset, include_mac_end, current_file, lh, comp_dir, - section, section_is_gnu, + section, section_is_gnu, is_dwz, offset_size, objfile, include_hash); htab_remove_elt (include_hash, mac_ptr); @@ -16482,7 +16484,8 @@ dwarf_decode_macros (struct line_header *lh, unsigned int offset, slot = htab_find_slot (include_hash, mac_ptr, INSERT); *slot = mac_ptr; dwarf_decode_macro_bytes (abfd, mac_ptr, mac_end, - current_file, lh, comp_dir, section, section_is_gnu, + current_file, lh, comp_dir, section, + section_is_gnu, 0, offset_size, objfile, include_hash); do_cleanups (cleanup); } hooks/post-receive -- Repository for Project Archer.