diff options
| -rw-r--r-- | nptl_db/db_info.c | 2 | ||||
| -rw-r--r-- | nptl_db/structs.def | 4 | ||||
| -rw-r--r-- | nptl_db/td_symbol_list.c | 23 | ||||
| -rw-r--r-- | nptl_db/thread_dbP.h | 5 |
4 files changed, 31 insertions, 3 deletions
diff --git a/nptl_db/db_info.c b/nptl_db/db_info.c index aa485369b2..40cf5bf08e 100644 --- a/nptl_db/db_info.c +++ b/nptl_db/db_info.c @@ -71,10 +71,12 @@ DESC (_thread_db_pthread_dtvp, #define DB_VARIABLE(name) DESC (_thread_db_##name, 0, name) #define DB_ARRAY_VARIABLE(name) ARRAY_DESC (_thread_db_##name, 0, name) #define DB_SYMBOL(name) /* Nothing. */ +#define DB_FUNCTION(name) /* Nothing. */ #include "structs.def" #undef DB_STRUCT #undef DB_STRUCT_FIELD #undef DB_SYMBOL +#undef DB_FUNCTION #undef DB_VARIABLE #undef DESC diff --git a/nptl_db/structs.def b/nptl_db/structs.def index c8b31bb7f5..b17a628e0a 100644 --- a/nptl_db/structs.def +++ b/nptl_db/structs.def @@ -51,8 +51,8 @@ DB_STRUCT_FIELD (td_eventbuf_t, eventdata) DB_SYMBOL (stack_used) DB_SYMBOL (__stack_user) DB_SYMBOL (nptl_version) -DB_SYMBOL (__nptl_create_event) -DB_SYMBOL (__nptl_death_event) +DB_FUNCTION (__nptl_create_event) +DB_FUNCTION (__nptl_death_event) DB_SYMBOL (__nptl_threads_events) DB_VARIABLE (__nptl_nthreads) DB_VARIABLE (__nptl_last_event) diff --git a/nptl_db/td_symbol_list.c b/nptl_db/td_symbol_list.c index 061767eb74..5d6c94e5b7 100644 --- a/nptl_db/td_symbol_list.c +++ b/nptl_db/td_symbol_list.c @@ -23,6 +23,12 @@ #include "thread_dbP.h" +#ifdef HAVE_ASM_GLOBAL_DOT_NAME +# define DOT "." /* PPC64 requires . prefix on code symbols. */ +#else +# define DOT /* No prefix. */ +#endif + static const char *symbol_list_arr[] = { # define DB_STRUCT(type) \ @@ -31,11 +37,14 @@ static const char *symbol_list_arr[] = [SYM_##type##_FIELD_##field] = "_thread_db_" #type "_" #field, # define DB_SYMBOL(name) \ [SYM_##name] = #name, +# define DB_FUNCTION(name) \ + [SYM_##name] = DOT #name, # define DB_VARIABLE(name) \ [SYM_##name] = #name, \ [SYM_DESC_##name] = "_thread_db_" #name, # include "structs.def" # undef DB_STRUCT +# undef DB_FUNCTION # undef DB_SYMBOL # undef DB_VARIABLE @@ -59,6 +68,18 @@ td_symbol_list (void) ps_err_e td_lookup (struct ps_prochandle *ps, int idx, psaddr_t *sym_addr) { + ps_err_e result; assert (idx >= 0 && idx < SYM_NUM_MESSAGES); - return ps_pglobal_lookup (ps, LIBPTHREAD_SO, symbol_list_arr[idx], sym_addr); + result = ps_pglobal_lookup (ps, LIBPTHREAD_SO, symbol_list_arr[idx], + sym_addr); + +#ifdef HAVE_ASM_GLOBAL_DOT_NAME + /* For PowerPC, 64-bit uses dot symbols but 32-bit does not. + We could be a 64-bit libthread_db debugging a 32-bit libpthread. */ + if (result == PS_NOSYM && symbol_list_arr[idx][0] == '.') + result = ps_pglobal_lookup (ps, LIBPTHREAD_SO, &symbol_list_arr[idx][1], + sym_addr); +#endif + + return result; } diff --git a/nptl_db/thread_dbP.h b/nptl_db/thread_dbP.h index 4546d24c23..64266200f0 100644 --- a/nptl_db/thread_dbP.h +++ b/nptl_db/thread_dbP.h @@ -36,11 +36,13 @@ enum # define DB_STRUCT(type) SYM_SIZEOF_##type, # define DB_STRUCT_FIELD(type, field) SYM_##type##_FIELD_##field, # define DB_SYMBOL(name) SYM_##name, +# define DB_FUNCTION(name) SYM_##name, # define DB_VARIABLE(name) SYM_##name, SYM_DESC_##name, # include "structs.def" # undef DB_STRUCT # undef DB_STRUCT_FIELD # undef DB_SYMBOL +# undef DB_FUNCTION # undef DB_VARIABLE SYM_TH_UNIQUE_CONST_THREAD_AREA, @@ -88,12 +90,15 @@ struct td_thragent db_desc_t ta_field_##type##_##field; # define DB_SYMBOL(name) \ psaddr_t ta_addr_##name; +# define DB_FUNCTION(name) \ + psaddr_t ta_addr_##name; # define DB_VARIABLE(name) \ psaddr_t ta_addr_##name; \ db_desc_t ta_var_##name; # include "structs.def" # undef DB_STRUCT # undef DB_STRUCT_FIELD +# undef DB_FUNCTION # undef DB_SYMBOL # undef DB_VARIABLE |