/hg/icedtea7-forest/hotspot: PR1868: Avoid x86 workaround when r...

[andrew at icedtea.classpath.org]

changeset fae3b09fe959 in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=fae3b09fe959
author: andrew
date: Tue Jul 15 22:55:15 2014 +0100

	PR1868: Avoid x86 workaround when running Zero rather than a JIT
	Contributed-by: Matthias Klose <doko at ubuntu.com>


diffstat:

 src/os/linux/vm/os_linux.cpp             |  2 +-
 src/os_cpu/linux_x86/vm/os_linux_x86.cpp |  2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diffs (24 lines):

diff -r a61c666945e7 -r fae3b09fe959 src/os/linux/vm/os_linux.cpp
--- a/src/os/linux/vm/os_linux.cpp	Tue Jun 03 17:16:46 2014 +0100
+++ b/src/os/linux/vm/os_linux.cpp	Tue Jul 15 22:55:15 2014 +0100
@@ -4925,7 +4925,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
 
diff -r a61c666945e7 -r fae3b09fe959 src/os_cpu/linux_x86/vm/os_linux_x86.cpp
--- a/src/os_cpu/linux_x86/vm/os_linux_x86.cpp	Tue Jun 03 17:16:46 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