From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SJT6z-0007UC-ID for garchives@archives.gentoo.org; Sun, 15 Apr 2012 17:19:41 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 53505E0CF9; Sun, 15 Apr 2012 17:18:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 12DB7E0CF6 for ; Sun, 15 Apr 2012 17:18:48 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4CC551B4044 for ; Sun, 15 Apr 2012 17:18:48 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 559) id 1399B2004E; Sun, 15 Apr 2012 17:18:47 +0000 (UTC) From: "Mike Frysinger (vapier)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, vapier@gentoo.org Subject: [gentoo-commits] gentoo commit in src/patchsets/gcc/4.4.2/gentoo: 27_all_gcj-glibc-2.15-pr50888.patch README.history X-VCS-Repository: gentoo X-VCS-Files: 27_all_gcj-glibc-2.15-pr50888.patch README.history X-VCS-Directories: src/patchsets/gcc/4.4.2/gentoo X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger Content-Type: text/plain; charset=utf8 Message-Id: <20120415171847.1399B2004E@flycatcher.gentoo.org> Date: Sun, 15 Apr 2012 17:18:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 8d7369d0-c45b-477d-8a51-a297c0bed43c X-Archives-Hash: b864609a58c4d7597a5b9fd2918df355 vapier 12/04/15 17:18:47 Modified: README.history Added: 27_all_gcj-glibc-2.15-pr50888.patch Log: add fix from upstream for building gcj with newer glibc pr50888 Revision Changes Path 1.5 src/patchsets/gcc/4.4.2/gentoo/README.history file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.4.= 2/gentoo/README.history?rev=3D1.5&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.4.= 2/gentoo/README.history?rev=3D1.5&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.4.= 2/gentoo/README.history?r1=3D1.4&r2=3D1.5 Index: README.history =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: /var/cvsroot/gentoo/src/patchsets/gcc/4.4.2/gentoo/README.histo= ry,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- README.history 6 Dec 2011 19:10:20 -0000 1.4 +++ README.history 15 Apr 2012 17:18:46 -0000 1.5 @@ -1,6 +1,7 @@ 1.1 [pending] + 01_all_gcc-4.1-alpha-asm-mcpu.patch + 02_all_gcc-4.4-alpha-PR42113.patch + + 27_all_gcj-glibc-2.15-pr50888.patch =20 1.0 17 Oct 2009 + 00_all_gcc-4.1-alpha-mieee-default.patch 1.1 src/patchsets/gcc/4.4.2/gentoo/27_all_gcj-glibc-2.15= -pr50888.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.4.= 2/gentoo/27_all_gcj-glibc-2.15-pr50888.patch?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.4.= 2/gentoo/27_all_gcj-glibc-2.15-pr50888.patch?rev=3D1.1&content-type=3Dtex= t/plain Index: 27_all_gcj-glibc-2.15-pr50888.patch =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 http://gcc.gnu.org/PR50888 fix building of gcj with glibc-2.15+ applied to gcc-4.6 branch: http://gcc.gnu.org/viewcvs?view=3Drevision&revision=3D181686 and to gcc-4.5 branch: http://gcc.gnu.org/viewcvs?view=3Drevision&revision=3D181687 and to gcc-4.4 branch: http://gcc.gnu.org/viewcvs?view=3Drevision&revision=3D181688 2011-11-24 Jakub Jelinek PR bootstrap/50888 * prims.cc: Don't include ctype.h. (c_isspace): Define. (next_property_key, next_property_value): Use it instead of isspace. --- branches/gcc-4_5-branch/libjava/prims.cc 2011/11/24 07:21:39 181686 +++ branches/gcc-4_5-branch/libjava/prims.cc 2011/11/24 07:23:16 181687 @@ -38,7 +38,6 @@ #endif =20 #ifndef DISABLE_GETENV_PROPERTIES -#include #include #define PROCESS_GCJ_PROPERTIES process_gcj_properties() #else @@ -985,6 +984,8 @@ =20 #ifndef DISABLE_GETENV_PROPERTIES =20 +#define c_isspace(c) (memchr (" \t\n\r\v\f", c, 6) !=3D NULL) + static char * next_property_key (char *s, size_t *length) { @@ -993,7 +994,7 @@ JvAssert (s); =20 // Skip over whitespace - while (isspace (*s)) + while (c_isspace (*s)) s++; =20 // If we've reached the end, return NULL. Also return NULL if for @@ -1005,7 +1006,7 @@ =20 // Determine the length of the property key. while (s[l] !=3D 0 - && ! isspace (s[l]) + && ! c_isspace (s[l]) && s[l] !=3D ':' && s[l] !=3D '=3D') { @@ -1027,19 +1028,19 @@ =20 JvAssert (s); =20 - while (isspace (*s)) + while (c_isspace (*s)) s++; =20 if (*s =3D=3D ':' || *s =3D=3D '=3D') s++; =20 - while (isspace (*s)) + while (c_isspace (*s)) s++; =20 // Determine the length of the property value. while (s[l] !=3D 0 - && ! isspace (s[l]) + && ! c_isspace (s[l]) && s[l] !=3D ':' && s[l] !=3D '=3D') {