From patchwork Sat Jul 7 21:20:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kratochvil X-Patchwork-Id: 28278 Received: (qmail 13350 invoked by alias); 7 Jul 2018 21:20:55 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 13232 invoked by uid 89); 7 Jul 2018 21:20:54 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-24.0 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_ASCII_DIVIDERS, KAM_NUMSUBJECT, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=Hx-languages-length:2345 X-HELO: mx1.redhat.com Received: from mx3-rdu2.redhat.com (HELO mx1.redhat.com) (66.187.233.73) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 07 Jul 2018 21:20:52 +0000 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 148357C6A9; Sat, 7 Jul 2018 21:20:51 +0000 (UTC) Received: from host1.jankratochvil.net (ovpn-116-109.ams2.redhat.com [10.36.116.109]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 803112156889; Sat, 7 Jul 2018 21:20:50 +0000 (UTC) Date: Sat, 7 Jul 2018 23:20:48 +0200 From: Jan Kratochvil To: Simon Marchi Cc: gdb-patches@sourceware.org Subject: [commit+8.2] contrib/gdb-add-index.sh -dwarf-5 Message-ID: <20180707212048.GA1810293@host1.jankratochvil.net> References: <20180630193651.GA3127041@host1.jankratochvil.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.10.0 (2018-05-17) On Sat, 07 Jul 2018 16:38:57 +0200, Simon Marchi wrote: > That LGTM. But could you maybe update the "usage" line to include the > optional -dwarf-5 argument? Yes, sorry I forgot about that, fixed. Checked in master: 25289ac1670fb164770b0753116b1e909beed4cb and 8.2 branch: dbc864ae0befb776deae11a6e420ba7f1c6b80c4 Thanks, Jan ------------------------------------------------------------------------------ (gdb) help save gdb-index Save a gdb-index file. Usage: save gdb-index [-dwarf-5] DIRECTORY No options create one file with .gdb-index extension for pre-DWARF-5 compatible .gdb_index section. With -dwarf-5 creates two files with extension .debug_names and .debug_str for DWARF-5 .debug_names section. ------------------------------------------------------------------------------ But gdb-add-index command provided no way how to pass the -dwarf-5 option. gdb/ChangeLog 2018-07-07 Jan Kratochvil * contrib/gdb-add-index.sh ($dwarf5): New, use it. --- gdb/ChangeLog | 4 ++++ gdb/contrib/gdb-add-index.sh | 10 ++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 076f571e2a..eb65f91488 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2018-07-07 Jan Kratochvil + + * contrib/gdb-add-index.sh ($dwarf5): New, use it. + 2018-07-07 Simon Marchi * ia64-tdep.c (get_reg_name, get_fpreg_name, get_saveloc_name, diff --git a/gdb/contrib/gdb-add-index.sh b/gdb/contrib/gdb-add-index.sh index 71146966ab..8e260d7e6f 100755 --- a/gdb/contrib/gdb-add-index.sh +++ b/gdb/contrib/gdb-add-index.sh @@ -23,8 +23,14 @@ OBJCOPY=${OBJCOPY:=objcopy} myname="${0##*/}" +dwarf5="" +if [ "$1" = "-dwarf-5" ]; then + dwarf5="$1" + shift +fi + if test $# != 1; then - echo "usage: $myname FILE" 1>&2 + echo "usage: $myname [-dwarf-5] FILE" 1>&2 exit 1 fi @@ -48,7 +54,7 @@ rm -f $index4 $index5 $debugstr $debugstrmerge $debugstrerr trap "rm -f $index4 $index5 $debugstr $debugstrmerge $debugstrerr" 0 $GDB --batch -nx -iex 'set auto-load no' \ - -ex "file $file" -ex "save gdb-index $dir" || { + -ex "file $file" -ex "save gdb-index $dwarf5 $dir" || { # Just in case. status=$? echo "$myname: gdb error generating index for $file" 1>&2