From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gdb-patches-return-43677-listarch-gdb-patches=sources.redhat.com@sourceware.org>
Received: (qmail 311 invoked by alias); 16 Apr 2006 01:39:41 -0000
Received: (qmail 303 invoked by uid 22791); 16 Apr 2006 01:39:40 -0000
X-Spam-Check-By: sourceware.org
Received: from mail2.asahi-net.or.jp (HELO mail.asahi-net.or.jp) (202.224.39.198)     by sourceware.org (qpsmtpd/0.31) with ESMTP; Sun, 16 Apr 2006 01:39:39 +0000
Received: from [10.100.14.255] (s23.GtokyoFL12.vectant.ne.jp [222.228.213.23]) 	by mail.asahi-net.or.jp (Postfix) with ESMTP id 2F70828462 	for <gdb-patches@sourceware.org>; Sun, 16 Apr 2006 10:39:36 +0900 (JST)
Mime-Version: 1.0 (Apple Message framework v749.3)
In-Reply-To: <D2ECE369-21D3-46C0-AB79-4ECDDCC4D9B3@monami-software.com>
References: <7ED1920F-290A-4576-8EBA-A506BC401274@monami-software.com> <20060415184641.GA10210@nevyn.them.org> <D2ECE369-21D3-46C0-AB79-4ECDDCC4D9B3@monami-software.com>
Content-Type: text/plain; charset=US-ASCII; delsp=yes; format=flowed
Message-Id: <DAF6D35C-2AD7-4B53-834A-49F4A3FC76C0@monami-software.com>
Content-Transfer-Encoding: 7bit
From: Masaki MURANAKA <monaka@monami-software.com>
Subject: Re: m32r-elf target on MinGW.
Date: Sun, 16 Apr 2006 01:39:00 -0000
To: gdb-patches@sourceware.org
X-Mailer: Apple Mail (2.749.3)
X-IsSubscribed: yes
Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:gdb-patches-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/gdb-patches/>
List-Post: <mailto:gdb-patches@sourceware.org>
List-Help: <mailto:gdb-patches-help@sourceware.org>, <http://sourceware.org/ml/#faqs>
Sender: gdb-patches-owner@sourceware.org
X-SW-Source: 2006-04/txt/msg00206.txt.bz2

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