From patchwork Mon Nov 17 00:40:17 2014
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Yao Qi <yao@codesourcery.com>
X-Patchwork-Id: 3773
Received: (qmail 1884 invoked by alias); 17 Nov 2014 00:40:24 -0000
Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <gdb-patches.sourceware.org>
List-Unsubscribe: <mailto:gdb-patches-unsubscribe-##L=##H@sourceware.org>
List-Subscribe: <mailto:gdb-patches-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/gdb-patches/>
List-Post: <mailto:gdb-patches@sourceware.org>
List-Help: <mailto:gdb-patches-help@sourceware.org>,
	<http://sourceware.org/ml/#faqs>
Sender: gdb-patches-owner@sourceware.org
Delivered-To: mailing list gdb-patches@sourceware.org
Received: (qmail 1870 invoked by uid 89); 17 Nov 2014 00:40:23 -0000
Authentication-Results: sourceware.org; auth=none
X-Virus-Found: No
X-Spam-SWARE-Status: No, score=-1.7 required=5.0 tests=AWL, BAYES_00,
	RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.2
X-HELO: relay1.mentorg.com
Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131)
	by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with
	ESMTP; Mon, 17 Nov 2014 00:40:21 +0000
Received: from svr-orw-fem-04.mgc.mentorg.com ([147.34.97.41])	by
	relay1.mentorg.com with esmtp id 1XqAMb-0000vX-Ma from
	Yao_Qi@mentor.com ; Sun, 16 Nov 2014 16:40:17 -0800
Received: from GreenOnly (147.34.91.1) by svr-orw-fem-04.mgc.mentorg.com
	(147.34.97.41) with Microsoft SMTP Server id 14.3.181.6;
	Sun, 16 Nov 2014 16:40:17 -0800
From: Yao Qi <yao@codesourcery.com>
To: Petr Machata <pmachata@redhat.com>
CC: <gdb-patches@sourceware.org>
Subject: Re: [PATCH] dwarf.exp: In 64-bit units,
	emit also abbrev offset as a 64-bit field
References: <m2egt6h8xo.fsf@redhat.com>
	<87389kj0pr.fsf@codesourcery.com>	<m2ioig8e0t.fsf@redhat.com>
Date: Mon, 17 Nov 2014 08:40:17 +0800
In-Reply-To: <m2ioig8e0t.fsf@redhat.com> (Petr Machata's message of "Sat,
	15	Nov 2014 20:22:42 +0100")
Message-ID: <87lhnahd72.fsf@codesourcery.com>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux)
MIME-Version: 1.0
X-IsSubscribed: yes

Petr Machata <pmachata@redhat.com> writes:

>> I'll commit the patch for you if you are happy with the updated changelog.
>
> I am.

OK, patch below is what I pushed in.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 65687c0..2a027d5 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-17  Petr Machata  <pmachata@redhat.com>
+
+	* lib/dwarf.exp  (Dwarf::cu, Dwarf::tu): Emit
+	${_cu_offset_size} bytes abbrev offset.
+
 2014-11-15  Doug Evans  <xdje42@gmail.com>
 
 	PR symtab/17559
diff --git a/gdb/testsuite/lib/dwarf.exp b/gdb/testsuite/lib/dwarf.exp
index cadda3e..778ad1c 100644
--- a/gdb/testsuite/lib/dwarf.exp
+++ b/gdb/testsuite/lib/dwarf.exp
@@ -954,7 +954,7 @@ namespace eval Dwarf {
 	}
 	define_label $start_label
 	_op .2byte $_cu_version Version
-	_op .4byte $my_abbrevs Abbrevs
+	_op .${_cu_offset_size}byte $my_abbrevs Abbrevs
 	_op .byte $_cu_addr_size "Pointer size"
 
 	_defer_output $_abbrev_section {
@@ -1047,7 +1047,7 @@ namespace eval Dwarf {
 	}
 	define_label $start_label
 	_op .2byte $_cu_version Version
-	_op .4byte $my_abbrevs Abbrevs
+	_op .${_cu_offset_size}byte $my_abbrevs Abbrevs
 	_op .byte $_cu_addr_size "Pointer size"
 	_op .8byte $signature Signature
 	if { $type_label != "" } {