From: OpenJDK Team <openjdk-17@packages.debian.org>
Date: Thu, 26 Jan 2023 10:36:16 +0000 (+0000)
Subject: workaround_expand_exec_shield_cs_limit
X-Git-Tag: archive/raspbian/17.0.6+10-1+rpi1^2~26
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b701817f54d7926ce0ee04129f0d5921d9f2ccd1;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 9754cb707..3d16eb0aa 100644
--- a/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp
+++ b/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp
@@ -651,7 +651,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();