From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 26057 invoked by alias); 13 Feb 2013 13:22:31 -0000 Received: (qmail 25849 invoked by uid 22791); 13 Feb 2013 13:22:29 -0000 X-SWARE-Spam-Status: No, hits=-0.5 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,KHOP_SPAMHAUS_DROP,RCVD_IN_DNSWL_LOW,TBIRD_SPOOF X-Spam-Check-By: sourceware.org Received: from service87.mimecast.com (HELO service87.mimecast.com) (91.220.42.44) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 13 Feb 2013 13:22:22 +0000 Received: from cam-owa2.Emea.Arm.com (fw-tnat.cambridge.arm.com [217.140.96.21]) by service87.mimecast.com; Wed, 13 Feb 2013 13:22:21 +0000 Received: from [10.1.72.50] ([10.1.255.212]) by cam-owa2.Emea.Arm.com with Microsoft SMTPSVC(6.0.3790.3959); Wed, 13 Feb 2013 13:22:21 +0000 Message-ID: <511B938C.9070404@arm.com> Date: Wed, 13 Feb 2013 13:22:00 -0000 From: Marcus Shawcroft User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130106 Thunderbird/17.0.2 MIME-Version: 1.0 To: "gdb-patches@sourceware.org" Subject: [PATCH] Fix %llx ARI gripe in aarch64-linux-nat. X-MC-Unique: 113021313222106101 Content-Type: multipart/mixed; boundary="------------020801050308090907050202" Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2013-02/txt/msg00295.txt.bz2 This is a multi-part message in MIME format. --------------020801050308090907050202 Content-Type: text/plain; charset=WINDOWS-1252; format=flowed Content-Transfer-Encoding: quoted-printable Content-length: 322 Hi, This patch fixes the ARI gripe about the use of %llx in aarch64-linux-nat. I'll commit this as obvious shortly. /Marcus 2013-02-13 Marcus Shawcroft * aarch64-linux-nat.c (debug_reg_change_callback) (aarch64_linux_get_debug_reg_capacity): ARI fix: Replace %llx with %s and phex().= --------------020801050308090907050202 Content-Type: text/x-patch; name=0002-AArch64-replace-ll-with-s-and-phex.patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0002-AArch64-replace-ll-with-s-and-phex.patch" Content-length: 2836 diff --git a/gdb/aarch64-linux-nat.c b/gdb/aarch64-linux-nat.c index 7cbd8b8..a2b6815 100644 --- a/gdb/aarch64-linux-nat.c +++ b/gdb/aarch64-linux-nat.c @@ -344,9 +344,10 @@ debug_reg_change_callback (struct lwp_info *lwp, void = *ptr) fprintf_unfiltered (gdb_stdlog, "debug_reg_change_callback: \n\tOn entry:\n"); fprintf_unfiltered (gdb_stdlog, - "\tpid%d, dr_changed_bp=3D0x%llx, " - "dr_changed_wp=3D0x%llx\n", - pid, info->dr_changed_bp, info->dr_changed_wp); + "\tpid%d, dr_changed_bp=3D0x%s, " + "dr_changed_wp=3D0x%s\n", + pid, phex (info->dr_changed_bp), + phex (info->dr_changed_wp)); } =20 dr_changed_ptr =3D is_watchpoint ? &info->dr_changed_wp @@ -370,9 +371,10 @@ debug_reg_change_callback (struct lwp_info *lwp, void = *ptr) if (debug_hw_points) { fprintf_unfiltered (gdb_stdlog, - "\tOn exit:\n\tpid%d, dr_changed_bp=3D0x%llx, " - "dr_changed_wp=3D0x%llx\n", - pid, info->dr_changed_bp, info->dr_changed_wp); + "\tOn exit:\n\tpid%d, dr_changed_bp=3D0x%s, " + "dr_changed_wp=3D0x%s\n", + pid, phex (info->dr_changed_bp), + phex (info->dr_changed_wp)); } =20 /* Continue the iteration. */ @@ -745,16 +747,16 @@ aarch64_linux_get_debug_reg_capacity (void) aarch64_num_wp_regs =3D AARCH64_DEBUG_NUM_SLOTS (dreg_state.dbg_info= ); if (aarch64_num_wp_regs > AARCH64_HWP_MAX_NUM) { - warning ("Unexpected number of hardware watchpoint registers reported" - " by ptrace, got %d, expected %d.", + warning (_("Unexpected number of hardware watchpoint registers" + " reported by ptrace, got %d, expected %d."), aarch64_num_wp_regs, AARCH64_HWP_MAX_NUM); aarch64_num_wp_regs =3D AARCH64_HWP_MAX_NUM; } } else { - warning ("Unable to determine the number of hardware watchpoints" - " available."); + warning (_("Unable to determine the number of hardware watchpoints" + " available.")); aarch64_num_wp_regs =3D 0; } =20 @@ -765,16 +767,16 @@ aarch64_linux_get_debug_reg_capacity (void) aarch64_num_bp_regs =3D AARCH64_DEBUG_NUM_SLOTS (dreg_state.dbg_info= ); if (aarch64_num_bp_regs > AARCH64_HBP_MAX_NUM) { - warning ("Unexpected number of hardware breakpoint registers reported" - " by ptrace, got %d, expected %d.", + warning (_("Unexpected number of hardware breakpoint registers" + " reported by ptrace, got %d, expected %d."), aarch64_num_bp_regs, AARCH64_HBP_MAX_NUM); aarch64_num_bp_regs =3D AARCH64_HBP_MAX_NUM; } } else { - warning ("Unable to determine the number of hardware breakpoints" - " available."); + warning (_("Unable to determine the number of hardware breakpoints" + " available.")); aarch64_num_bp_regs =3D 0; } } --=20 1.7.9.5 --------------020801050308090907050202--