changeset 19882:825f5c7468bd

Merge
author Stefan Anzinger <stefan.anzinger@oracle.com>
date Tue, 17 Mar 2015 12:05:51 +0100
parents 8e316bc46018 (diff) ab898f9f9c3c (current diff)
children 6d142d351bf7 823074fd8410 749b96e8ff90
files graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotCompare.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/NewArrayStubCall.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/NewInstanceStubCall.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/NewMultiArrayStubCall.java graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64BitManipulationOp.java graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64Compare.java graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64TestMemoryOp.java graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64TestOp.java
diffstat 2 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/os/solaris/vm/os_solaris.cpp	Mon Mar 16 16:54:10 2015 -0700
+++ b/src/os/solaris/vm/os_solaris.cpp	Tue Mar 17 12:05:51 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	Mon Mar 16 16:54:10 2015 -0700
+++ b/test/blacklist_sparc.txt	Tue Mar 17 12:05:51 2015 +0100
@@ -1,2 +1,3 @@
 com.oracle.graal.replacements.test.StandardMethodSubstitutionsTest
 com.oracle.graal.hotspot.amd64.test.CompressedNullCheckTest
+com.oracle.nfi.test.NativeFunctionInterfaceTest