# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1426592985 -3600
# Node ID 6d142d351bf7b449dbbab56d2a4ff9ca6a7edfef
# Parent  87c62a38f843b8ac9c2a1198724f0c0f72c792a8# Parent  825f5c7468bda62d190e37466b172313e068d014
Merge.

diff -r 87c62a38f843 -r 6d142d351bf7 src/os/solaris/vm/os_solaris.cpp
--- 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.");
   }
 
diff -r 87c62a38f843 -r 6d142d351bf7 test/blacklist_sparc.txt
--- 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