| 1 |
dirtyepic 13/12/28 01:33:22 |
| 2 |
|
| 3 |
Modified: README.history |
| 4 |
Added: 27_all_gcj-glibc-2.15-pr50888.patch |
| 5 |
Log: |
| 6 |
Fix building libgcj with newer glibc. |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.3 src/patchsets/gcc/4.1.2/gentoo/README.history |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.1.2/gentoo/README.history?rev=1.3&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.1.2/gentoo/README.history?rev=1.3&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.1.2/gentoo/README.history?r1=1.2&r2=1.3 |
| 14 |
|
| 15 |
Index: README.history |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo/src/patchsets/gcc/4.1.2/gentoo/README.history,v |
| 18 |
retrieving revision 1.2 |
| 19 |
retrieving revision 1.3 |
| 20 |
diff -u -r1.2 -r1.3 |
| 21 |
--- README.history 29 Nov 2012 01:22:00 -0000 1.2 |
| 22 |
+++ README.history 28 Dec 2013 01:33:22 -0000 1.3 |
| 23 |
@@ -1,3 +1,6 @@ |
| 24 |
+1.5 27 Dec 2013 |
| 25 |
+ + 27_all_gcj-glibc-2.15-pr50888.patch |
| 26 |
+ |
| 27 |
1.4 28 Nov 2012 |
| 28 |
+ 05_all_gcc-4.1.x-siginfo.patch |
| 29 |
|
| 30 |
|
| 31 |
|
| 32 |
|
| 33 |
1.1 src/patchsets/gcc/4.1.2/gentoo/27_all_gcj-glibc-2.15-pr50888.patch |
| 34 |
|
| 35 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.1.2/gentoo/27_all_gcj-glibc-2.15-pr50888.patch?rev=1.1&view=markup |
| 36 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.1.2/gentoo/27_all_gcj-glibc-2.15-pr50888.patch?rev=1.1&content-type=text/plain |
| 37 |
|
| 38 |
Index: 27_all_gcj-glibc-2.15-pr50888.patch |
| 39 |
=================================================================== |
| 40 |
libgcj does not link with >=glibc-2.15 |
| 41 |
./.libs/libgcj.so: undefined reference to `__cxa_call_unexpected' |
| 42 |
|
| 43 |
http://gcc.gnu.org/PR50888 |
| 44 |
|
| 45 |
|
| 46 |
--- a/libjava/prims.cc |
| 47 |
+++ b/libjava/prims.cc |
| 48 |
@@ -33,7 +33,6 @@ details. */ |
| 49 |
#endif |
| 50 |
|
| 51 |
#ifndef DISABLE_GETENV_PROPERTIES |
| 52 |
-#include <ctype.h> |
| 53 |
#include <java-props.h> |
| 54 |
#define PROCESS_GCJ_PROPERTIES process_gcj_properties() |
| 55 |
#else |
| 56 |
@@ -805,6 +804,8 @@ static java::lang::Thread *main_thread; |
| 57 |
|
| 58 |
#ifndef DISABLE_GETENV_PROPERTIES |
| 59 |
|
| 60 |
+#define c_isspace(c) (memchr (" \t\n\r\v\f", c, 6) != NULL) |
| 61 |
+ |
| 62 |
static char * |
| 63 |
next_property_key (char *s, size_t *length) |
| 64 |
{ |
| 65 |
@@ -813,7 +814,7 @@ next_property_key (char *s, size_t *length) |
| 66 |
JvAssert (s); |
| 67 |
|
| 68 |
// Skip over whitespace |
| 69 |
- while (isspace (*s)) |
| 70 |
+ while (c_isspace (*s)) |
| 71 |
s++; |
| 72 |
|
| 73 |
// If we've reached the end, return NULL. Also return NULL if for |
| 74 |
@@ -825,7 +826,7 @@ next_property_key (char *s, size_t *length) |
| 75 |
|
| 76 |
// Determine the length of the property key. |
| 77 |
while (s[l] != 0 |
| 78 |
- && ! isspace (s[l]) |
| 79 |
+ && ! c_isspace (s[l]) |
| 80 |
&& s[l] != ':' |
| 81 |
&& s[l] != '=') |
| 82 |
{ |
| 83 |
@@ -847,19 +848,19 @@ next_property_value (char *s, size_t *length) |
| 84 |
|
| 85 |
JvAssert (s); |
| 86 |
|
| 87 |
- while (isspace (*s)) |
| 88 |
+ while (c_isspace (*s)) |
| 89 |
s++; |
| 90 |
|
| 91 |
if (*s == ':' |
| 92 |
|| *s == '=') |
| 93 |
s++; |
| 94 |
|
| 95 |
- while (isspace (*s)) |
| 96 |
+ while (c_isspace (*s)) |
| 97 |
s++; |
| 98 |
|
| 99 |
// Determine the length of the property value. |
| 100 |
while (s[l] != 0 |
| 101 |
- && ! isspace (s[l]) |
| 102 |
+ && ! c_isspace (s[l]) |
| 103 |
&& s[l] != ':' |
| 104 |
&& s[l] != '=') |
| 105 |
{ |
Archives