commit f36dbe4212892eb8fa758e93f6e05cec616fdd6f
author amurillo <none@none> Fri Feb 24 18:08:58 2012 -0800
committer amurillo <none@none> Fri Feb 24 18:08:58 2012 -0800
tree a361e38e8cb94f69d1428d78985ad10707ea93a0
parent 674b85f0f71cba0e9743bd23b867be2752ab3b13
parent 4d4fdf46c640f40cbcbba999f4aa4bb3d317460d

Merge

.hgtags

diff --git a/.hgtags b/.hgtags
index 3e25285..22f0a55 100644
--- a/.hgtags
+++ b/.hgtags
@@ -222,3 +222,6 @@
 d71e662fe03741b6de498ca2077220148405a978 hs23-b15
 fd3060701216a11c0df6dcd053c6fd7c2b17a42c jdk8-b26
 f92a171cf0071ca6c3fa8231d7d570377f8b2f4d hs23-b16
+f92a171cf0071ca6c3fa8231d7d570377f8b2f4d hs23-b16
+931e5f39e365a0d550d79148ff87a7f9e864d2e1 hs23-b16
+3b24e7e01d20ca590d0f86b1222bb7c3f1a2aa2d jdk8-b27

src/cpu/sparc/vm/sharedRuntime_sparc.cpp

diff --git a/src/cpu/sparc/vm/sharedRuntime_sparc.cpp b/src/cpu/sparc/vm/sharedRuntime_sparc.cpp
index 23f00a6..f82066e 100644
--- a/src/cpu/sparc/vm/sharedRuntime_sparc.cpp
+++ b/src/cpu/sparc/vm/sharedRuntime_sparc.cpp
@@ -3431,6 +3431,9 @@
   ResourceMark rm;
   // setup code generation tools
   int pad = VerifyThread ? 512 : 0;// Extra slop space for more verify code
+  if (UseStackBanging) {
+    pad += StackShadowPages*16 + 32;
+  }
 #ifdef _LP64
   CodeBuffer buffer("deopt_blob", 2100+pad, 512);
 #else
@@ -3650,6 +3653,9 @@
   ResourceMark rm;
   // setup code generation tools
   int pad = VerifyThread ? 512 : 0;
+  if (UseStackBanging) {
+    pad += StackShadowPages*16 + 32;
+  }
 #ifdef _LP64
   CodeBuffer buffer("uncommon_trap_blob", 2700+pad, 512);
 #else