Patchwork [commit+8.2] contrib/gdb-add-index.sh -dwarf-5

login
register
mail settings
Submitter Jan Kratochvil
Date July 7, 2018, 9:20 p.m.
Message ID <20180707212048.GA1810293@host1.jankratochvil.net>
Download mbox | patch
Permalink /patch/28278/
State New
Headers show

Comments

Jan Kratochvil - July 7, 2018, 9:20 p.m.
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  <jan.kratochvil@redhat.com>

	* 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(-)

Patch

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  <jan.kratochvil@redhat.com>
+
+	* contrib/gdb-add-index.sh ($dwarf5): New, use it.
+
 2018-07-07  Simon Marchi  <simon.marchi@polymtl.ca>
 
 	* 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