Automatic merge of jdk:master into master

duke · duke · commit 0727a6b0a76e · 2020-11-24T12:27:26.000Z
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());

Original file line number	Diff line number	Diff line change
`@@ -4538,7 +4538,7 @@ jint os::init_2(void) {`
`4538`	`4538`	`return JNI_ERR;`
`4539`	`4539`	`}`
`4540`	`4540`
`4541`		`-#if defined(IA32)`
	`4541`	`+#if defined(IA32) && !defined(ZERO)`
`4542`	`4542`	`// Need to ensure we've determined the process's initial stack to`
`4543`	`4543`	`// perform the workaround`
`4544`	`4544`	`Linux::capture_initial_stack(JavaThread::stack_size_at_create());`