darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix C++ build error by casting void *

Browse source 
Two recent patches breaks GDB C++ mode build,

  https://sourceware.org/ml/gdb-patches/2016-01/msg00150.html
  https://sourceware.org/ml/gdb-patches/2016-01/msg00086.html

gdb/remote.c: In function 'int remote_set_syscall_catchpoint(target_ops*, int, int, int, int, int*)':
gdb/remote.c:2036:39: error: invalid conversion from 'void*' to 'char*' [-fpermissive]
       catch_packet = xmalloc (maxpktsz);
                                       ^

gdb/thread.c: In function 'int do_captured_thread_select(ui_out*, void*)':
gdb/git/gdb/thread.c:1999:24: error: invalid conversion from 'void*' to 'const char*' [-fpermissive]
   const char *tidstr = tidstr_v;
                        ^

this patch fixes them by casting void * to the right type.

gdb:

2016-01-14  Yao Qi  <yao.qi@linaro.org>

	* remote.c (remote_set_syscall_catchpoint): Cast to char *.
	* thread.c (do_captured_thread_select): Cast to const char *.
This commit is contained in:
Yao Qi 2016-01-14 12:28:02 +00:00
parent 651657fa61
commit c0518081f0
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gdb/ChangeLog
View file

@ -1,3 +1,8 @@
2016-01-14 Yao Qi <yao.qi@linaro.org>
* remote.c (remote_set_syscall_catchpoint): Cast to char *.
* thread.c (do_captured_thread_select): Cast to const char *.
2016-01-14 Yao Qi <yao.qi@linaro.org> 2016-01-14 Yao Qi <yao.qi@linaro.org>
* arch/arm-get-next-pcs.c (arm_get_next_pcs_ctor): Change * arch/arm-get-next-pcs.c (arm_get_next_pcs_ctor): Change

2
gdb/remote.c
View file

@ -2033,7 +2033,7 @@ remote_set_syscall_catchpoint (struct target_ops *self,
big, fallback on the non-selective packet. */ big, fallback on the non-selective packet. */
const int maxpktsz = strlen ("QCatchSyscalls:1") + n_sysno * 9 + 1; const int maxpktsz = strlen ("QCatchSyscalls:1") + n_sysno * 9 + 1;
catch_packet = xmalloc (maxpktsz); catch_packet = (char *) xmalloc (maxpktsz);
strcpy (catch_packet, "QCatchSyscalls:1"); strcpy (catch_packet, "QCatchSyscalls:1");
if (!any_count) if (!any_count)
{ {

2
gdb/thread.c
View file

@ -1996,7 +1996,7 @@ show_print_thread_events (struct ui_file *file, int from_tty,
static int static int
do_captured_thread_select (struct ui_out *uiout, void *tidstr_v) do_captured_thread_select (struct ui_out *uiout, void *tidstr_v)
{ {
const char *tidstr = tidstr_v; const char *tidstr = (const char *) tidstr_v;
struct thread_info *tp; struct thread_info *tp;
if (ui_out_is_mi_like_p (uiout)) if (ui_out_is_mi_like_p (uiout))