| 1 |
vapier 12/11/25 02:44:18 |
| 2 |
|
| 3 |
Modified: README.history |
| 4 |
Added: 27_all_gcj-glibc-2.15-pr50888.patch |
| 5 |
Log: |
| 6 |
add fix from upstream for building gcj with newer glibc pr50888 |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.6 src/patchsets/gcc/4.3.6/gentoo/README.history |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.3.6/gentoo/README.history?rev=1.6&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.3.6/gentoo/README.history?rev=1.6&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.3.6/gentoo/README.history?r1=1.5&r2=1.6 |
| 14 |
|
| 15 |
Index: README.history |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo/src/patchsets/gcc/4.3.6/gentoo/README.history,v |
| 18 |
retrieving revision 1.5 |
| 19 |
retrieving revision 1.6 |
| 20 |
diff -u -r1.5 -r1.6 |
| 21 |
--- README.history 24 Nov 2012 22:38:22 -0000 1.5 |
| 22 |
+++ README.history 25 Nov 2012 02:44:18 -0000 1.6 |
| 23 |
@@ -1,4 +1,4 @@ |
| 24 |
-1.1 [pending] |
| 25 |
+1.1 24 Nov 2012 |
| 26 |
- 03_all_gcc43-java-nomulti.patch |
| 27 |
+ 05_all_gcc-4.5.x-siginfo.patch |
| 28 |
- 10_all_gcc-default-fortify-source.patch |
| 29 |
|
| 30 |
|
| 31 |
|
| 32 |
1.1 src/patchsets/gcc/4.3.6/gentoo/27_all_gcj-glibc-2.15-pr50888.patch |
| 33 |
|
| 34 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.3.6/gentoo/27_all_gcj-glibc-2.15-pr50888.patch?rev=1.1&view=markup |
| 35 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.3.6/gentoo/27_all_gcj-glibc-2.15-pr50888.patch?rev=1.1&content-type=text/plain |
| 36 |
|
| 37 |
Index: 27_all_gcj-glibc-2.15-pr50888.patch |
| 38 |
=================================================================== |
| 39 |
http://gcc.gnu.org/PR50888 |
| 40 |
|
| 41 |
fix building of gcj with glibc-2.15+ |
| 42 |
|
| 43 |
applied to gcc-4.6 branch: |
| 44 |
http://gcc.gnu.org/viewcvs?view=revision&revision=181686 |
| 45 |
and to gcc-4.5 branch: |
| 46 |
http://gcc.gnu.org/viewcvs?view=revision&revision=181687 |
| 47 |
and to gcc-4.4 branch: |
| 48 |
http://gcc.gnu.org/viewcvs?view=revision&revision=181688 |
| 49 |
|
| 50 |
2011-11-24 Jakub Jelinek <jakub@××××××.com> |
| 51 |
|
| 52 |
PR bootstrap/50888 |
| 53 |
* prims.cc: Don't include ctype.h. |
| 54 |
(c_isspace): Define. |
| 55 |
(next_property_key, next_property_value): Use it instead |
| 56 |
of isspace. |
| 57 |
|
| 58 |
--- branches/gcc-4_5-branch/libjava/prims.cc 2011/11/24 07:21:39 181686 |
| 59 |
+++ branches/gcc-4_5-branch/libjava/prims.cc 2011/11/24 07:23:16 181687 |
| 60 |
@@ -38,7 +38,6 @@ |
| 61 |
#endif |
| 62 |
|
| 63 |
#ifndef DISABLE_GETENV_PROPERTIES |
| 64 |
-#include <ctype.h> |
| 65 |
#include <java-props.h> |
| 66 |
#define PROCESS_GCJ_PROPERTIES process_gcj_properties() |
| 67 |
#else |
| 68 |
@@ -985,6 +984,8 @@ |
| 69 |
|
| 70 |
#ifndef DISABLE_GETENV_PROPERTIES |
| 71 |
|
| 72 |
+#define c_isspace(c) (memchr (" \t\n\r\v\f", c, 6) != NULL) |
| 73 |
+ |
| 74 |
static char * |
| 75 |
next_property_key (char *s, size_t *length) |
| 76 |
{ |
| 77 |
@@ -993,7 +994,7 @@ |
| 78 |
JvAssert (s); |
| 79 |
|
| 80 |
// Skip over whitespace |
| 81 |
- while (isspace (*s)) |
| 82 |
+ while (c_isspace (*s)) |
| 83 |
s++; |
| 84 |
|
| 85 |
// If we've reached the end, return NULL. Also return NULL if for |
| 86 |
@@ -1005,7 +1006,7 @@ |
| 87 |
|
| 88 |
// Determine the length of the property key. |
| 89 |
while (s[l] != 0 |
| 90 |
- && ! isspace (s[l]) |
| 91 |
+ && ! c_isspace (s[l]) |
| 92 |
&& s[l] != ':' |
| 93 |
&& s[l] != '=') |
| 94 |
{ |
| 95 |
@@ -1027,19 +1028,19 @@ |
| 96 |
|
| 97 |
JvAssert (s); |
| 98 |
|
| 99 |
- while (isspace (*s)) |
| 100 |
+ while (c_isspace (*s)) |
| 101 |
s++; |
| 102 |
|
| 103 |
if (*s == ':' |
| 104 |
|| *s == '=') |
| 105 |
s++; |
| 106 |
|
| 107 |
- while (isspace (*s)) |
| 108 |
+ while (c_isspace (*s)) |
| 109 |
s++; |
| 110 |
|
| 111 |
// Determine the length of the property value. |
| 112 |
while (s[l] != 0 |
| 113 |
- && ! isspace (s[l]) |
| 114 |
+ && ! c_isspace (s[l]) |
| 115 |
&& s[l] != ':' |
| 116 |
&& s[l] != '=') |
| 117 |
{ |
Archives