# HG changeset patch
# User lana
# Date 1485465644 0
# Node ID 26e8cc2cc3a36d28071aa92b5df3a1b0a96b73ca
# Parent  b4d0666ab96ff1ef94a5cb8fedd64c41e8205cd6# Parent  eec57137c0a6a1ad3a07bf49d2bf59937c3e0000
Merge

diff -r b4d0666ab96f -r 26e8cc2cc3a3 hotspot/src/cpu/aarch64/vm/globals_aarch64.hpp
--- a/hotspot/src/cpu/aarch64/vm/globals_aarch64.hpp	Thu Jan 26 19:22:37 2017 +0000
+++ b/hotspot/src/cpu/aarch64/vm/globals_aarch64.hpp	Thu Jan 26 21:20:44 2017 +0000
@@ -46,7 +46,10 @@
 
 #define DEFAULT_STACK_YELLOW_PAGES (2)
 #define DEFAULT_STACK_RED_PAGES (1)
-#define DEFAULT_STACK_SHADOW_PAGES (4 DEBUG_ONLY(+5))
+// Java_java_net_SocketOutputStream_socketWrite0() uses a 64k buffer on the
+// stack if compiled for unix and LP64. To pass stack overflow tests we need
+// 20 shadow pages.
+#define DEFAULT_STACK_SHADOW_PAGES (20 DEBUG_ONLY(+5))
 #define DEFAULT_STACK_RESERVED_PAGES (0)
 
 #define MIN_STACK_YELLOW_PAGES DEFAULT_STACK_YELLOW_PAGES