From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 11375 invoked by alias); 17 Apr 2010 05:39:51 -0000 Received: (qmail 11361 invoked by uid 22791); 17 Apr 2010 05:39:49 -0000 X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 tests=BAYES_00,MSGID_MULTIPLE_AT X-Spam-Check-By: sourceware.org Received: from mailhost.u-strasbg.fr (HELO mailhost.u-strasbg.fr) (130.79.200.152) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Sat, 17 Apr 2010 05:39:44 +0000 Received: from baal.u-strasbg.fr (baal.u-strasbg.fr [IPv6:2001:660:2402::41]) by mailhost.u-strasbg.fr (8.14.3/jtpda-5.5pre1) with ESMTP id o3H5dbXj054608 ; Sat, 17 Apr 2010 07:39:37 +0200 (CEST) (envelope-from pierre.muller@ics-cnrs.unistra.fr) Received: from mailserver.u-strasbg.fr (ms1.u-strasbg.fr [IPv6:2001:660:2402:d::10]) by baal.u-strasbg.fr (8.14.0/jtpda-5.5pre1) with ESMTP id o3H5dbK4068743 ; Sat, 17 Apr 2010 07:39:37 +0200 (CEST) (envelope-from pierre.muller@ics-cnrs.unistra.fr) Received: from d620muller (lec67-4-82-230-53-140.fbx.proxad.net [82.230.53.140]) (user=mullerp mech=LOGIN) by mailserver.u-strasbg.fr (8.14.3/jtpda-5.5pre1) with ESMTP id o3H5dZt7067727 (version=TLSv1/SSLv3 cipher=RC4-MD5 bits=128 verify=NO) ; Sat, 17 Apr 2010 07:39:36 +0200 (CEST) (envelope-from pierre.muller@ics-cnrs.unistra.fr) From: "Pierre Muller" To: "'Pedro Alves'" Cc: References: <000d01cadd79$efa9e2b0$cefda810$@muller@ics-cnrs.unistra.fr> <201004161727.26943.pedro@codesourcery.com> <001f01cadd83$3e5e6b70$bb1b4250$@muller@ics-cnrs.unistra.fr> <201004161815.36864.pedro@codesourcery.com> In-Reply-To: <201004161815.36864.pedro@codesourcery.com> Subject: [RFA] Use winsock2 for mingw gdbserver Date: Sat, 17 Apr 2010 05:39:00 -0000 Message-ID: <001c01caddf0$63952a10$2abf7e30$@muller@ics-cnrs.unistra.fr> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2010-04/txt/msg00524.txt.bz2 I implement this as a separate patch: I just tested compilation with msys/mingw system. > -----Message d'origine----- > De=A0: gdb-patches-owner@sourceware.org [mailto:gdb-patches- > owner@sourceware.org] De la part de Pedro Alves > Envoy=E9=A0: Friday, April 16, 2010 7:16 PM > =C0=A0: Pierre Muller > Cc=A0: gdb-patches@sourceware.org > Objet=A0: Re: [RFC] Mingw Windows 64-bit gdbserver >=20 > On Friday 16 April 2010 17:38:28, Pierre Muller wrote: > > GDb sources is still a mix: > > > > > Typo: I meant winsock2.h instead of winsock.h. > > > > $ grep "include.* > gdb_select.h:#include > > serial.h:#include > > m32r-rom.c:#include > > remote-m32r-sdi.c:#include > > ser-base.c:#include > > ser-tcp.c:#include > > gdbserver/gdbreplay.c:#include > > gdbserver/remote-utils.c:#include > > > > should all be moved to winsock2.h? >=20 > Probably not a real problem as we only activate > Winsock 1: >=20 > gdb/ > >grep WSAStart *.c -rn > m32r-rom.c:451: if (WSAStartup (MAKEWORD (1, 1), &wd)) > ser-mingw.c:1255: if (WSAStartup (MAKEWORD (1, 0), &wsa_data) !=3D 0) >=20 > gdb/gdbserver/ > >grep WSAStart *.c -rn > gdbreplay.c:207: WSAStartup (MAKEWORD (1, 0), &wsad); > remote-utils.c:288: WSAStartup (MAKEWORD (1, 0), &wsad); >=20 > Presumably winsock2.h is a superset of winsock.h and so we're > likely fine. Wouldn't hurt to be consistent, moreso since we > include winsock2.h in some headers. >=20 > > and -lws2_32 as library? >=20 > You mean in gdbserver? Shouldn't hurt, yeah. Here you are: is this OK? Once again, it=92s the formatting of the ChangeLog that seems the most uncertain to me... Pierre gdbserver ChangeLog entry: 2010-04-17 Pierre Muller * configure.ac: Use `ws2_32' library for srv_mingw. * configure: Regenerate. * gdbreplay.c: Use winsock2 header instead of winsock for mingw. * remote-utils.c: Likewise. Index: configure =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvs/src/src/gdb/gdbserver/configure,v retrieving revision 1.47 diff -u -p -r1.47 configure --- configure 16 Apr 2010 16:22:15 -0000 1.47 +++ configure 17 Apr 2010 05:25:59 -0000 @@ -4056,7 +4056,7 @@ esac if test "${srv_mingwce}" =3D "yes"; then LIBS=3D"$LIBS -lws2" elif test "${srv_mingw}" =3D "yes"; then - LIBS=3D"$LIBS -lwsock32" + LIBS=3D"$LIBS -lws2_32" elif test "${srv_qnx}" =3D "yes"; then LIBS=3D"$LIBS -lsocket" fi Index: configure.ac =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvs/src/src/gdb/gdbserver/configure.ac,v retrieving revision 1.33 diff -u -p -r1.33 configure.ac --- configure.ac 23 Feb 2010 19:16:16 -0000 1.33 +++ configure.ac 17 Apr 2010 05:25:59 -0000 @@ -118,7 +118,7 @@ esac if test "${srv_mingwce}" =3D "yes"; then LIBS=3D"$LIBS -lws2" elif test "${srv_mingw}" =3D "yes"; then - LIBS=3D"$LIBS -lwsock32" + LIBS=3D"$LIBS -lws2_32" elif test "${srv_qnx}" =3D "yes"; then LIBS=3D"$LIBS -lsocket" fi Index: gdbreplay.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvs/src/src/gdb/gdbserver/gdbreplay.c,v retrieving revision 1.24 diff -u -p -r1.24 gdbreplay.c --- gdbreplay.c 1 Jan 2010 07:31:49 -0000 1.24 +++ gdbreplay.c 17 Apr 2010 05:25:59 -0000 @@ -59,7 +59,7 @@ #endif =20 #if USE_WIN32API -#include +#include #endif =20 #ifndef HAVE_SOCKLEN_T Index: remote-utils.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvs/src/src/gdb/gdbserver/remote-utils.c,v retrieving revision 1.72 diff -u -p -r1.72 remote-utils.c --- remote-utils.c 11 Apr 2010 16:33:56 -0000 1.72 +++ remote-utils.c 17 Apr 2010 05:25:59 -0000 @@ -63,7 +63,7 @@ #endif =20 #if USE_WIN32API -#include +#include #endif =20 #if __QNX__