changeset 19887:6d142d351bf7

Merge.
author Doug Simon <doug.simon@oracle.com>
date Tue, 17 Mar 2015 12:49:45 +0100
parents 87c62a38f843 (current diff) 825f5c7468bd (diff)
children e1584086dc20
files
diffstat 2 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/os/solaris/vm/os_solaris.cpp	Tue Mar 17 12:13:24 2015 +0100
+++ b/src/os/solaris/vm/os_solaris.cpp	Tue Mar 17 12:49:45 2015 +0100
@@ -2674,8 +2674,6 @@
 
   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.");
   }
 
--- a/test/blacklist_sparc.txt	Tue Mar 17 12:13:24 2015 +0100
+++ b/test/blacklist_sparc.txt	Tue Mar 17 12:49:45 2015 +0100
@@ -1,2 +1,3 @@
 com.oracle.graal.replacements.test.StandardMethodSubstitutionsTest
 com.oracle.graal.hotspot.amd64.test.CompressedNullCheckTest
+com.oracle.nfi.test.NativeFunctionInterfaceTest