From 42e5505db63ac360dc25aee51866ef4d22a2429a Mon Sep 17 00:00:00 2001
From: Andrew Haley <aph@openjdk.org>
Date: Tue, 21 Oct 2025 16:28:05 +0100
Subject: [PATCH] Merge from maaster

---
 src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
index f2eaaa5b6eb..cb08693350c 100644
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
@@ -473,6 +473,7 @@ address MacroAssembler::target_addr_for_insn(address insn_addr) {
 // Patch any kind of instruction; there may be several instructions.
 // Return the total length (in bytes) of the instructions.
 int MacroAssembler::pd_patch_instruction_size(address insn_addr, address target) {
+  MACOS_AARCH64_ONLY(os::thread_wx_enable_write());
   return RelocActions<Patcher>::run(insn_addr, target);
 }