changeset 5014:2cb58882dac3 icedtea-2.4.5

RH1015432: java-1.7.0-openjdk: Fails on PPC with StackOverflowError Contributed-by: chphilli@redhat.com
author andrew
date Tue, 28 Jan 2014 17:58:08 +0000
parents cbeecad5efcb
children 2c97070e5af4
files src/os/linux/vm/os_linux.cpp
diffstat 1 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/os/linux/vm/os_linux.cpp	Thu Jan 23 22:41:21 2014 +0000
+++ b/src/os/linux/vm/os_linux.cpp	Tue Jan 28 17:58:08 2014 +0000
@@ -4612,7 +4612,15 @@
   // class initialization depending on 32 or 64 bit VM.
   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());
+                    (2*BytesPerWord COMPILER2_PRESENT(+1)) 
+                       * 
+#ifdef PPC
+                      NOT_ZERO ( Linux::vm_default_page_size() ) 
+                       ZERO_ONLY ( Linux::page_size() )
+#else                   
+                       ( Linux::vm_default_page_size() )
+#endif
+                     );
 
   size_t threadStackSizeInBytes = ThreadStackSize * K;
   if (threadStackSizeInBytes != 0 &&