Automatic merge of jdk:master into master

openjdk · Nov 24, 2020 · 0727a6b · 0727a6b
2 parents 7cc024d + 7b3d095
commit 0727a6b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp
@@ -4538,7 +4538,7 @@ jint os::init_2(void) {
     return JNI_ERR;
   }
 
-#if defined(IA32)
+#if defined(IA32) && !defined(ZERO)
   // Need to ensure we've determined the process's initial stack to
   // perform the workaround
   Linux::capture_initial_stack(JavaThread::stack_size_at_create());