Skip to content

Commit

Permalink
Fix(iOS): fix patch
Browse files Browse the repository at this point in the history
  • Loading branch information
khanhduytran0 committed Nov 23, 2024
1 parent 0190182 commit 563d28e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion patches/jre_17/ios/jdk17u_ios.diff
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion patches/jre_21/ios/jdk21u_ios.diff
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 563d28e

Please sign in to comment.