diff options
| author |   Ryan Hill <rhill@gentoo.org> | 2013-12-28 01:33:22 +0000 |
|---|---|---|
| committer | Ryan Hill <rhill@gentoo.org> | 2013-12-28 01:33:22 +0000 |
| commit | 779a82bd40c03cdd10ac1b4377a7a8f0de73dcd6 (patch) | |
| tree | a729b6b50df6faebc57855225f38209d49e41e2f /4.2.4 | |
| parent | fix date format (diff) | |
| download | gcc-patches-779a82bd40c03cdd10ac1b4377a7a8f0de73dcd6.tar.gz gcc-patches-779a82bd40c03cdd10ac1b4377a7a8f0de73dcd6.tar.bz2 gcc-patches-779a82bd40c03cdd10ac1b4377a7a8f0de73dcd6.zip | |
Fix building libgcj with newer glibc.
Diffstat (limited to '4.2.4')
| -rw-r--r-- | 4.2.4/gentoo/27_all_gcj-glibc-2.15-pr50888.patch | 66 | ||||
| -rw-r--r-- | 4.2.4/gentoo/README.history | 3 |
2 files changed, 69 insertions, 0 deletions
diff --git a/4.2.4/gentoo/27_all_gcj-glibc-2.15-pr50888.patch b/4.2.4/gentoo/27_all_gcj-glibc-2.15-pr50888.patch new file mode 100644 index 0000000..215e59a --- /dev/null +++ b/4.2.4/gentoo/27_all_gcj-glibc-2.15-pr50888.patch @@ -0,0 +1,66 @@ +libgcj does not link with >=glibc-2.15 +./.libs/libgcj.so: undefined reference to `__cxa_call_unexpected' + +http://gcc.gnu.org/PR50888 + + +--- a/libjava/prims.cc ++++ b/libjava/prims.cc +@@ -33,7 +33,6 @@ details. */ + #endif + + #ifndef DISABLE_GETENV_PROPERTIES +-#include <ctype.h> + #include <java-props.h> + #define PROCESS_GCJ_PROPERTIES process_gcj_properties() + #else +@@ -805,6 +804,8 @@ static java::lang::Thread *main_thread; + + #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) + { +@@ -813,7 +814,7 @@ next_property_key (char *s, size_t *length) + 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 +@@ -825,7 +826,7 @@ next_property_key (char *s, size_t *length) + + // Determine the length of the property key. + while (s[l] != 0 +- && ! isspace (s[l]) ++ && ! c_isspace (s[l]) + && s[l] != ':' + && s[l] != '=') + { +@@ -847,19 +848,19 @@ next_property_value (char *s, size_t *length) + + 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] != '=') + { diff --git a/4.2.4/gentoo/README.history b/4.2.4/gentoo/README.history index b12e6c0..458dad7 100644 --- a/4.2.4/gentoo/README.history +++ b/4.2.4/gentoo/README.history @@ -1,3 +1,6 @@ +1.3 27 Dec 2013 + + 27_all_gcj-glibc-2.15-pr50888.patch + 1.2 29 Nov 2012 + 01_all_gcc-4.1-alpha-asm-mcpu.patch - 03_all_gcc4-java-nomulti.patch |