diff --git a/5_clonejdk.sh b/5_clonejdk.sh index 203a312..26c3921 100755 --- a/5_clonejdk.sh +++ b/5_clonejdk.sh @@ -2,7 +2,7 @@ set -e if [[ $TARGET_VERSION -eq 21 ]]; then - git clone --branch jdk21.0.1 --depth 1 https://github.com/openjdk/jdk21u openjdk-21 + git clone --branch jdk-21.0.8+7 --depth 1 https://github.com/openjdk/jdk21u openjdk-21 else git clone --depth 1 https://github.com/openjdk/jdk17u openjdk-17 -fi \ No newline at end of file +fi diff --git a/patches/jre_21/ios/jdk21u_ios.diff b/patches/jre_21/ios/jdk21u_ios.diff index bb56758..f3ea9d2 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.