From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 16103 invoked by alias); 9 Oct 2013 14:09:00 -0000 Mailing-List: contact binutils-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: binutils-owner@sourceware.org Received: (qmail 16083 invoked by uid 89); 9 Oct 2013 14:09:00 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-3.6 required=5.0 tests=AWL,BAYES_00,RP_MATCHES_RCVD,SPF_HELO_PASS,SPF_PASS autolearn=ham version=3.3.2 X-Spam-User: qpsmtpd, 2 recipients X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 09 Oct 2013 14:08:59 +0000 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r99E8vlS024231 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 9 Oct 2013 10:08:57 -0400 Received: from barimba (ovpn-113-128.phx2.redhat.com [10.3.113.128]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r99E8unc030494 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Wed, 9 Oct 2013 10:08:56 -0400 From: Tom Tromey To: Hans-Peter Nilsson Cc: gdb-patches@sourceware.org, binutils@sourceware.org Subject: Re: [PATCH] fix PR symtab/15597 References: <1375983426-19308-1-git-send-email-tromey@redhat.com> <87pprfft9c.fsf@fleche.redhat.com> <8738obfd3q.fsf@fleche.redhat.com> Date: Wed, 09 Oct 2013 14:09:00 -0000 In-Reply-To: <8738obfd3q.fsf@fleche.redhat.com> (Tom Tromey's message of "Tue, 08 Oct 2013 19:27:05 -0600") Message-ID: <878uy2edtz.fsf@fleche.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-SW-Source: 2013-10/txt/msg00111.txt.bz2 Tom> Sorry about that. Tom> I'll fix it in the morning. Here's the fix I am checking in. Tom bfd/ChangeLog: 2013-10-09 Tom Tromey * bfd-in2.h: Rebuild. * opncls.c (bfd_get_alt_debug_link_info): Change type of buildid_len to bfd_size_type. gdb/ChangeLog: 2013-10-09 Tom Tromey * dwarf2read.c (dwarf2_get_dwz_file): Update for type change in bfd_get_alt_debug_link_info. Index: bfd/bfd-in2.h =================================================================== RCS file: /cvs/src/src/bfd/bfd-in2.h,v retrieving revision 1.613 diff -u -r1.613 bfd-in2.h --- bfd/bfd-in2.h 8 Oct 2013 19:56:14 -0000 1.613 +++ bfd/bfd-in2.h 9 Oct 2013 14:01:57 -0000 @@ -1067,7 +1067,8 @@ char *bfd_get_debug_link_info (bfd *abfd, unsigned long *crc32_out); -char *bfd_get_alt_debug_link_info (bfd * abfd, size_t *buildid_len, +char *bfd_get_alt_debug_link_info (bfd * abfd, + bfd_size_type *buildid_len, bfd_byte **buildid_out); char *bfd_follow_gnu_debuglink (bfd *abfd, const char *dir); Index: bfd/opncls.c =================================================================== RCS file: /cvs/src/src/bfd/opncls.c,v retrieving revision 1.83 diff -u -r1.83 opncls.c --- bfd/opncls.c 8 Oct 2013 19:56:14 -0000 1.83 +++ bfd/opncls.c 9 Oct 2013 14:01:58 -0000 @@ -1194,7 +1194,8 @@ bfd_get_alt_debug_link_info SYNOPSIS - char *bfd_get_alt_debug_link_info (bfd * abfd, size_t *buildid_len, + char *bfd_get_alt_debug_link_info (bfd * abfd, + bfd_size_type *buildid_len, bfd_byte **buildid_out); DESCRIPTION @@ -1207,7 +1208,7 @@ */ char * -bfd_get_alt_debug_link_info (bfd * abfd, size_t *buildid_len, +bfd_get_alt_debug_link_info (bfd * abfd, bfd_size_type *buildid_len, bfd_byte **buildid_out) { asection *sect; Index: gdb/dwarf2read.c =================================================================== RCS file: /cvs/src/src/gdb/dwarf2read.c,v retrieving revision 1.842 diff -u -r1.842 dwarf2read.c --- gdb/dwarf2read.c 8 Oct 2013 19:56:15 -0000 1.842 +++ gdb/dwarf2read.c 9 Oct 2013 14:02:01 -0000 @@ -2365,6 +2365,7 @@ struct cleanup *cleanup; const char *filename; struct dwz_file *result; + bfd_size_type buildid_len_arg; size_t buildid_len; bfd_byte *buildid; @@ -2373,7 +2374,7 @@ bfd_set_error (bfd_error_no_error); data = bfd_get_alt_debug_link_info (dwarf2_per_objfile->objfile->obfd, - &buildid_len, &buildid); + &buildid_len_arg, &buildid); if (data == NULL) { if (bfd_get_error () == bfd_error_no_error) @@ -2384,6 +2385,8 @@ cleanup = make_cleanup (xfree, data); make_cleanup (xfree, buildid); + buildid_len = (size_t) buildid_len_arg; + filename = (const char *) data; if (!IS_ABSOLUTE_PATH (filename)) {