/hg/icedtea7-forest/hotspot: RH1015432: java-1.7.0-openjdk: Fail...

[andrew at icedtea.classpath.org]

changeset 304c66cf5010 in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=304c66cf5010
author: andrew
date: Thu Aug 28 15:26:22 2014 +0100

	RH1015432: java-1.7.0-openjdk: Fails on PPC with StackOverflowError (revised fix for PPC32)
	Contributed-by: chphilli at redhat.com


diffstat:

 src/os/linux/vm/os_linux.cpp |  10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diffs (37 lines):

diff -r 69d9f2195369 -r 304c66cf5010 src/os/linux/vm/os_linux.cpp
--- a/src/os/linux/vm/os_linux.cpp	Wed Aug 27 23:07:43 2014 +0100
+++ b/src/os/linux/vm/os_linux.cpp	Thu Aug 28 15:26:22 2014 +0100
@@ -4854,6 +4854,7 @@
 
   pthread_mutex_init(&dl_mutex, NULL);
 
+NOT_ZERO (
   // If the pagesize of the VM is greater than 8K determine the appropriate
   // number of initial guard pages.  The user can change this with the
   // command line arguments, if needed.
@@ -4862,6 +4863,7 @@
     StackRedPages = 1;
     StackShadowPages = round_to((StackShadowPages*Linux::vm_default_page_size()), vm_page_size()) / vm_page_size();
   }
+ )
 }
 
 // To install functions for atexit system call
@@ -4914,10 +4916,16 @@
   // size.  Add a page for compiler2 recursion in main thread.
   // Add in 2*BytesPerWord times page size to account for VM stack during
   // class initialization depending on 32 or 64 bit VM.
+NOT_ZERO (
   os::Linux::min_stack_allowed = MAX2(os::Linux::min_stack_allowed,
             (size_t)(StackYellowPages+StackRedPages+StackShadowPages) * Linux::page_size() +
                     (2*BytesPerWord COMPILER2_PRESENT(+1)) * Linux::vm_default_page_size());
-
+ )
+ZERO_ONLY (
+ os::Linux::min_stack_allowed = MAX2(os::Linux::min_stack_allowed,           
+            (size_t)(StackYellowPages+StackRedPages+StackShadowPages+
+                     2*BytesPerWord COMPILER2_PRESENT(+1)) * Linux::page_size());
+ )
   size_t threadStackSizeInBytes = ThreadStackSize * K;
   if (threadStackSizeInBytes != 0 &&
       threadStackSizeInBytes < os::Linux::min_stack_allowed) {