# HG changeset patch
# User amurillo
# Date 1330135738 28800
# Node ID 975c4105f1e2ef1190a75b77124033f1fd4290b5
# Parent  0ed0960af27d4e7a346df5a3591719ee12b97b1a# Parent  398c5d0fb0ae1e3e2557a56c3ecde7c564f1ecd4
Merge

diff -r 398c5d0fb0ae -r 975c4105f1e2 .hgtags
--- a/.hgtags	Thu Feb 23 21:10:02 2012 -0500
+++ b/.hgtags	Fri Feb 24 18:08:58 2012 -0800
@@ -222,3 +222,6 @@
 d71e662fe03741b6de498ca2077220148405a978 hs23-b15
 fd3060701216a11c0df6dcd053c6fd7c2b17a42c jdk8-b26
 f92a171cf0071ca6c3fa8231d7d570377f8b2f4d hs23-b16
+f92a171cf0071ca6c3fa8231d7d570377f8b2f4d hs23-b16
+931e5f39e365a0d550d79148ff87a7f9e864d2e1 hs23-b16
+3b24e7e01d20ca590d0f86b1222bb7c3f1a2aa2d jdk8-b27
diff -r 398c5d0fb0ae -r 975c4105f1e2 src/cpu/sparc/vm/sharedRuntime_sparc.cpp
--- a/src/cpu/sparc/vm/sharedRuntime_sparc.cpp	Thu Feb 23 21:10:02 2012 -0500
+++ b/src/cpu/sparc/vm/sharedRuntime_sparc.cpp	Fri Feb 24 18:08:58 2012 -0800
@@ -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