[patch] fix zero builds on i386 in openjdk-7 and openjdk-8

[Matthias Klose]

zero builds are currently broken on i386 in openjdk-7 and openjdk-8
(icedtea-2.5.0 is affected too).  Afaics this workaround is not needed for zero,
so disabling it. zero test results for hotspot and langtools look ok.

  Matthias

-------------- next part --------------
--- openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
+++ openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
@@ -890,7 +890,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
--- openjdk/hotspot/src/os/linux/vm/os_linux.cpp
+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp
@@ -4852,7 +4852,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