From 563d28e16465119001c7728cb88abb873344be5d Mon Sep 17 00:00:00 2001 From: khanhduytran0 Date: Sat, 23 Nov 2024 22:39:56 +0000 Subject: [PATCH] Fix(iOS): fix patch --- patches/jre_17/ios/jdk17u_ios.diff | 2 +- patches/jre_21/ios/jdk21u_ios.diff | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/jre_17/ios/jdk17u_ios.diff b/patches/jre_17/ios/jdk17u_ios.diff index e46f62e2..c8fa64aa 100644 --- a/patches/jre_17/ios/jdk17u_ios.diff +++ b/patches/jre_17/ios/jdk17u_ios.diff @@ -502,7 +502,7 @@ index 243c12ce3..879f28df3 100644 + int prot = exec&&os::Bsd::isRWXJITAvailable() ? PROT_READ|PROT_WRITE|PROT_EXEC : PROT_READ|PROT_WRITE; #if defined(__OpenBSD__) // XXX: Work-around mmap/MAP_FIXED bug temporarily on OpenBSD - Events::log(NULL, "Protecting memory [" INTPTR_FORMAT "," INTPTR_FORMAT "] with protection modes %x", p2i(addr), p2i(addr+size), prot); + Events::log_memprotect(NULL, "Protecting memory [" INTPTR_FORMAT "," INTPTR_FORMAT "] with protection modes %x", p2i(addr), p2i(addr+size), prot); @@ -1720,7 +1740,7 @@ bool os::remove_stack_guard_pages(char* addr, size_t size) { static char* anon_mmap(char* requested_addr, size_t bytes, bool exec) { // MAP_FIXED is intentionally left out, to leave existing mappings intact. diff --git a/patches/jre_21/ios/jdk21u_ios.diff b/patches/jre_21/ios/jdk21u_ios.diff index bb567582..f3ea9d2a 100644 --- a/patches/jre_21/ios/jdk21u_ios.diff +++ b/patches/jre_21/ios/jdk21u_ios.diff @@ -508,7 +508,7 @@ index 144ca8213..05771bc9b 100644 + int prot = exec&&os::Bsd::isRWXJITAvailable() ? PROT_READ|PROT_WRITE|PROT_EXEC : PROT_READ|PROT_WRITE; #if defined(__OpenBSD__) // XXX: Work-around mmap/MAP_FIXED bug temporarily on OpenBSD - Events::log(nullptr, "Protecting memory [" INTPTR_FORMAT "," INTPTR_FORMAT "] with protection modes %x", p2i(addr), p2i(addr+size), prot); + Events::log_memprotect(nullptr, "Protecting memory [" INTPTR_FORMAT "," INTPTR_FORMAT "] with protection modes %x", p2i(addr), p2i(addr+size), prot); @@ -1649,7 +1669,7 @@ bool os::remove_stack_guard_pages(char* addr, size_t size) { static char* anon_mmap(char* requested_addr, size_t bytes, bool exec) { // MAP_FIXED is intentionally left out, to leave existing mappings intact.