blob: 5d5c665339dcdbf060aa00a1893339f7bc81ea28 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
|
--- a/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
+++ b/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
@@ -890,7 +890,7 @@ void os::verify_stack_alignment() {
* updates (JDK-8023956).
*/
void os::workaround_expand_exec_shield_cs_limit() {
-#if defined(IA32)
+#if defined(IA32) && !defined(ZERO)
size_t page_size = os::vm_page_size();
/*
* Take the highest VA the OS will give us and exec
--- a/hotspot/src/os/linux/vm/os_linux.cpp
+++ b/hotspot/src/os/linux/vm/os_linux.cpp
@@ -4933,7 +4933,7 @@ ZERO_ONLY (
Linux::capture_initial_stack(JavaThread::stack_size_at_create());
-#if defined(IA32)
+#if defined(IA32) && !defined(ZERO)
workaround_expand_exec_shield_cs_limit();
#endif
|
