diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2017-05-12 22:48:36 +0300 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2017-05-12 22:48:36 +0300 |
| commit | 37d630875d33bf3c291026c40bb08d1b6c9edcc8 (patch) | |
| tree | 68fb026f54a962cf1d631f010e98681add6ed014 /debian/patches/workaround_expand_exec_shield_cs_limit.diff | |
| download | openjdk-8-debian.tar.gz | |
Imported debian/openjdk-8_8u131-b11-1debian/8u131-b11-1debian
Diffstat (limited to 'debian/patches/workaround_expand_exec_shield_cs_limit.diff')
| -rw-r--r-- | debian/patches/workaround_expand_exec_shield_cs_limit.diff | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/debian/patches/workaround_expand_exec_shield_cs_limit.diff b/debian/patches/workaround_expand_exec_shield_cs_limit.diff new file mode 100644 index 0000000..5d5c665 --- /dev/null +++ b/debian/patches/workaround_expand_exec_shield_cs_limit.diff @@ -0,0 +1,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 + |