summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/cris-tdep.c5
-rw-r--r--gdb/gdbserver/ChangeLog5
-rw-r--r--gdb/gdbserver/linux-crisv32-low.c18
4 files changed, 33 insertions, 0 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 36d441a6abf..8a30eb2990d 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
2013-09-06 Ricard Wanderlof <ricardw@axis.com>
+ * cris-tdep.c (cris_gdbarch_init): Add call to
+ get_gdbarch_fetch_tls_load_module_address.
+
+2013-09-06 Ricard Wanderlof <ricardw@axis.com>
+
* cris-tdep.c (cris_elf_greg_t): Rename from elf_greg_t.
(cris_elf_gregset_t): Rename from elf_gregset_t.
(crisv32_elf_gregset_t): Adjust.
diff --git a/gdb/cris-tdep.c b/gdb/cris-tdep.c
index 1b0e3cdec07..ef2746d7d1f 100644
--- a/gdb/cris-tdep.c
+++ b/gdb/cris-tdep.c
@@ -4137,6 +4137,11 @@ cris_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
set_gdbarch_single_step_through_delay
(gdbarch, crisv32_single_step_through_delay);
+ /* FIXME: Ricard W/2013-09-03: Linux-specific stuff like this
+ should really go in (a new) cris-linux-tdep.c. */
+ set_gdbarch_fetch_tls_load_module_address (gdbarch,
+ svr4_fetch_objfile_link_map);
+
break;
default:
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index f362c342e3c..440c5bb36d3 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,5 +1,10 @@
2013-09-06 Ricard Wanderlof <ricardw@axis.com>
+ * linux-crisv32-low.c (PTRACE_GET_THREAD_AREA): New macro.
+ (ps_get_thread_area): New function.
+
+2013-09-06 Ricard Wanderlof <ricardw@axis.com>
+
* linux-crisv32-low.c (elf_gregset_t): Delete typedef.
(initialize_low_arch): Call init_registers_crisv32 rather than
init_register_crisv32.
diff --git a/gdb/gdbserver/linux-crisv32-low.c b/gdb/gdbserver/linux-crisv32-low.c
index 2849d0252a7..393c3e69bd8 100644
--- a/gdb/gdbserver/linux-crisv32-low.c
+++ b/gdb/gdbserver/linux-crisv32-low.c
@@ -27,6 +27,10 @@ extern const struct target_desc *tdesc_crisv32;
/* CRISv32 */
#define cris_num_regs 49
+#ifndef PTRACE_GET_THREAD_AREA
+#define PTRACE_GET_THREAD_AREA 25
+#endif
+
/* Note: Ignoring USP (having the stack pointer in two locations causes trouble
without any significant gain). */
@@ -339,6 +343,20 @@ cris_stopped_data_address (void)
return eda;
}
+ps_err_e
+ps_get_thread_area (const struct ps_prochandle *ph,
+ lwpid_t lwpid, int idx, void **base)
+{
+ if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0)
+ return PS_ERR;
+
+ /* IDX is the bias from the thread pointer to the beginning of the
+ thread descriptor. It has to be subtracted due to implementation
+ quirks in libthread_db. */
+ *base = (void *) ((char *) *base - idx);
+ return PS_OK;
+}
+
static void
cris_fill_gregset (struct regcache *regcache, void *buf)
{