m32r-elf target on MinGW.

m32r-elf target on MinGW.

[Masaki MURANAKA]

Hello,

This is a patch that enables to build m32r-elf target on MinGW host.
The base version of this patch is gdb-6.4.


----
2006-04-16  Masaki MURANAKA  <monaka@monami-software.com>

         * m32r-rom.c: On MinGW, include winsock.h instead of socket.h
         * remote-m32r-sdi.c: On MinGW, include winsock.h instead of  
socket.h. And calls WSAStartup().
----

Index: gdb/m32r-rom.c
===================================================================
RCS file: /home/cvs/pizzafactory/gdb/gdb/m32r-rom.c,v
retrieving revision 1.1.1.4
diff -r1.1.1.4 m32r-rom.c
49a50,52
 > #ifdef __MINGW32__
 > #include <winsock.h>
 > #else
55c58
<
---
 > #endif
414a418,424
 > #ifdef __MINGW32__
 >   WSADATA wd;
 >   /* Winsock initialization. */
 >   if (WSAStartup (MAKEWORD (1, 1), &wd))
 >     error (_("Couldn't initialize WINSOCK."));
 > #endif
 >
Index: gdb/remote-m32r-sdi.c
===================================================================
RCS file: /home/cvs/pizzafactory/gdb/gdb/remote-m32r-sdi.c,v
retrieving revision 1.1.1.2
diff -r1.1.1.2 remote-m32r-sdi.c
33a34,36
 > #ifdef __MINGW32__
 > #include <winsock.h>
 > #else
34a38
 > #endif



--
Masaki Muranaka
Monami software

Re: m32r-elf target on MinGW.

[Daniel Jacobowitz]

On Sun, Apr 16, 2006 at 01:47:18AM +0900, Masaki MURANAKA wrote:
> Hello,
> 
> This is a patch that enables to build m32r-elf target on MinGW host.
> The base version of this patch is gdb-6.4.

Two things:

  - Please use CVS HEAD to submit patches, not an older release.
  - Please use unified diff (diff -u, cvs diff -u).  The patches
    you've posted are impossible to merge, because they have no
    context.

>         * m32r-rom.c: On MinGW, include winsock.h instead of socket.h

I can't find a version of this file which includes socket.h.

>         * remote-m32r-sdi.c: On MinGW, include winsock.h instead of  
> socket.h. And calls WSAStartup().

Or this one.

There've been a lot of mingw32 fixes since gdb 6.4; I don't think this
patch is needed now.  But it would be good if you could test HEAD.

-- 
Daniel Jacobowitz
CodeSourcery

Re: m32r-elf target on MinGW.

[Masaki MURANAKA]

Hello,

On 2006/04/16, at 3:46, Daniel Jacobowitz wrote:
> I can't find a version of this file which includes socket.h.

It's my mistake..., not socket.h but sys/types.h, netdb.h, netinet/in.h

Anyway, I'll test HEAD soon.

--
Masaki Muranaka
Monami software

Re: m32r-elf target on MinGW.

[Masaki MURANAKA]

Hello,

On 2006/04/16, at 8:46, Masaki MURANAKA wrote:
> Anyway, I'll test HEAD soon.

Here is a diff from HEAD.


----
2006-04-16  Masaki MURANAKA  <monaka@monami-software.com>

         * m32r-rom.c:
		On MinGW, include winsock.h instead of sys/types.h netdb.h netinet/ 
in.h.
		(m32r_upload_command)  Add calls WSAStartup().
         * remote-m32r-sdi.c:
		On MinGW, include winsock.h instead of netinet/in.h.
----
Index: m32r-rom.c
===================================================================
RCS file: /cvs/src/src/gdb/m32r-rom.c,v
retrieving revision 1.26
diff -u -r1.26 m32r-rom.c
--- m32r-rom.c  17 Dec 2005 22:34:01 -0000      1.26
+++ m32r-rom.c  16 Apr 2006 01:31:29 -0000
@@ -46,12 +46,16 @@
/*
   * All this stuff just to get my host computer's IP address!
   */
