From: OpenJDK Team <openjdk-17@packages.debian.org>
Date: Wed, 20 Jul 2022 16:04:41 +0000 (+0100)
Subject: workaround_expand_exec_shield_cs_limit
X-Git-Tag: archive/raspbian/17.0.6+10-1+rpi1~1^2~26
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5ab0fb5432747fc34e7881c0dfbde993a51ae0a0;p=openjdk-17.git

workaround_expand_exec_shield_cs_limit


Gbp-Pq: Name workaround_expand_exec_shield_cs_limit.diff
---

diff --git a/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp b/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp
index cc71b0d27..53c21e6e7 100644
--- a/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp
+++ b/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp
@@ -635,7 +635,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)
   assert(Linux::initial_thread_stack_bottom() != NULL, "sanity");
   size_t page_size = os::vm_page_size();