[gentoo-commits] gentoo commit in src/patchsets/gcc/4.5.3/gentoo: 27_all_gcj-glibc-2.15-pr50888.patch README.history

[gentoo-commits] gentoo commit in src/patchsets/gcc/4.5.3/gentoo: 27_all_gcj-glibc-2.15-pr50888.patch README.history

[Mike Frysinger (vapier)]

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.4                  src/patchsets/gcc/4.5.3/gentoo/README.history

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.5.3/gentoo/README.history?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.5.3/gentoo/README.history?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.5.3/gentoo/README.history?r1=1.3&r2=1.4

Index: README.history
===================================================================
RCS file: /var/cvsroot/gentoo/src/patchsets/gcc/4.5.3/gentoo/README.history,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- README.history	20 Feb 2012 05:19:46 -0000	1.3
+++ README.history	15 Apr 2012 17:18:47 -0000	1.4
@@ -1,3 +1,6 @@
+1.2		[pending]
+	+ 27_all_gcj-glibc-2.15-pr50888.patch
+
 1.1		20 Feb 2012
 	+ 77_all_pr51106_4.5.4_ice-move_insn.patch
 



1.1                  src/patchsets/gcc/4.5.3/gentoo/27_all_gcj-glibc-2.15-pr50888.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.5.3/gentoo/27_all_gcj-glibc-2.15-pr50888.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.5.3/gentoo/27_all_gcj-glibc-2.15-pr50888.patch?rev=1.1&content-type=text/plain

Index: 27_all_gcj-glibc-2.15-pr50888.patch
===================================================================
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=revision&revision=181686
and to gcc-4.5 branch:
	http://gcc.gnu.org/viewcvs?view=revision&revision=181687
and to gcc-4.4 branch:
	http://gcc.gnu.org/viewcvs?view=revision&revision=181688

2011-11-24  Jakub Jelinek  <jakub@redhat.com>

	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
 
 #ifndef DISABLE_GETENV_PROPERTIES
-#include <ctype.h>
 #include <java-props.h>
 #define PROCESS_GCJ_PROPERTIES process_gcj_properties()
 #else
@@ -985,6 +984,8 @@
 
 #ifndef DISABLE_GETENV_PROPERTIES
 
+#define c_isspace(c) (memchr (" \t\n\r\v\f", c, 6) != NULL)
+
 static char *
 next_property_key (char *s, size_t *length)
 {
@@ -993,7 +994,7 @@
   JvAssert (s);
 
   // Skip over whitespace
-  while (isspace (*s))
+  while (c_isspace (*s))
     s++;
 
   // If we've reached the end, return NULL.  Also return NULL if for
@@ -1005,7 +1006,7 @@
 
   // Determine the length of the property key.
   while (s[l] != 0
-	 && ! isspace (s[l])
+	 && ! c_isspace (s[l])
 	 && s[l] != ':'
 	 && s[l] != '=')
     {
@@ -1027,19 +1028,19 @@
 
   JvAssert (s);
 
-  while (isspace (*s))
+  while (c_isspace (*s))
     s++;
 
   if (*s == ':'
       || *s == '=')
     s++;
 
-  while (isspace (*s))
+  while (c_isspace (*s))
     s++;
 
   // Determine the length of the property value.
   while (s[l] != 0
-	 && ! isspace (s[l])
+	 && ! c_isspace (s[l])
 	 && s[l] != ':'
 	 && s[l] != '=')
     {