From: Daniel Jacobowitz Date: Tue, 30 May 2006 15:57:09 +0000 (+0000) Subject: gdb/ X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9308fc88e7f28b38ac63622291a3ec853a72c1c8;p=binutils-gdb.git gdb/ * Makefile.in (arm-linux-nat.o): Update dependencies. * arm-linux-nat.c: Include "gdb_proc_service.h". (PTRACE_GET_THREAD_AREA): Define. (ps_get_thread_area): New function. gdb/gdbserver/ * Makefile.in (linux-arm-low.o): Update dependencies. * linux-arm-low.c: Include "../gdb_proc_service.h". (PTRACE_GET_THREAD_AREA): Define. (ps_get_thread_area): New function. --- diff --git a/gdb/ChangeLog b/gdb/ChangeLog index f96c664c796..84ab7f59064 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2006-05-30 Daniel Jacobowitz + + * Makefile.in (arm-linux-nat.o): Update dependencies. + * arm-linux-nat.c: Include "gdb_proc_service.h". + (PTRACE_GET_THREAD_AREA): Define. + (ps_get_thread_area): New function. + 2006-05-28 Alexandre Oliva * dwarf2-frame.h (enum dwarf2_frame_reg_rule): Add diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 6f3d911634a..e76828425f3 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -1769,7 +1769,7 @@ arch-utils.o: arch-utils.c $(defs_h) $(arch_utils_h) $(buildsym_h) \ $(floatformat_h) arm-linux-nat.o: arm-linux-nat.c $(defs_h) $(inferior_h) $(gdbcore_h) \ $(gdb_string_h) $(regcache_h) $(arm_tdep_h) $(gregset_h) \ - $(target_h) $(linux_nat_h) + $(target_h) $(linux_nat_h) $(gdb_proc_service_h) arm-linux-tdep.o: arm-linux-tdep.c $(defs_h) $(target_h) $(value_h) \ $(gdbtypes_h) $(floatformat_h) $(gdbcore_h) $(frame_h) $(regcache_h) \ $(doublest_h) $(solib_svr4_h) $(osabi_h) $(arm_tdep_h) \ diff --git a/gdb/arm-linux-nat.c b/gdb/arm-linux-nat.c index 8023026a209..0cfec203f5e 100644 --- a/gdb/arm-linux-nat.c +++ b/gdb/arm-linux-nat.c @@ -37,6 +37,13 @@ /* Prototypes for supply_gregset etc. */ #include "gregset.h" +/* Defines ps_err_e, struct ps_prochandle. */ +#include "gdb_proc_service.h" + +#ifndef PTRACE_GET_THREAD_AREA +#define PTRACE_GET_THREAD_AREA 22 +#endif + extern int arm_apcs_32; #define typeNone 0x00 @@ -694,6 +701,23 @@ arm_linux_kernel_u_size (void) return (sizeof (struct user)); } +/* Fetch the thread-local storage pointer for libthread_db. */ + +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 unsigned int get_linux_version (unsigned int *vmajor, unsigned int *vminor, diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 1a0ddf3e017..14baaf6ef2b 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,10 @@ +2006-05-30 Daniel Jacobowitz + + * Makefile.in (linux-arm-low.o): Update dependencies. + * linux-arm-low.c: Include "../gdb_proc_service.h". + (PTRACE_GET_THREAD_AREA): Define. + (ps_get_thread_area): New function. + 2006-05-09 Nathan Sidwell * configure.srv (m68k*-*-uclinux*): New target. diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in index 0da5f6cde68..9dc77deb314 100644 --- a/gdb/gdbserver/Makefile.in +++ b/gdb/gdbserver/Makefile.in @@ -269,7 +269,8 @@ linux_low_h = $(srcdir)/linux-low.h linux-low.o: linux-low.c $(linux_low_h) $(server_h) $(CC) -c $(CPPFLAGS) $(INTERNAL_CFLAGS) $< @USE_THREAD_DB@ -linux-arm-low.o: linux-arm-low.c $(linux_low_h) $(server_h) +linux-arm-low.o: linux-arm-low.c $(linux_low_h) $(server_h) \ + $(gdb_proc_service_h) linux-cris-low.o: linux-cris-low.c $(linux_low_h) $(server_h) linux-crisv32-low.o: linux-crisv32-low.c $(linux_low_h) $(server_h) linux-i386-low.o: linux-i386-low.c $(linux_low_h) $(server_h) \ diff --git a/gdb/gdbserver/linux-arm-low.c b/gdb/gdbserver/linux-arm-low.c index b2c314fef81..c01f97ad893 100644 --- a/gdb/gdbserver/linux-arm-low.c +++ b/gdb/gdbserver/linux-arm-low.c @@ -1,5 +1,6 @@ /* GNU/Linux/ARM specific low level interface, for the remote server for GDB. - Copyright (C) 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 + Copyright (C) 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GDB. @@ -22,6 +23,14 @@ #include "server.h" #include "linux-low.h" +#include + +#include "gdb_proc_service.h" + +#ifndef PTRACE_GET_THREAD_AREA +#define PTRACE_GET_THREAD_AREA 22 +#endif + #ifdef HAVE_SYS_REG_H #include #endif @@ -105,6 +114,23 @@ arm_reinsert_addr () return pc; } +/* Fetch the thread-local storage pointer for libthread_db. */ + +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; +} + struct linux_target_ops the_low_target = { arm_num_regs, arm_regmap,