Mercurial > hg > truffle
changeset 19815:7ee442766685
Merge.
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Thu, 12 Mar 2015 16:45:24 +0100 |
| parents | 4bc9b6838303 (current diff) 4bc952439f2a (diff) |
| children | a71b0398f8c7 52c9b1959f95 |
| files | |
| diffstat | 2 files changed, 12 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/hotspot/.project Thu Mar 12 16:07:34 2015 +0100 +++ b/hotspot/.project Thu Mar 12 16:45:24 2015 +0100 @@ -121,6 +121,16 @@ <locationURI>PARENT-1-PROJECT_LOC/src/os_cpu/linux_sparc/vm</locationURI> </link> <link> + <name>solaris_sparc</name> + <type>2</type> + <locationURI>PARENT-1-PROJECT_LOC/src/os_cpu/solaris_sparc/vm</locationURI> + </link> + <link> + <name>solaris</name> + <type>2</type> + <locationURI>PARENT-1-PROJECT_LOC/src/os/solaris/vm</locationURI> + </link> + <link> <name>linux_x86</name> <type>2</type> <locationURI>PARENT-1-PROJECT_LOC/src/os_cpu/linux_x86/vm</locationURI>
--- a/src/os/solaris/vm/os_solaris.cpp Thu Mar 12 16:07:34 2015 +0100 +++ b/src/os/solaris/vm/os_solaris.cpp Thu Mar 12 16:45:24 2015 +0100 @@ -2674,6 +2674,8 @@ if (!recoverable_mmap_error(err)) { warn_fail_commit_memory(addr, bytes, exec, err); + // Introduced temporarily to debug the memory allocation issues on Solaris + tty->print_cr("GRAAL_DEBUG: unrecoverable error during mmap got errno %d", err); vm_exit_out_of_memory(bytes, OOM_MMAP_ERROR, "committing reserved memory."); }