diff mbox

Fix C++ build for Cygwin

Message ID 20160602141457.7608-1-jon.turney@dronecode.org.uk
State New, archived
Headers

Commit Message

Jon Turney June 2, 2016, 2:14 p.m. UTC 
  gdb/ChangeLog:

2016-06-02  Jon Turney  <jon.turney@dronecode.org.uk>

	* windows-nat.c (handle_output_debug_string): return type of
	gdb_signal_from_host() is gdb_signal, not an int.
	(windows_get_exec_module_filename): Add pointer casts for C++.

gdb/gdbserver/ChangeLog:

2016-06-02  Jon Turney  <jon.turney@dronecode.org.uk>

	* win32-low.c (win32_create_inferior): Add pointer casts for C++.
---
 gdb/ChangeLog             | 6 ++++++
 gdb/gdbserver/ChangeLog   | 4 ++++
 gdb/gdbserver/win32-low.c | 4 ++--
 gdb/windows-nat.c         | 4 ++--
 4 files changed, 14 insertions(+), 4 deletions(-)

Comments

Pedro Alves June 3, 2016, 10:57 a.m. UTC | #1 
On 06/02/2016 03:14 PM, Jon Turney wrote:

> 	* windows-nat.c (handle_output_debug_string): return type of

Uppercase "Return".

OK.

Thanks,
Pedro Alves
Jon Turney June 3, 2016, 11:34 a.m. UTC | #2 
On 03/06/2016 11:57, Pedro Alves wrote:
> On 06/02/2016 03:14 PM, Jon Turney wrote:
>
>> 	* windows-nat.c (handle_output_debug_string): return type of
>
> Uppercase "Return".
>
> OK.

Pushed with that correction.
Pedro Alves June 3, 2016, 11:37 a.m. UTC | #3 
On 06/03/2016 12:34 PM, Jon Turney wrote:
> On 03/06/2016 11:57, Pedro Alves wrote:
>> On 06/02/2016 03:14 PM, Jon Turney wrote:
>>
>>>     * windows-nat.c (handle_output_debug_string): return type of
>>
>> Uppercase "Return".
>>
>> OK.
> 
> Pushed with that correction.
> 

Seems like you also created a "2.24.51.20140326" tag at
the same time?

 https://sourceware.org/ml/gdb-cvs/2016-06/msg00012.html

Thanks,
Pedro Alves
Jon Turney June 3, 2016, 11:48 a.m. UTC | #4 
On 03/06/2016 12:37, Pedro Alves wrote:
> On 06/03/2016 12:34 PM, Jon Turney wrote:
>> On 03/06/2016 11:57, Pedro Alves wrote:
>>> On 06/02/2016 03:14 PM, Jon Turney wrote:
>>>
>>>>     * windows-nat.c (handle_output_debug_string): return type of
>>>
>>> Uppercase "Return".
>>>
>>> OK.
>>
>> Pushed with that correction.
>>
>
> Seems like you also created a "2.24.51.20140326" tag at
> the same time?
>
>  https://sourceware.org/ml/gdb-cvs/2016-06/msg00012.html

Yes.

I guess turning on push.followTags globally wasn't such a good idea.

It seems I cannot remove this tag, please do so.
Pedro Alves June 3, 2016, 3:23 p.m. UTC | #5 
On 06/03/2016 12:48 PM, Jon Turney wrote:
> On 03/06/2016 12:37, Pedro Alves wrote:

>> Seems like you also created a "2.24.51.20140326" tag at
>> the same time?
>>
>>  https://sourceware.org/ml/gdb-cvs/2016-06/msg00012.html
> 
> Yes.
> 
> I guess turning on push.followTags globally wasn't such a good idea.
> 
> It seems I cannot remove this tag, please do so.
> 

I believe this needs to be done server-side.  Joel, can you
do this?

Thanks,
Pedro Alves
Joel Brobecker June 3, 2016, 6:03 p.m. UTC | #6 
> >> Seems like you also created a "2.24.51.20140326" tag at
> >> the same time?
> >>
> >>  https://sourceware.org/ml/gdb-cvs/2016-06/msg00012.html
> > 
> > Yes.
> > 
> > I guess turning on push.followTags globally wasn't such a good idea.
> > 
> > It seems I cannot remove this tag, please do so.
> 
> I believe this needs to be done server-side.  Joel, can you
> do this?

Of course, done! For the record:

    % git tag -d 2.24.51.20140326
    Deleted tag '2.24.51.20140326' (was de7067d)
diff mbox

Patch

diff --git a/gdb/gdbserver/win32-low.c b/gdb/gdbserver/win32-low.c
index e60be5a..70abfcd 100644
--- a/gdb/gdbserver/win32-low.c
+++ b/gdb/gdbserver/win32-low.c
@@ -642,8 +642,8 @@  win32_create_inferior (char *program, char **program_args)
   if (path_ptr)
     {
       int size = cygwin_conv_path_list (CCP_POSIX_TO_WIN_A, path_ptr, NULL, 0);
-      orig_path = alloca (strlen (path_ptr) + 1);
-      new_path = alloca (size);
+      orig_path = (char *) alloca (strlen (path_ptr) + 1);
+      new_path = (char *) alloca (size);
       strcpy (orig_path, path_ptr);
       cygwin_conv_path_list (CCP_POSIX_TO_WIN_A, path_ptr, new_path, size);
       setenv ("PATH", new_path, 1);
diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c
index 2e8a777..149403a 100644
--- a/gdb/windows-nat.c
+++ b/gdb/windows-nat.c
@@ -864,7 +864,7 @@  handle_output_debug_string (struct target_waitstatus *ourstatus)
 	 to treat this like a real signal.  */
       char *p;
       int sig = strtol (s + sizeof (_CYGWIN_SIGNAL_STRING) - 1, &p, 0);
-      int gotasig = gdb_signal_from_host (sig);
+      gdb_signal gotasig = gdb_signal_from_host (sig);
 
       ourstatus->value.sig = gotasig;
       if (gotasig)
@@ -1894,7 +1894,7 @@  windows_get_exec_module_filename (char *exe_name_ret, size_t exe_name_max_len)
     /* Cygwin prefers that the path be in /x/y/z format, so extract
        the filename into a temporary buffer first, and then convert it
        to POSIX format into the destination buffer.  */
-    cygwin_buf_t *pathbuf = alloca (exe_name_max_len * sizeof (cygwin_buf_t));
+    cygwin_buf_t *pathbuf = (cygwin_buf_t *) alloca (exe_name_max_len * sizeof (cygwin_buf_t));
 
     len = GetModuleFileNameEx (current_process_handle,
 			       dh_buf, pathbuf, exe_name_max_len);