+#ifdef __MINGW32__
+#include <winsock.h>
+#else
#include <sys/types.h>
#include <netdb.h>             /* for hostent */
#include <netinet/in.h>                /* for struct in_addr */
#if 1
#include <arpa/inet.h>         /* for inet_ntoa */
#endif
+#endif
static char *board_addr;       /* user-settable IP address for M32R- 
EVA */
static char *server_addr;      /* user-settable IP address for gdb  
host */
@@ -435,6 +439,13 @@
      }
    if (server_addr == 0)
      {
+#ifdef __MINGW32__
+      WSADATA wd;
+      /* Winsock initialization. */
+      if (WSAStartup (MAKEWORD (1, 1), &wd))
+       error (_("Couldn't initialize WINSOCK."));
+#endif
+
        buf[0] = 0;
        gethostname (buf, sizeof (buf));
        if (buf[0] != 0)
Index: remote-m32r-sdi.c
===================================================================
RCS file: /cvs/src/src/gdb/remote-m32r-sdi.c,v
retrieving revision 1.17
diff -u -r1.17 remote-m32r-sdi.c
--- remote-m32r-sdi.c   24 Jan 2006 22:09:28 -0000      1.17
+++ remote-m32r-sdi.c   16 Apr 2006 01:31:30 -0000
@@ -31,7 +31,11 @@
#include "gdb_string.h"
#include <ctype.h>
#include <signal.h>
+#ifdef __MINGW32__
+#include <winsock.h>
+#else
#include <netinet/in.h>
+#endif
#include <sys/types.h>
#include <sys/time.h>
#include <signal.h>

--
Masaki Muranaka
Monami software

Re: m32r-elf target on MinGW.

[Eli Zaretskii]

> From: Masaki MURANAKA <monaka@monami-software.com>
> Date: Sun, 16 Apr 2006 10:39:34 +0900
> 
> On 2006/04/16, at 8:46, Masaki MURANAKA wrote:
> > Anyway, I'll test HEAD soon.
> 
> Here is a diff from HEAD.

Thanks.  I have no power to approve this, but these changes are fine
with me.

Re: m32r-elf target on MinGW.

[Kei Sakamoto]

Hello, Muranaka-san,

Thank you for sending patches for M32R. Since I'm an Authorized
Committer for M32R and there is no native maintainer for it,
I'd like to approve and commit your patch. But there is one
thing I need to confirm.

Do you have a Copyright Assignment for gdb? If you don't have
it, please see CONTRIBUTE file.

Kei Sakamoto

Masaki MURANAKA wrote:
> Hello,
> 
> This is a patch that enables to build m32r-elf target on MinGW host.
> The base version of this patch is gdb-6.4.
> 
> 
> ----
> 2006-04-16  Masaki MURANAKA  <monaka@monami-software.com>
> 
>         * m32r-rom.c: On MinGW, include winsock.h instead of socket.h
>         * remote-m32r-sdi.c: On MinGW, include winsock.h instead of 
> socket.h. And calls WSAStartup().
> ----
> 
> Index: gdb/m32r-rom.c
> ===================================================================
> RCS file: /home/cvs/pizzafactory/gdb/gdb/m32r-rom.c,v
> retrieving revision 1.1.1.4
> diff -r1.1.1.4 m32r-rom.c
> 49a50,52
>  > #ifdef __MINGW32__
>  > #include <winsock.h>
>  > #else
> 55c58
> <
> ---
>  > #endif
> 414a418,424
>  > #ifdef __MINGW32__
>  >   WSADATA wd;
>  >   /* Winsock initialization. */
>  >   if (WSAStartup (MAKEWORD (1, 1), &wd))
>  >     error (_("Couldn't initialize WINSOCK."));
>  > #endif
>  >
> Index: gdb/remote-m32r-sdi.c
> ===================================================================
> RCS file: /home/cvs/pizzafactory/gdb/gdb/remote-m32r-sdi.c,v
> retrieving revision 1.1.1.2
> diff -r1.1.1.2 remote-m32r-sdi.c
> 33a34,36
>  > #ifdef __MINGW32__
>  > #include <winsock.h>
>  > #else
> 34a38
>  > #endif
> 
> 
> 
> -- 
> Masaki Muranaka
> Monami software
> 
> 
> 

Re: m32r-elf target on MinGW.

[Daniel Jacobowitz]

On Tue, Apr 18, 2006 at 02:16:17PM +0900, Kei Sakamoto wrote:
> Do you have a Copyright Assignment for gdb? If you don't have
> it, please see CONTRIBUTE file.

While this is a good idea, in my opinion one is not necessary
for this change.


-- 
Daniel Jacobowitz
CodeSourcery

Re: m32r-elf target on MinGW.

[Masaki MURANAKA]

Hello, Sakamoto-san.

On 2006/04/18, at 14:16, Kei Sakamoto wrote:
> Thank you for sending patches for M32R. Since I'm an Authorized
> Committer for M32R and there is no native maintainer for it,
> I'd like to approve and commit your patch.

Thanks.

> Do you have a Copyright Assignment for gdb? If you don't have
> it, please see CONTRIBUTE file.

No, I don't.
Well, Today I sent a request to assign@gnu.org.
Please wait for a while if the Copyright Assignment is required.
I'll sign it up soon.

--
Masaki Muranaka
Monami software

Re: m32r-elf target on MinGW.

[Kei Sakamoto]

Daniel Jacobowitz wrote:
> On Tue, Apr 18, 2006 at 02:16:17PM +0900, Kei Sakamoto wrote:
>> Do you have a Copyright Assignment for gdb? If you don't have
>> it, please see CONTRIBUTE file.
> 
> While this is a good idea, in my opinion one is not necessary
> for this change.

That's a good news. :-)
I've approved and committed his patch.

Kei Sakamoto