[PATCH v2] Resurrect gdb-add-index as a contrib script

[Samuel Bronson <naesten@gmail.com>]

This includes some changes made in Fedora's gdb packaging[1], some
slight layout changes to make it look nicer in 80 columns, and a line
from Doug's patch[2] to deal with file arguments with no "/".  I'm
still thinking about whether to include the rest of Doug's
gdb-add-index changes: they'd make the script harder to read, but more
robust.

(I've also recast it under the license from (info "(maintain)License
Notices for Other Files") so people aren't scared to use snippets in
their Makefiles or whatever.)

[1]: http://pkgs.fedoraproject.org/cgit/gdb.git/log/gdb-gdb-add-index-script.patch?id=fe74423b0812bae6d7bb027584e401a2ac37d24d
[2]: https://sourceware.org/ml/gdb-patches/2010-09/msg00130.html

I'm including a log of relevant previous activity.

(I would just include committishes, but I'm not quite confident that
history won't be rewritten again, invalidating the hashes, plus there
are no relevant tags so the first two parts of git-describe(1) output
wouldn't be any help either.)

commit 97924a976b7d6e1669cf22c5fdf292a53bae6bd0
Author: Tom Tromey <tromey@redhat.com>
Date:   Tue Nov 16 17:38:40 2010 +0000

    	* gdb-add-index.sh: Really remove.

 gdb/ChangeLog        |  4 ++++
 gdb/gdb-add-index.sh | 29 -----------------------------
 2 files changed, 4 insertions(+), 29 deletions(-)

commit c29c521f43a1f470355cc76391bb10ec2b73284a
Author: Tom Tromey <tromey@redhat.com>
Date:   Tue Aug 10 18:35:53 2010 +0000

    gdb
    	Revert gdb-add-index addition:
    	* Makefile.in (install-only): Don't install gdb-add-index.
    	* gdb-add-index.sh: Remove.
    gdb/doc
    	Revert gdb-add-index addition:
    	* gdb.texinfo (Index Files): Don't document gdb-add-index.

 gdb/ChangeLog       |  6 ++++++
 gdb/Makefile.in     | 11 +----------
 gdb/doc/ChangeLog   |  5 +++++
 gdb/doc/gdb.texinfo | 10 ----------
 4 files changed, 12 insertions(+), 20 deletions(-)

commit c2bbed2a5ab3c5c5950ef192f9be610a11aaa367
Author: Tom Tromey <tromey@redhat.com>
Date:   Fri Jul 30 20:46:34 2010 +0000

    gdb
    	* Makefile.in (install-only): Install gdb-add-index.
    	* gdb-add-index.sh: New file.
    gdb/doc
    	* gdb.texinfo (Index Files): Mention gdb-add-index.

 gdb/ChangeLog        |  5 +++++
 gdb/Makefile.in      | 11 ++++++++++-
 gdb/doc/ChangeLog    |  4 ++++
 gdb/doc/gdb.texinfo  |  9 +++++++++
 gdb/gdb-add-index.sh | 29 +++++++++++++++++++++++++++++
 5 files changed, 57 insertions(+), 1 deletion(-)
---
 gdb/ChangeLog                |  8 ++++++++
 gdb/contrib/gdb-add-index.sh | 27 +++++++++++++++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100755 gdb/contrib/gdb-add-index.sh

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 79abe3d..def36a3 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2013-11-08  Tom Tromey  <tromey@redhat.com>
+	    Jan Kratochvil <jan.kratochvil@redhat.com>
+	    Doug Evans <dje@google.com>
+	    Samuel Bronson  <naesten@gmail.com>
+
+	Bring back gdb-add-index as a contrib script.
+	* contrib/gdb-add-index.sh: New file.
+
 2013-11-08  Doug Evans  <dje@google.com>
 
 	* dwarf2read.c (dwarf2_read_debug): Change to unsigned int.
diff --git a/gdb/contrib/gdb-add-index.sh b/gdb/contrib/gdb-add-index.sh
new file mode 100755
index 0000000..81b7377
--- /dev/null
+++ b/gdb/contrib/gdb-add-index.sh
@@ -0,0 +1,27 @@
+#! /bin/sh
+
+# Add a .gdb_index section to a file.
+
+# Copyright (C) 2010, 2012-2013 Free Software Foundation, Inc.
+#
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.  This file is offered as-is,
+# without any warranty.
+
+file="$1"
+dir="${file%/*}"
+test "$dir" = "$file" && dir="."
+
+# We don't care if gdb gives an error.
+gdb -nx -iex 'set auto-load no' --batch-silent \
+    -ex "file $file" \
+    -ex "save gdb-index $dir"
+
+if test -f "${file}.gdb-index"; then
+    objcopy --add-section .gdb_index="${file}.gdb-index" \
+	--set-section-flags .gdb_index=readonly "$file" "$file"
+    rm -f "${file}.gdb-index"
+fi
+
+exit 0
-- 
1.8.4.rc3