Mercurial > hg > release > icedtea7-forest-2.5 > hotspot
changeset 5547:02066294d005 icedtea-2.5.1
PR1868: Avoid x86 workaround when running Zero rather than a JIT
Contributed-by: Matthias Klose <doko@ubuntu.com>
author | andrew |
---|---|
date | Tue, 15 Jul 2014 22:55:15 +0100 |
parents | 278444ea0eb5 |
children | 32a780f7a690 |
files | src/os/linux/vm/os_linux.cpp src/os_cpu/linux_x86/vm/os_linux_x86.cpp |
diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/os/linux/vm/os_linux.cpp Tue Jul 15 22:47:39 2014 +0100 +++ b/src/os/linux/vm/os_linux.cpp Tue Jul 15 22:55:15 2014 +0100 @@ -4923,7 +4923,7 @@ Linux::capture_initial_stack(JavaThread::stack_size_at_create()); -#if defined(IA32) +#if defined(IA32) && !defined(ZERO) workaround_expand_exec_shield_cs_limit(); #endif
--- a/src/os_cpu/linux_x86/vm/os_linux_x86.cpp Tue Jul 15 22:47:39 2014 +0100 +++ b/src/os_cpu/linux_x86/vm/os_linux_x86.cpp Tue Jul 15 22:55:15 2014 +0100 @@ -880,7 +880,7 @@ * 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