From 3b2a0cf216646598c8d76c098f1734c9bb5604c7 Mon Sep 17 00:00:00 2001 From: Joel Brobecker Date: Wed, 6 Jul 2011 21:40:17 +0000 Subject: Fix JIT clang-lli regression (unable to read JIT descriptor from memory) 2011-07-06 Paul Pluzhnikov * jit.c (jit_inferior_init): Forward declare. (jit_breakpoint_re_set_internal): Call jit_inferior_init. testsuite/ChangeLog: 2011-07-06 Paul Pluzhnikov * gdb.base/jit-so.exp: New test. * gdb.base/jit-dlmain.c: New file. * gdb.base/jit-main.c: Allow "main" to be elsewhere. --- gdb/jit.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'gdb/jit.c') diff --git a/gdb/jit.c b/gdb/jit.c index be123a5..01ac5fa 100644 --- a/gdb/jit.c +++ b/gdb/jit.c @@ -40,6 +40,9 @@ static const char *const jit_descriptor_name = "__jit_debug_descriptor"; static const struct inferior_data *jit_inferior_data = NULL; +static void +jit_inferior_init (struct gdbarch *gdbarch); + /* Non-zero if we want to see trace of jit level stuff. */ static int jit_debug = 0; @@ -351,6 +354,11 @@ jit_breakpoint_re_set_internal (struct gdbarch *gdbarch, inf_data->breakpoint_addr = SYMBOL_VALUE_ADDRESS (reg_symbol); if (inf_data->breakpoint_addr == 0) return 2; + + /* If we have not read the jit descriptor yet (e.g. because the JITer + itself is in a shared library which just got loaded), do so now. */ + if (inf_data->descriptor_addr == 0) + jit_inferior_init (gdbarch); } else return 0; -- cgit v1.1