From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 13144 invoked by alias); 19 Dec 2013 13:18:50 -0000 Mailing-List: contact gdb-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-owner@sourceware.org Received: (qmail 13017 invoked by uid 89); 19 Dec 2013 13:18:49 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.0 required=5.0 tests=AWL,BAYES_00,MSGID_MULTIPLE_AT autolearn=no version=3.3.2 X-Spam-User: qpsmtpd, 2 recipients X-HELO: mailhost.u-strasbg.fr Received: from mailhost.u-strasbg.fr (HELO mailhost.u-strasbg.fr) (130.79.222.212) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 19 Dec 2013 13:18:48 +0000 Received: from mailhost.u-strasbg.fr (localhost [127.0.0.1]) by antispam (Postfix) with ESMTP id 32F27140290; Thu, 19 Dec 2013 14:18:45 +0100 (CET) Received: from mailhost.u-strasbg.fr (localhost [127.0.0.1]) by antivirus (Postfix) with ESMTP id 201C014054F; Thu, 19 Dec 2013 14:18:45 +0100 (CET) Received: from md14.u-strasbg.fr (md14.u-strasbg.fr [130.79.200.249]) by mr2.u-strasbg.fr (Postfix) with ESMTP id 94A3D140290; Thu, 19 Dec 2013 14:18:39 +0100 (CET) Received: from ms18.u-strasbg.fr (ms18.u-strasbg.fr [130.79.204.118]) by md14.u-strasbg.fr (8.14.3/jtpda-5.5pre1) with ESMTP id rBJDIdLQ020335 ; Thu, 19 Dec 2013 14:18:39 +0100 Received: from E6510Muller (gw-ics.u-strasbg.fr [130.79.210.225]) (Authenticated sender: mullerp) by ms18.u-strasbg.fr (Postfix) with ESMTPSA id 6B0C51FD8E; Thu, 19 Dec 2013 14:18:34 +0100 (CET) From: "Pierre Muller" To: "'nick clifton'" , "'Pedro Alves'" , "'asmwarrior'" Cc: "'GDB Development'" , "'Binutils Development'" References: <52B17083.7040404@gmail.com> <52B1738D.4010409@redhat.com> <002101cefbf1$7554b9a0$5ffe2ce0$@muller@ics-cnrs.unistra.fr> <52B1E03E.9010002@redhat.com> <006c01cefcaf$bec215b0$3c464110$@muller@ics-cnrs.unistra.fr> <52B2E8C4.3080208@redhat.com> In-Reply-To: <52B2E8C4.3080208@redhat.com> Subject: RE: [RFC-v2] BFD MinGW/Cygwin build error in bfd/peiXXgen.c Date: Thu, 19 Dec 2013 13:18:00 -0000 Message-ID: <007801cefcbc$d4d2d080$7e787180$@muller@ics-cnrs.unistra.fr> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-SW-Source: 2013-12/txt/msg00064.txt.bz2 > > 2013-12-19 Pierre Muller > > > > peXXigen.c (u16_mbtouc): Avoid unused function warning by > excluding if > > __CYGWIN__ or __MINGW32__ macro is defined. > > (rsrc_cmp): Fix Windows host version and version without wchar > header. > > [__CYGWIN__, __MINGW32__]: Introduce rsrccmp macro. >=20 > Thanks - I have applied this patch. Not yet completely OK: peigen.c: In function =E2=80=98rsrc_cmp=E2=80=99: peigen.c:2984:17: erreur: unused variable =E2=80=98i=E2=80=99 [-Werror=3Dun= used-variable] ChangeLog entry: 2013-12-19 Pierre Muller Fix unused variable warning. diff --git a/bfd/peXXigen.c b/bfd/peXXigen.c index 843cae8..d50db73 100644 --- a/bfd/peXXigen.c +++ b/bfd/peXXigen.c @@ -2981,7 +2981,6 @@ static signed int rsrc_cmp (bfd_boolean is_name, rsrc_entry * a, rsrc_entry * b) { signed int res; - unsigned int i; bfd_byte * astring; unsigned int alen; bfd_byte * bstring; @@ -3013,24 +3012,26 @@ rsrc_cmp (bfd_boolean is_name, rsrc_entry * a, rsrc= _entry * b) min (alen, blen)); #elif defined HAVE_WCHAR_H - res =3D 0; - for (i =3D min (alen, blen); i--; astring +=3D 2, bstring +=3D 2) - { - wchar_t awc; - wchar_t bwc; - - /* Convert UTF-16 unicode characters into wchar_t characters so - that we can then perform a case insensitive comparison. */ - int Alen =3D u16_mbtouc (& awc, (const unsigned short *) astring, 2); - int Blen =3D u16_mbtouc (& bwc, (const unsigned short *) bstring, 2); - - if (Alen !=3D Blen) - return Alen - Blen; - res =3D wcsncasecmp (& awc, & bwc, 1); - if (res) - break; - } - + { + unsigned int i; + res =3D 0; + for (i =3D min (alen, blen); i--; astring +=3D 2, bstring +=3D 2) + { + wchar_t awc; + wchar_t bwc; + + /* Convert UTF-16 unicode characters into wchar_t characters so + that we can then perform a case insensitive comparison. */ + int Alen =3D u16_mbtouc (& awc, (const unsigned short *) astring, 2= ); + int Blen =3D u16_mbtouc (& bwc, (const unsigned short *) bstring, 2= ); + + if (Alen !=3D Blen) + return Alen - Blen; + res =3D wcsncasecmp (& awc, & bwc, 1); + if (res) + break; + } + } #else /* Do the best we can - a case sensitive, untranslated comparison. */ res =3D memcmp (astring, bstring, min (alen, blen) * 2);