diff options
| author | Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> | 2017-11-30 10:57:04 +0100 |
|---|---|---|
| committer | Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> | 2017-11-30 10:57:04 +0100 |
| commit | e8020e54f4b9ac05150c4b02fa81e228d6cf1f6a (patch) | |
| tree | 09b241cbb0ffb6252b08f08221cf97b29bcb5fce /gdb | |
| parent | 668247656d5dec815a57761e98720dda09f72481 (diff) | |
| download | gdb-e8020e54f4b9ac05150c4b02fa81e228d6cf1f6a.zip gdb-e8020e54f4b9ac05150c4b02fa81e228d6cf1f6a.tar.gz gdb-e8020e54f4b9ac05150c4b02fa81e228d6cf1f6a.tar.bz2 | |
Fix sol-thread.c compilation on Solaris
Building current gdb mainline with gcc 7.1 on Solaris 11.4 fails:
/vol/src/gnu/gdb/gdb/dist/gdb/sol-thread.c: In function `void _initialize_sol_thread()':
/vol/src/gnu/gdb/gdb/dist/gdb/sol-thread.c:1229:66: error: invalid conversion from `void (*)(char*, int)' to `void (*)(const char*, int)' [-fpermissive]
_("Show info on Solaris user threads."), &maintenanceinfolist);
^
In file included from /vol/src/gnu/gdb/gdb/dist/gdb/completer.h:21:0,
from /vol/src/gnu/gdb/gdb/dist/gdb/symtab.h:31,
from /vol/src/gnu/gdb/gdb/dist/gdb/language.h:26,
from /vol/src/gnu/gdb/gdb/dist/gdb/frame.h:72,
from /vol/src/gnu/gdb/gdb/dist/gdb/gdbarch.h:39,
from /vol/src/gnu/gdb/gdb/dist/gdb/defs.h:557,
from /vol/src/gnu/gdb/gdb/dist/gdb/sol-thread.c:51:
/vol/src/gnu/gdb/gdb/dist/gdb/command.h:140:33: note: initializing argument 3 of `cmd_list_element* add_cmd(const char*, command_class, void (*)(const char*, int), const char*, cmd_list_element**)'
extern struct cmd_list_element *add_cmd (const char *, enum command_class,
^~~~~~~
The following patch allows compilation to succeed on i386-pc-solaris2.11
and sparc-sun-solaris2.11.
* sol-thread.c (info_solthreads): Constify args.
Cast args to void *.
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/sol-thread.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index d6cbba8..73685e6 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2017-11-30 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + + * sol-thread.c (info_solthreads): Constify args. + Cast args to void *. + 2017-11-29 John Baldwin <jhb@FreeBSD.org> * target-float.c [HAVE_LIBMPFR]: Define MPFR_USE_INTMAX_T. diff --git a/gdb/sol-thread.c b/gdb/sol-thread.c index c521914..5f07a3c 100644 --- a/gdb/sol-thread.c +++ b/gdb/sol-thread.c @@ -1122,9 +1122,9 @@ info_cb (const td_thrhandle_t *th, void *s) inferior. */ static void -info_solthreads (char *args, int from_tty) +info_solthreads (const char *args, int from_tty) { - p_td_ta_thr_iter (main_ta, info_cb, args, + p_td_ta_thr_iter (main_ta, info_cb, (void *) args, TD_THR_ANY_STATE, TD_THR_LOWEST_PRIORITY, TD_SIGNO_MASK, TD_THR_ANY_USER_FLAGS); } |