[PATCH 2/3] Make jit-reader-load accept absolute paths to reader shared objects.

Sanjoy Das
2012-09-18T04:30:17Z

---
gdb/ChangeLog | 5 +++++
gdb/doc/ChangeLog | 4 ++++
gdb/doc/gdb.texinfo | 22 +++++++++++++---------
gdb/jit.c | 5 ++++-
4 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a1c55e5..24ea360 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
2012-09-18 Sanjoy Das <sanjoy@playingwithpointers.com>

+ * jit.c (jit_reader_load_command): Interpret the jit reader name
+ as an absolute path if it begins with a forward slash.
+
+2012-09-18 Sanjoy Das <sanjoy@playingwithpointers.com>
+
PR gdb/14550

* jit.c (finalize_symtab): Ensure that only the global block has a
diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog
index adcd4ff..9b84dcc 100644
--- a/gdb/doc/ChangeLog
+++ b/gdb/doc/ChangeLog
@@ -1,3 +1,7 @@
+2012-09-18 Sanjoy Das <sanjoy@playingwithpointers.com>
+ * gdb.texinfo (Using JIT Debug Info Readers): Change documentation
+ to reflect that jit-reader-load now supports absolute file-names.
+
2012-09-17 Yao Qi <yao@codesourcery.com>

* gdb.texinfo (List): Describe the meaning of 0 and -1 in
diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
index dc8860a..0939c24 100644
--- a/gdb/doc/gdb.texinfo
+++ b/gdb/doc/gdb.texinfo
@@ -33419,15 +33419,19 @@ Readers can be loaded and unloaded using the @code{jit-reader-load}
and @code{jit-reader-unload} commands.

@table @code
-@item jit-reader-load @var{reader-name}
-Load the JIT reader named @var{reader-name}. On a UNIX system, this
-will usually load @file{@var{libdir}/gdb/@var{reader-name}}, where
-@var{libdir} is the system library directory, usually
-@file{/usr/local/lib}. Only one reader can be active at a time;
-trying to load a second reader when one is already loaded will result
-in @value{GDBN} reporting an error. A new JIT reader can be loaded by
-first unloading the current one using @code{jit-reader-load} and then
-invoking @code{jit-reader-load}.
+@item jit-reader-load @var{reader}
+Load the JIT reader named @var{reader}. @var{reader} can either be
+the absolute path to or the file name of a shared object. In the
+latter case, gdb will try to load the reader from a pre-configured
+directory, usually @file{@var{libdir}/gdb/} on a UNIX system (here
+@var{libdir} is the system library directory, often
+@file{/usr/local/lib}).
+
+Only one reader can be active at a time; trying to load a second
+reader when one is already loaded will result in @value{GDBN}
+reporting an error. A new JIT reader can be loaded by first unloading
+the current one using @code{jit-reader-load} and then invoking
+@code{jit-reader-load}.

@item jit-reader-unload
Unload the currently loaded JIT reader.
diff --git a/gdb/jit.c b/gdb/jit.c
index 2f9d426..818238f 100644
--- a/gdb/jit.c
+++ b/gdb/jit.c
@@ -208,7 +208,10 @@ jit_reader_load_command (char *args, int from_tty)
if (loaded_jit_reader != NULL)
error (_("JIT reader already loaded. Run jit-reader-unload first."));

- so_name = xstrprintf ("%s/%s", jit_reader_dir, args);
+ if (args[0] == '/')
+ so_name = xstrdup (args);
+ else
+ so_name = xstrprintf ("%s/%s", jit_reader_dir, args);
prev_cleanup = make_cleanup (xfree, so_name);

loaded_jit_reader = jit_reader_load (so_name);
--
1.7.10.4