From 5812197ca1f549b2a66374def03537638326e8c0 Mon Sep 17 00:00:00 2001 From: Joel Brobecker Date: Tue, 30 Apr 2013 11:36:45 +0000 Subject: [PATCH] Fix build error in sol-thread.c:info_cb gdb/ChangeLog: * sol-thread.c (info_cb) [ti.ti_startfunc != 0]: Change type of local variable msym to const struct bound_minimal_symbol. Adjust use accordingly. [ti.ti_state == TD_THR_SLEEP]: Likewise. --- gdb/ChangeLog | 7 +++++++ gdb/sol-thread.c | 18 ++++++++++-------- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 5a8935d..05f431d 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -2,6 +2,13 @@ * MAINTAINERS (Write After Approval): Add myself to the list. +2013-04-30 Joel Brobecker + + * sol-thread.c (info_cb) [ti.ti_startfunc != 0]: Change type + of local variable msym to const struct bound_minimal_symbol. + Adjust use accordingly. + [ti.ti_state == TD_THR_SLEEP]: Likewise. + 2013-04-30 Samuel Thibault * i386gnu-nat.c (CREG_OFFSET): New macro. diff --git a/gdb/sol-thread.c b/gdb/sol-thread.c index ec3df83..fd29100 100644 --- a/gdb/sol-thread.c +++ b/gdb/sol-thread.c @@ -1115,11 +1115,12 @@ info_cb (const td_thrhandle_t *th, void *s) /* Print thr_create start function. */ if (ti.ti_startfunc != 0) { - struct minimal_symbol *msym; - msym = lookup_minimal_symbol_by_pc (ti.ti_startfunc); - if (msym) + const struct bound_minimal_symbol msym + = lookup_minimal_symbol_by_pc (ti.ti_startfunc); + + if (msym.minsym) printf_filtered (" startfunc: %s\n", - SYMBOL_PRINT_NAME (msym)); + SYMBOL_PRINT_NAME (msym.minsym)); else printf_filtered (" startfunc: %s\n", paddress (target_gdbarch (), ti.ti_startfunc)); @@ -1128,11 +1129,12 @@ info_cb (const td_thrhandle_t *th, void *s) /* If thread is asleep, print function that went to sleep. */ if (ti.ti_state == TD_THR_SLEEP) { - struct minimal_symbol *msym; - msym = lookup_minimal_symbol_by_pc (ti.ti_pc); - if (msym) + const struct bound_minimal_symbol msym + = lookup_minimal_symbol_by_pc (ti.ti_pc); + + if (msym.minsym) printf_filtered (" - Sleep func: %s\n", - SYMBOL_PRINT_NAME (msym)); + SYMBOL_PRINT_NAME (msym.minsym)); else printf_filtered (" - Sleep func: %s\n", paddress (target_gdbarch (), ti.ti_startfunc)); -- 2.7.4