From 39929e0b0511285b8105944dcd70928a4f8a3e50 Mon Sep 17 00:00:00 2001 From: alexytomi <60690056+alexytomi@users.noreply.github.com> Date: Fri, 11 Jul 2025 15:27:26 +0800 Subject: [PATCH 1/9] chore(main/openjdk-21): Regenerate patchset --- ...lude-netinet-in.h-for-android-builds.patch | 8 +- ...s_linux-add-android-checks-and-fixes.patch | 14 ++-- ...Define-sys-gettid-on-arm-and-aarch64.patch | 12 +-- ...six-print-uptime-overridden-by-linux.patch | 14 ++-- ...prevent-build-of-libjsound-and-libsa.patch | 12 +-- .../0006-Link-against-system-libiconv.patch | 10 +-- ...h64_get_thread_helper-Thread-current.patch | 8 +- ...008-Remove-aarch64_get_thread_helper.patch | 8 +- .../0009-Use-Android-s-strerror_r.patch | 8 +- .../0010-Use-utimensat-on-android.patch | 20 ++--- ..._nio_fs_UnixNativeDispatcher_futimes.patch | 12 +-- ...0012-Add-CXXFLAGS_JDKLIB-to-CXXFLAGS.patch | 14 ++-- .../0013-Use-ASCII-codeset-on-android.patch | 10 +-- ...vm.so-path-when-run-from-Android-app.patch | 10 +-- ...-address-to-char-when-clearing-cache.patch | 8 +- ...control-related-functions-on-Android.patch | 12 +-- ...ink-against-libawt-to-fix-link-error.patch | 10 +-- ...m.so-path-from-proc-self-maps-on-and.patch | 16 ++-- ...f-exiting-if-getcpu-2-is-unsupported.patch | 10 +-- .../0020-Remove-pre-UAL-aliases.patch | 8 +- ...arm-fix-assembly-in-os_linux_arm.cpp.patch | 10 +-- ...nd-for-tagged-pointers-on-Android-12.patch | 8 +- .../0023-x86-always-compile-with-PIC.patch | 8 +- .../0024-Fix-StackOverflowError-on-ARM.patch | 8 +- ...lvsym-is-available-if-ANDROID_API-24.patch | 10 +-- .../0026-configure-do-not-require-alsa.patch | 8 +- ...te-hardcoded-paths-to-work-in-termux.patch | 79 +++++++++---------- ...eed-to-define-ELF-32-64-_ST_TYPE-on-.patch | 8 +- ...etloadavg-implementation-for-android.patch | 10 +-- ...nux-use-getpagesize-instad-of-SHMLBA.patch | 12 +-- ...ava-change-return-type-of-strerror_r.patch | 14 ++-- ...-cflags-handle-arm-like-other-arches.patch | 10 +-- ...33-Fix-bugs-in-File.getCanonicalPath.patch | 10 +-- ...ilter-same-symbols-for-linux-and-and.patch | 11 +-- .../0035-Fix-build-with-lld-17.patch | 9 +-- ...-define-ARM-for-arm-build-with-clang.patch | 10 +-- ...-do-not-use-dlinfo-and-RTLD_DI_LINKM.patch | 10 +-- .../0038-OUTTREE-bionic-type-redef-fix.patch | 15 ++++ ...39-Fix-hardcoded-paths-in-jdk.attach.patch | 9 ++- .../0040-Do-not-disable-new-dtags.patch | 21 ++++- .../0041-disable-statx-syscall.patch | 19 +++-- 41 files changed, 278 insertions(+), 245 deletions(-) diff --git a/packages/openjdk-21/0001-libinet-include-netinet-in.h-for-android-builds.patch b/packages/openjdk-21/0001-libinet-include-netinet-in.h-for-android-builds.patch index 31ed09fa227920a..cb334ffb100fa15 100644 --- a/packages/openjdk-21/0001-libinet-include-netinet-in.h-for-android-builds.patch +++ b/packages/openjdk-21/0001-libinet-include-netinet-in.h-for-android-builds.patch @@ -1,14 +1,14 @@ -From 85913fabd90c355e9e5887ab01d026539e0d1e4e Mon Sep 17 00:00:00 2001 +From 2c006533a199190b1895555ecd22e57504b8410d Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 31 Mar 2024 16:31:48 +0200 -Subject: [PATCH 01/37] libinet: include netinet/in.h for android builds +Subject: [PATCH 01/41] libinet: include netinet/in.h for android builds --- src/java.base/unix/native/libnet/net_util_md.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/java.base/unix/native/libnet/net_util_md.h b/src/java.base/unix/native/libnet/net_util_md.h -index 902cf9673..e74b6265b 100644 +index 902cf96732f..e74b6265b5d 100644 --- a/src/java.base/unix/native/libnet/net_util_md.h +++ b/src/java.base/unix/native/libnet/net_util_md.h @@ -26,6 +26,9 @@ @@ -22,5 +22,5 @@ index 902cf9673..e74b6265b 100644 #include #include -- -2.45.2 +2.50.0 diff --git a/packages/openjdk-21/0002-os_linux-add-android-checks-and-fixes.patch b/packages/openjdk-21/0002-os_linux-add-android-checks-and-fixes.patch index 303c3781085b4ad..59845e1c9655ef1 100644 --- a/packages/openjdk-21/0002-os_linux-add-android-checks-and-fixes.patch +++ b/packages/openjdk-21/0002-os_linux-add-android-checks-and-fixes.patch @@ -1,17 +1,17 @@ -From 30cf54273a90846f21289beeb495de12e59f0b60 Mon Sep 17 00:00:00 2001 +From c5c06ff0ad56d3b6ec013f352e3a60c28dd43467 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Sun, 6 Jun 2021 20:11:11 +0700 -Subject: [PATCH 02/37] os_linux: add android checks and fixes +Subject: [PATCH 02/41] os_linux: add android checks and fixes --- src/hotspot/os/linux/os_linux.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp -index a77476e21..c76b6f90a 100644 +index 5ebd57fb300..77057c1d39c 100644 --- a/src/hotspot/os/linux/os_linux.cpp +++ b/src/hotspot/os/linux/os_linux.cpp -@@ -138,7 +138,7 @@ +@@ -143,7 +143,7 @@ // for timer info max values which include all bits #define ALL_64_BITS CONST64(0xFFFFFFFFFFFFFFFF) @@ -20,7 +20,7 @@ index a77476e21..c76b6f90a 100644 // dlvsym is not a part of POSIX // and musl libc doesn't implement it. static void *dlvsym(void *handle, -@@ -573,6 +573,7 @@ extern "C" void breakpoint() { +@@ -582,6 +582,7 @@ void os::init_system_properties_values() { // detecting pthread library void os::Linux::libpthread_init() { @@ -28,7 +28,7 @@ index a77476e21..c76b6f90a 100644 // Save glibc and pthread version strings. #if !defined(_CS_GNU_LIBC_VERSION) || \ !defined(_CS_GNU_LIBPTHREAD_VERSION) -@@ -597,6 +598,9 @@ void os::Linux::libpthread_init() { +@@ -606,6 +607,9 @@ void os::Linux::libpthread_init() { confstr(_CS_GNU_LIBPTHREAD_VERSION, str, n); os::Linux::set_libpthread_version(str); #endif @@ -39,5 +39,5 @@ index a77476e21..c76b6f90a 100644 ///////////////////////////////////////////////////////////////////////////// -- -2.45.2 +2.50.0 diff --git a/packages/openjdk-21/0003-Define-sys-gettid-on-arm-and-aarch64.patch b/packages/openjdk-21/0003-Define-sys-gettid-on-arm-and-aarch64.patch index 5a59e4597f92f21..305563efcfdb8aa 100644 --- a/packages/openjdk-21/0003-Define-sys-gettid-on-arm-and-aarch64.patch +++ b/packages/openjdk-21/0003-Define-sys-gettid-on-arm-and-aarch64.patch @@ -1,17 +1,17 @@ -From 66538fbc0880ee4fe7121a426aeae6661df4e584 Mon Sep 17 00:00:00 2001 +From 4792a9c8a80a854707a45d1c326bc53e985b1571 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Mon, 7 Jun 2021 06:27:26 +0700 -Subject: [PATCH 03/37] Define sys gettid on arm and aarch64 +Subject: [PATCH 03/41] Define sys gettid on arm and aarch64 --- src/hotspot/os/linux/os_linux.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp -index c76b6f90a..93cdec6dd 100644 +index 77057c1d39c..04bee9e5ff3 100644 --- a/src/hotspot/os/linux/os_linux.cpp +++ b/src/hotspot/os/linux/os_linux.cpp -@@ -374,11 +374,11 @@ bool os::Linux::get_tick_information(CPUPerfTicks* pticks, int which_logical_cpu +@@ -394,11 +394,11 @@ bool os::Linux::get_tick_information(CPUPerfTicks* pticks, int which_logical_cpu } #ifndef SYS_gettid @@ -25,7 +25,7 @@ index c76b6f90a..93cdec6dd 100644 #define SYS_gettid 224 #else #ifdef __amd64__ -@@ -386,6 +386,8 @@ bool os::Linux::get_tick_information(CPUPerfTicks* pticks, int which_logical_cpu +@@ -406,6 +406,8 @@ bool os::Linux::get_tick_information(CPUPerfTicks* pticks, int which_logical_cpu #else #ifdef __sparc__ #define SYS_gettid 143 @@ -35,5 +35,5 @@ index c76b6f90a..93cdec6dd 100644 #error define gettid for the arch #endif -- -2.45.2 +2.50.0 diff --git a/packages/openjdk-21/0004-Disable-posix-print-uptime-overridden-by-linux.patch b/packages/openjdk-21/0004-Disable-posix-print-uptime-overridden-by-linux.patch index 302adaa8ec0d534..e51250d88df3265 100644 --- a/packages/openjdk-21/0004-Disable-posix-print-uptime-overridden-by-linux.patch +++ b/packages/openjdk-21/0004-Disable-posix-print-uptime-overridden-by-linux.patch @@ -1,17 +1,17 @@ -From 80861cb4a8a3a8a705d6d4b76aca6406e0cc54f7 Mon Sep 17 00:00:00 2001 +From daa941f61e7da80c98deef776c7b0f6e2b46963e Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Mon, 7 Jun 2021 08:05:09 +0700 -Subject: [PATCH 04/37] Disable posix print uptime (overridden by linux!) +Subject: [PATCH 04/41] Disable posix print uptime (overridden by linux!) --- src/hotspot/os/posix/os_posix.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/hotspot/os/posix/os_posix.cpp b/src/hotspot/os/posix/os_posix.cpp -index 893ca3a7b..7d42555c3 100644 +index 7f95560a19e..6bac1d4edc2 100644 --- a/src/hotspot/os/posix/os_posix.cpp +++ b/src/hotspot/os/posix/os_posix.cpp -@@ -74,7 +74,9 @@ +@@ -75,7 +75,9 @@ #include #include #include @@ -21,7 +21,7 @@ index 893ca3a7b..7d42555c3 100644 #ifdef __APPLE__ #include -@@ -453,6 +455,7 @@ void os::Posix::print_load_average(outputStream* st) { +@@ -466,6 +468,7 @@ void os::Posix::print_load_average(outputStream* st) { // unfortunately it does not work on macOS and Linux because the utx chain has no entry // for reboot at least on my test machines void os::Posix::print_uptime_info(outputStream* st) { @@ -29,7 +29,7 @@ index 893ca3a7b..7d42555c3 100644 int bootsec = -1; int currsec = time(nullptr); struct utmpx* ent; -@@ -467,6 +470,7 @@ void os::Posix::print_uptime_info(outputStream* st) { +@@ -480,6 +483,7 @@ void os::Posix::print_uptime_info(outputStream* st) { if (bootsec != -1) { os::print_dhm(st, "OS uptime:", (long) (currsec-bootsec)); } @@ -38,5 +38,5 @@ index 893ca3a7b..7d42555c3 100644 static void print_rlimit(outputStream* st, const char* msg, -- -2.45.2 +2.50.0 diff --git a/packages/openjdk-21/0005-android-prevent-build-of-libjsound-and-libsa.patch b/packages/openjdk-21/0005-android-prevent-build-of-libjsound-and-libsa.patch index 98291b06d732c9a..7f29eb4fa8bd3c7 100644 --- a/packages/openjdk-21/0005-android-prevent-build-of-libjsound-and-libsa.patch +++ b/packages/openjdk-21/0005-android-prevent-build-of-libjsound-and-libsa.patch @@ -1,7 +1,7 @@ -From c67ff2011d20ee7de29b34912a87ceaeeb8aa4c0 Mon Sep 17 00:00:00 2001 +From 511c74a42767a438af8489ab1d88d561b80a0498 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Fri, 3 Feb 2023 11:06:24 +0100 -Subject: [PATCH 05/37] android: prevent build of libjsound and libsa +Subject: [PATCH 05/41] android: prevent build of libjsound and libsa --- make/modules/java.desktop/Lib.gmk | 2 -- @@ -9,7 +9,7 @@ Subject: [PATCH 05/37] android: prevent build of libjsound and libsa 2 files changed, 4 deletions(-) diff --git a/make/modules/java.desktop/Lib.gmk b/make/modules/java.desktop/Lib.gmk -index be1ac3f1f..069c1b46d 100644 +index be1ac3f1fb8..069c1b46da6 100644 --- a/make/modules/java.desktop/Lib.gmk +++ b/make/modules/java.desktop/Lib.gmk @@ -76,8 +76,6 @@ ifeq ($(call isTargetOs, aix), false) @@ -22,10 +22,10 @@ index be1ac3f1f..069c1b46d 100644 ################################################################################ diff --git a/make/modules/jdk.hotspot.agent/Lib.gmk b/make/modules/jdk.hotspot.agent/Lib.gmk -index 478d199e5..54ee4b203 100644 +index d21c969c188..ca7a8988a2b 100644 --- a/make/modules/jdk.hotspot.agent/Lib.gmk +++ b/make/modules/jdk.hotspot.agent/Lib.gmk -@@ -76,6 +76,4 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBSA, \ +@@ -77,6 +77,4 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBSA, \ LIBS_windows := dbgeng.lib $(WIN_JAVA_LIB), \ )) @@ -33,5 +33,5 @@ index 478d199e5..54ee4b203 100644 - ################################################################################ -- -2.45.2 +2.50.0 diff --git a/packages/openjdk-21/0006-Link-against-system-libiconv.patch b/packages/openjdk-21/0006-Link-against-system-libiconv.patch index b22da54b3265cb7..58c76f019f9d85a 100644 --- a/packages/openjdk-21/0006-Link-against-system-libiconv.patch +++ b/packages/openjdk-21/0006-Link-against-system-libiconv.patch @@ -1,7 +1,7 @@ -From c6ec5202528ed923fb713607a69e51e9c504e6db Mon Sep 17 00:00:00 2001 +From b464de6f87da8c7d4d25a965ebf94ff963ba0b18 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Fri, 3 Feb 2023 11:09:10 +0100 -Subject: [PATCH 06/37] Link against system libiconv +Subject: [PATCH 06/41] Link against system libiconv --- make/modules/java.instrument/Lib.gmk | 2 +- @@ -9,7 +9,7 @@ Subject: [PATCH 06/37] Link against system libiconv 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/make/modules/java.instrument/Lib.gmk b/make/modules/java.instrument/Lib.gmk -index ae985b315..417e0d6a0 100644 +index ae985b3158f..417e0d6a049 100644 --- a/make/modules/java.instrument/Lib.gmk +++ b/make/modules/java.instrument/Lib.gmk @@ -48,7 +48,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBINSTRUMENT, \ @@ -22,7 +22,7 @@ index ae985b315..417e0d6a0 100644 LIBS_macosx := -ljli -liconv -framework Cocoa -framework Security \ -framework ApplicationServices, \ diff --git a/make/modules/jdk.jdwp.agent/Lib.gmk b/make/modules/jdk.jdwp.agent/Lib.gmk -index ba694f50e..9631bf239 100644 +index ba694f50e1b..9631bf239f7 100644 --- a/make/modules/jdk.jdwp.agent/Lib.gmk +++ b/make/modules/jdk.jdwp.agent/Lib.gmk @@ -64,7 +64,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJDWP, \ @@ -35,5 +35,5 @@ index ba694f50e..9631bf239 100644 LIBS_aix := -liconv, \ )) -- -2.45.2 +2.50.0 diff --git a/packages/openjdk-21/0007-aarch64_get_thread_helper-Thread-current.patch b/packages/openjdk-21/0007-aarch64_get_thread_helper-Thread-current.patch index d2bf9f8bc690676..dc22d58194e389b 100644 --- a/packages/openjdk-21/0007-aarch64_get_thread_helper-Thread-current.patch +++ b/packages/openjdk-21/0007-aarch64_get_thread_helper-Thread-current.patch @@ -1,7 +1,7 @@ -From 7542283e6c7c692bcbf6b415393d9e048a61ea13 Mon Sep 17 00:00:00 2001 +From 55c385abc94cfbc9e92ce089b3a17c9e1cfdf418 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Thu, 10 Jun 2021 08:45:16 +0700 -Subject: [PATCH 07/37] aarch64_get_thread_helper() -> Thread::current() +Subject: [PATCH 07/41] aarch64_get_thread_helper() -> Thread::current() Can't build for Android: @@ -13,7 +13,7 @@ clang90++: error: linker command failed with exit code 1 (use -v to see invocati 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/hotspot/os_cpu/linux_aarch64/javaThread_linux_aarch64.hpp b/src/hotspot/os_cpu/linux_aarch64/javaThread_linux_aarch64.hpp -index c6e012ecf..b19468fd0 100644 +index c6e012ecfdd..b19468fd0c4 100644 --- a/src/hotspot/os_cpu/linux_aarch64/javaThread_linux_aarch64.hpp +++ b/src/hotspot/os_cpu/linux_aarch64/javaThread_linux_aarch64.hpp @@ -47,6 +47,13 @@ private: @@ -32,5 +32,5 @@ index c6e012ecf..b19468fd0 100644 #endif // OS_CPU_LINUX_AARCH64_JAVATHREAD_LINUX_AARCH64_HPP -- -2.45.2 +2.50.0 diff --git a/packages/openjdk-21/0008-Remove-aarch64_get_thread_helper.patch b/packages/openjdk-21/0008-Remove-aarch64_get_thread_helper.patch index 43a598117c42f2e..1d21f44971818c9 100644 --- a/packages/openjdk-21/0008-Remove-aarch64_get_thread_helper.patch +++ b/packages/openjdk-21/0008-Remove-aarch64_get_thread_helper.patch @@ -1,7 +1,7 @@ -From 1da115f2c6906360f90ee93f017038e340663679 Mon Sep 17 00:00:00 2001 +From f92b331cd7a93e2aefb01f3234b5f15242b9d888 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Thu, 10 Jun 2021 08:46:35 +0700 -Subject: [PATCH 08/37] Remove aarch64_get_thread_helper() +Subject: [PATCH 08/41] Remove aarch64_get_thread_helper() See commit 6f407090fda1 ("aarch64_get_thread_helper() -> Thread::current()") for more details. @@ -10,7 +10,7 @@ Thread::current()") for more details. 1 file changed, 2 insertions(+) diff --git a/src/hotspot/os_cpu/linux_aarch64/threadLS_linux_aarch64.S b/src/hotspot/os_cpu/linux_aarch64/threadLS_linux_aarch64.S -index ac60d6aa9..0645f0e00 100644 +index ac60d6aa941..0645f0e005e 100644 --- a/src/hotspot/os_cpu/linux_aarch64/threadLS_linux_aarch64.S +++ b/src/hotspot/os_cpu/linux_aarch64/threadLS_linux_aarch64.S @@ -19,6 +19,7 @@ @@ -27,5 +27,5 @@ index ac60d6aa9..0645f0e00 100644 .size _ZN10JavaThread25aarch64_get_thread_helperEv, .-_ZN10JavaThread25aarch64_get_thread_helperEv +#endif -- -2.45.2 +2.50.0 diff --git a/packages/openjdk-21/0009-Use-Android-s-strerror_r.patch b/packages/openjdk-21/0009-Use-Android-s-strerror_r.patch index 6b195c5b266bd9f..9ad867b4457d328 100644 --- a/packages/openjdk-21/0009-Use-Android-s-strerror_r.patch +++ b/packages/openjdk-21/0009-Use-Android-s-strerror_r.patch @@ -1,14 +1,14 @@ -From 13a958a7686ad1a813f5b2f56b11351db64d2d98 Mon Sep 17 00:00:00 2001 +From a832c53829edff3a34ad7c63ad451f9a479d429d Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Thu, 10 Jun 2021 09:36:26 +0700 -Subject: [PATCH 09/37] Use Android's strerror_r() +Subject: [PATCH 09/41] Use Android's strerror_r() --- src/java.base/unix/native/libjava/jni_util_md.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/java.base/unix/native/libjava/jni_util_md.c b/src/java.base/unix/native/libjava/jni_util_md.c -index 32b477aa7..06d5501a8 100644 +index 32b477aa7ac..06d5501a807 100644 --- a/src/java.base/unix/native/libjava/jni_util_md.c +++ b/src/java.base/unix/native/libjava/jni_util_md.c @@ -31,13 +31,6 @@ @@ -26,5 +26,5 @@ index 32b477aa7..06d5501a8 100644 static void *procHandle = NULL; if (procHandle != NULL) { -- -2.45.2 +2.50.0 diff --git a/packages/openjdk-21/0010-Use-utimensat-on-android.patch b/packages/openjdk-21/0010-Use-utimensat-on-android.patch index 0d9529b7227b306..9e42e1e1d0d1561 100644 --- a/packages/openjdk-21/0010-Use-utimensat-on-android.patch +++ b/packages/openjdk-21/0010-Use-utimensat-on-android.patch @@ -1,17 +1,17 @@ -From 0412a6599ff0555aa5ab2fd8f28cf4ab7ed05e47 Mon Sep 17 00:00:00 2001 +From bc9f7a9d77eafc4345421a9b7c3d188b82a881dd Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Thu, 10 Jun 2021 16:42:56 +0700 -Subject: [PATCH 10/37] Use utimensat on android +Subject: [PATCH 10/41] Use utimensat on android --- .../native/libnio/fs/UnixNativeDispatcher.c | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c b/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c -index 90c0a52d7..76ab034bb 100644 +index 9499bae2dcb..f97b4a2fa1d 100644 --- a/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c +++ b/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c -@@ -140,6 +140,7 @@ typedef int fstatat64_func(int, const char *, struct stat64 *, int); +@@ -237,6 +237,7 @@ typedef int fstatat64_func(int, const char *, struct stat64 *, int); typedef int unlinkat_func(int, const char*, int); typedef int renameat_func(int, const char*, int, const char*); typedef int futimesat_func(int, const char *, const struct timeval *); @@ -19,7 +19,7 @@ index 90c0a52d7..76ab034bb 100644 typedef int futimens_func(int, const struct timespec *); typedef int lutimes_func(const char *, const struct timeval *); typedef DIR* fdopendir_func(int); -@@ -149,6 +150,7 @@ static fstatat64_func* my_fstatat64_func = NULL; +@@ -250,6 +251,7 @@ static fstatat64_func* my_fstatat64_func = NULL; static unlinkat_func* my_unlinkat_func = NULL; static renameat_func* my_renameat_func = NULL; static futimesat_func* my_futimesat_func = NULL; @@ -27,7 +27,7 @@ index 90c0a52d7..76ab034bb 100644 static futimens_func* my_futimens_func = NULL; static lutimes_func* my_lutimes_func = NULL; static fdopendir_func* my_fdopendir_func = NULL; -@@ -272,6 +274,9 @@ Java_sun_nio_fs_UnixNativeDispatcher_init(JNIEnv* env, jclass this) +@@ -387,6 +389,9 @@ Java_sun_nio_fs_UnixNativeDispatcher_init(JNIEnv* env, jclass this) #ifndef _ALLBSD_SOURCE my_futimesat_func = (futimesat_func*) dlsym(RTLD_DEFAULT, "futimesat"); my_lutimes_func = (lutimes_func*) dlsym(RTLD_DEFAULT, "lutimes"); @@ -37,7 +37,7 @@ index 90c0a52d7..76ab034bb 100644 #endif my_futimens_func = (futimens_func*) dlsym(RTLD_DEFAULT, "futimens"); #if defined(_AIX) -@@ -292,7 +297,7 @@ Java_sun_nio_fs_UnixNativeDispatcher_init(JNIEnv* env, jclass this) +@@ -407,7 +412,7 @@ Java_sun_nio_fs_UnixNativeDispatcher_init(JNIEnv* env, jclass this) capabilities |= sun_nio_fs_UnixNativeDispatcher_SUPPORTS_FUTIMES; capabilities |= sun_nio_fs_UnixNativeDispatcher_SUPPORTS_LUTIMES; #else @@ -46,7 +46,7 @@ index 90c0a52d7..76ab034bb 100644 capabilities |= sun_nio_fs_UnixNativeDispatcher_SUPPORTS_FUTIMES; if (my_lutimes_func != NULL) capabilities |= sun_nio_fs_UnixNativeDispatcher_SUPPORTS_LUTIMES; -@@ -304,7 +309,7 @@ Java_sun_nio_fs_UnixNativeDispatcher_init(JNIEnv* env, jclass this) +@@ -419,7 +424,7 @@ Java_sun_nio_fs_UnixNativeDispatcher_init(JNIEnv* env, jclass this) if (my_openat64_func != NULL && my_fstatat64_func != NULL && my_unlinkat_func != NULL && my_renameat_func != NULL && @@ -55,7 +55,7 @@ index 90c0a52d7..76ab034bb 100644 { capabilities |= sun_nio_fs_UnixNativeDispatcher_SUPPORTS_OPENAT; } -@@ -683,14 +688,21 @@ Java_sun_nio_fs_UnixNativeDispatcher_futimes0(JNIEnv* env, jclass this, jint fil +@@ -919,14 +924,21 @@ Java_sun_nio_fs_UnixNativeDispatcher_futimes0(JNIEnv* env, jclass this, jint fil times[1].tv_sec = modificationTime / 1000000; times[1].tv_usec = modificationTime % 1000000; @@ -81,5 +81,5 @@ index 90c0a52d7..76ab034bb 100644 if (err == -1) { throwUnixException(env, errno); -- -2.45.2 +2.50.0 diff --git a/packages/openjdk-21/0011-Fixed-Java_sun_nio_fs_UnixNativeDispatcher_futimes.patch b/packages/openjdk-21/0011-Fixed-Java_sun_nio_fs_UnixNativeDispatcher_futimes.patch index 248f14c15a74c1f..6b111f043f1ced8 100644 --- a/packages/openjdk-21/0011-Fixed-Java_sun_nio_fs_UnixNativeDispatcher_futimes.patch +++ b/packages/openjdk-21/0011-Fixed-Java_sun_nio_fs_UnixNativeDispatcher_futimes.patch @@ -1,17 +1,17 @@ -From ca4e4fe34d2262bf39d04be993fa08d25aeb1a7b Mon Sep 17 00:00:00 2001 +From 0d135aacba52a406e146d232fc402cbfeaa9228e Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Thu, 10 Jun 2021 18:36:56 +0700 -Subject: [PATCH 11/37] Fixed Java_sun_nio_fs_UnixNativeDispatcher_futimes +Subject: [PATCH 11/41] Fixed Java_sun_nio_fs_UnixNativeDispatcher_futimes --- .../unix/native/libnio/fs/UnixNativeDispatcher.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c b/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c -index 76ab034bb..973870f9c 100644 +index f97b4a2fa1d..e470bbc4e03 100644 --- a/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c +++ b/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c -@@ -680,16 +680,17 @@ Java_sun_nio_fs_UnixNativeDispatcher_futimes0(JNIEnv* env, jclass this, jint fil +@@ -916,16 +916,17 @@ Java_sun_nio_fs_UnixNativeDispatcher_futimes0(JNIEnv* env, jclass this, jint fil jlong accessTime, jlong modificationTime) { struct timeval times[2]; @@ -33,7 +33,7 @@ index 76ab034bb..973870f9c 100644 #ifdef _ALLBSD_SOURCE RESTARTABLE(futimes(filedes, ×[0]), err); -@@ -701,7 +702,7 @@ Java_sun_nio_fs_UnixNativeDispatcher_futimes0(JNIEnv* env, jclass this, jint fil +@@ -937,7 +938,7 @@ Java_sun_nio_fs_UnixNativeDispatcher_futimes0(JNIEnv* env, jclass this, jint fil if (my_futimesat_func != NULL) { RESTARTABLE((*my_futimesat_func)(filedes, NULL, ×[0]), err); } else { @@ -43,5 +43,5 @@ index 76ab034bb..973870f9c 100644 #endif if (err == -1) { -- -2.45.2 +2.50.0 diff --git a/packages/openjdk-21/0012-Add-CXXFLAGS_JDKLIB-to-CXXFLAGS.patch b/packages/openjdk-21/0012-Add-CXXFLAGS_JDKLIB-to-CXXFLAGS.patch index 941ad886cd2e083..102516dcd289e23 100644 --- a/packages/openjdk-21/0012-Add-CXXFLAGS_JDKLIB-to-CXXFLAGS.patch +++ b/packages/openjdk-21/0012-Add-CXXFLAGS_JDKLIB-to-CXXFLAGS.patch @@ -1,7 +1,7 @@ -From e87e1978d2463dfdd4b123e62dafabe94fad9767 Mon Sep 17 00:00:00 2001 +From a35c17767b0228a062b6353dd8e3c695942d3e70 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Thu, 10 Jun 2021 19:23:03 +0700 -Subject: [PATCH 12/37] Add CXXFLAGS_JDKLIB to CXXFLAGS +Subject: [PATCH 12/41] Add CXXFLAGS_JDKLIB to CXXFLAGS For modules jdk.jdwp.agent and java.instrument. --- @@ -10,7 +10,7 @@ For modules jdk.jdwp.agent and java.instrument. 2 files changed, 2 insertions(+) diff --git a/make/modules/java.instrument/Lib.gmk b/make/modules/java.instrument/Lib.gmk -index 417e0d6a0..73a937854 100644 +index 417e0d6a049..73a937854d4 100644 --- a/make/modules/java.instrument/Lib.gmk +++ b/make/modules/java.instrument/Lib.gmk @@ -39,6 +39,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBINSTRUMENT, \ @@ -22,17 +22,17 @@ index 417e0d6a0..73a937854 100644 LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN) \ diff --git a/make/modules/jdk.jdwp.agent/Lib.gmk b/make/modules/jdk.jdwp.agent/Lib.gmk -index 9631bf239..ae889b6f5 100644 +index 9631bf239f7..ae889b6f582 100644 --- a/make/modules/jdk.jdwp.agent/Lib.gmk +++ b/make/modules/jdk.jdwp.agent/Lib.gmk -@@ -59,6 +59,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJDWP, \ +@@ -58,6 +58,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJDWP, \ + DISABLED_WARNINGS_clang_EventRequestImpl.c := self-assign, \ DISABLED_WARNINGS_clang_inStream.c := sometimes-uninitialized, \ DISABLED_WARNINGS_clang_log_messages.c := format-nonliteral, \ - DISABLED_WARNINGS_microsoft_debugInit.c := 5287, \ + CXXFLAGS := $(CXXFLAGS_JDKLIB), \ EXTRA_HEADER_DIRS := \ include \ libjdwp/export, \ -- -2.45.2 +2.50.0 diff --git a/packages/openjdk-21/0013-Use-ASCII-codeset-on-android.patch b/packages/openjdk-21/0013-Use-ASCII-codeset-on-android.patch index bc1f20fff5db894..1f79f40d1c34a79 100644 --- a/packages/openjdk-21/0013-Use-ASCII-codeset-on-android.patch +++ b/packages/openjdk-21/0013-Use-ASCII-codeset-on-android.patch @@ -1,7 +1,7 @@ -From a1b9ba285d928522eacf26a5c8dbe77a784f4dea Mon Sep 17 00:00:00 2001 +From 10e8861d94c2656e68825f2c9c6bd449f68d66ab Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Thu, 10 Jun 2021 20:42:40 +0700 -Subject: [PATCH 13/37] Use ASCII codeset on android +Subject: [PATCH 13/41] Use ASCII codeset on android Since android's locale support is very rudimentary. --- @@ -10,7 +10,7 @@ Since android's locale support is very rudimentary. 2 files changed, 8 insertions(+) diff --git a/src/java.instrument/unix/native/libinstrument/EncodingSupport_md.c b/src/java.instrument/unix/native/libinstrument/EncodingSupport_md.c -index 490eea9a5..27ee1c23e 100644 +index 490eea9a5ac..27ee1c23e45 100644 --- a/src/java.instrument/unix/native/libinstrument/EncodingSupport_md.c +++ b/src/java.instrument/unix/native/libinstrument/EncodingSupport_md.c @@ -65,7 +65,11 @@ utfInitialize(void) @@ -26,7 +26,7 @@ index 490eea9a5..27ee1c23e 100644 UTF_DEBUG(("NO codeset returned by nl_langinfo(CODESET)\n")); return; diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/utf_util.c b/src/jdk.jdwp.agent/share/native/libjdwp/utf_util.c -index f5573930d..b64e30046 100644 +index f5573930d34..b64e30046d3 100644 --- a/src/jdk.jdwp.agent/share/native/libjdwp/utf_util.c +++ b/src/jdk.jdwp.agent/share/native/libjdwp/utf_util.c @@ -483,7 +483,11 @@ static int iconvConvert(conv_direction drn, char *bytes, size_t len, char *outpu @@ -42,5 +42,5 @@ index f5573930d..b64e30046 100644 if (codeset == NULL) { -- -2.45.2 +2.50.0 diff --git a/packages/openjdk-21/0014-Fix-libjvm.so-path-when-run-from-Android-app.patch b/packages/openjdk-21/0014-Fix-libjvm.so-path-when-run-from-Android-app.patch index bd8e4954b9ed378..9a535273ca1f3c8 100644 --- a/packages/openjdk-21/0014-Fix-libjvm.so-path-when-run-from-Android-app.patch +++ b/packages/openjdk-21/0014-Fix-libjvm.so-path-when-run-from-Android-app.patch @@ -1,17 +1,17 @@ -From 71f950a52f92029135ce60b8783de3d60c13d6ae Mon Sep 17 00:00:00 2001 +From ba9d61796887a2238dcf9843d4e7d1810dc35deb Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Fri, 11 Jun 2021 07:48:28 +0700 -Subject: [PATCH 14/37] Fix libjvm.so path when run from Android app +Subject: [PATCH 14/41] Fix libjvm.so path when run from Android app --- src/java.base/unix/native/libjli/java_md.c | 49 ++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/src/java.base/unix/native/libjli/java_md.c b/src/java.base/unix/native/libjli/java_md.c -index 024cec571..d11a921f1 100644 +index d2c04d8c25d..ba600daddec 100644 --- a/src/java.base/unix/native/libjli/java_md.c +++ b/src/java.base/unix/native/libjli/java_md.c -@@ -594,6 +594,55 @@ SetExecname(char **argv) +@@ -586,6 +586,55 @@ SetExecname(char **argv) exec_path = JLI_StringDup(buf); } } @@ -68,5 +68,5 @@ index 024cec571..d11a921f1 100644 { /* Not implemented */ -- -2.45.2 +2.50.0 diff --git a/packages/openjdk-21/0015-arm-cast-address-to-char-when-clearing-cache.patch b/packages/openjdk-21/0015-arm-cast-address-to-char-when-clearing-cache.patch index b768de5316a0b1c..aa21a5c58a19057 100644 --- a/packages/openjdk-21/0015-arm-cast-address-to-char-when-clearing-cache.patch +++ b/packages/openjdk-21/0015-arm-cast-address-to-char-when-clearing-cache.patch @@ -1,14 +1,14 @@ -From 8f05a76a76877f4c4e30807e1325f837b5e15a36 Mon Sep 17 00:00:00 2001 +From 77578ca9c214819ade267c018a14d2e0c0cfd11c Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Sat, 12 Jun 2021 06:55:18 +0700 -Subject: [PATCH 15/37] arm: cast address to char when clearing cache +Subject: [PATCH 15/41] arm: cast address to char when clearing cache --- src/hotspot/cpu/arm/icache_arm.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hotspot/cpu/arm/icache_arm.cpp b/src/hotspot/cpu/arm/icache_arm.cpp -index 61fcb8a35..93d2ad4f4 100644 +index 61fcb8a3580..93d2ad4f494 100644 --- a/src/hotspot/cpu/arm/icache_arm.cpp +++ b/src/hotspot/cpu/arm/icache_arm.cpp @@ -31,7 +31,7 @@ @@ -21,5 +21,5 @@ index 61fcb8a35..93d2ad4f4 100644 } -- -2.45.2 +2.50.0 diff --git a/packages/openjdk-21/0016-Don-t-run-fpu_control-related-functions-on-Android.patch b/packages/openjdk-21/0016-Don-t-run-fpu_control-related-functions-on-Android.patch index ff6c6d2cdc4a874..ad825f54edbb0f9 100644 --- a/packages/openjdk-21/0016-Don-t-run-fpu_control-related-functions-on-Android.patch +++ b/packages/openjdk-21/0016-Don-t-run-fpu_control-related-functions-on-Android.patch @@ -1,7 +1,7 @@ -From a0a394b9d96eb54b205b49fc6c3fefb97711555f Mon Sep 17 00:00:00 2001 +From c75f58fe006c640e9704983a2689e51bb3eee1e9 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Sat, 12 Jun 2021 06:58:20 +0700 -Subject: [PATCH 16/37] Don't run fpu_control related functions on Android +Subject: [PATCH 16/41] Don't run fpu_control related functions on Android --- src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp | 2 ++ @@ -9,7 +9,7 @@ Subject: [PATCH 16/37] Don't run fpu_control related functions on Android 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp b/src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp -index 3bbe93fe7..fc63deb13 100644 +index 3726aca8a5d..046e5e3eca5 100644 --- a/src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp +++ b/src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp @@ -72,7 +72,9 @@ @@ -23,7 +23,7 @@ index 3bbe93fe7..fc63deb13 100644 #define SPELL_REG_SP "sp" 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 930cf3f26..bb320cf6d 100644 +index 30d546508e2..c912e8d122c 100644 --- a/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp +++ b/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp @@ -74,7 +74,7 @@ @@ -61,7 +61,7 @@ index 930cf3f26..bb320cf6d 100644 _FPU_SETCW(fpu_control); #endif // !AMD64 } -@@ -623,7 +623,7 @@ void os::print_register_info(outputStream *st, const void *context, int& continu +@@ -621,7 +621,7 @@ void os::print_register_info(outputStream *st, const void *context, int& continu } void os::setup_fpu() { @@ -71,5 +71,5 @@ index 930cf3f26..bb320cf6d 100644 __asm__ volatile ( "fldcw (%0)" : : "r" (fpu_cntrl) : "memory"); -- -2.45.2 +2.50.0 diff --git a/packages/openjdk-21/0017-Libfontmanager-link-against-libawt-to-fix-link-error.patch b/packages/openjdk-21/0017-Libfontmanager-link-against-libawt-to-fix-link-error.patch index aab093585ad1755..257552ed57a3219 100644 --- a/packages/openjdk-21/0017-Libfontmanager-link-against-libawt-to-fix-link-error.patch +++ b/packages/openjdk-21/0017-Libfontmanager-link-against-libawt-to-fix-link-error.patch @@ -1,7 +1,7 @@ -From d22c78d7799d85bd1ce40cac3adb2838eca8cf26 Mon Sep 17 00:00:00 2001 +From 2251e288212f39b2dec98d62d866e3bb184dd853 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Sat, 12 Jun 2021 17:03:05 +0700 -Subject: [PATCH 17/37] Libfontmanager: link against libawt to fix link error +Subject: [PATCH 17/41] Libfontmanager: link against libawt to fix link error Partly based on commit from androidports: https://github.com/androidports/openjdk/commit/a3e4f0281154537f01c2e59286a6ceed9c827b11 @@ -10,10 +10,10 @@ https://github.com/androidports/openjdk/commit/a3e4f0281154537f01c2e59286a6ceed9 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/make/modules/java.desktop/lib/Awt2dLibraries.gmk b/make/modules/java.desktop/lib/Awt2dLibraries.gmk -index 62b4477b8..abe1be54a 100644 +index f0c92ee094f..64942a85aa4 100644 --- a/make/modules/java.desktop/lib/Awt2dLibraries.gmk +++ b/make/modules/java.desktop/lib/Awt2dLibraries.gmk -@@ -542,13 +542,13 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBFONTMANAGER, \ +@@ -563,13 +563,13 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBFONTMANAGER, \ LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \ LDFLAGS_aix := -Wl$(COMMA)-berok, \ LIBS := $(BUILD_LIBFONTMANAGER_FONTLIB), \ @@ -30,5 +30,5 @@ index 62b4477b8..abe1be54a 100644 ifeq ($(call isTargetOs, macosx), true) $(BUILD_LIBFONTMANAGER): $(call FindLib, $(MODULE), awt_lwawt) -- -2.45.2 +2.50.0 diff --git a/packages/openjdk-21/0018-Try-to-get-libjvm.so-path-from-proc-self-maps-on-and.patch b/packages/openjdk-21/0018-Try-to-get-libjvm.so-path-from-proc-self-maps-on-and.patch index dcac9ba8c78c437..fe78100f7d867a4 100644 --- a/packages/openjdk-21/0018-Try-to-get-libjvm.so-path-from-proc-self-maps-on-and.patch +++ b/packages/openjdk-21/0018-Try-to-get-libjvm.so-path-from-proc-self-maps-on-and.patch @@ -1,7 +1,7 @@ -From aba494431b806f8414a7139334a21348f227cec7 Mon Sep 17 00:00:00 2001 +From ebe7bef9eaba9a1da97a90fcae8e60054574c245 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Fri, 25 Jun 2021 17:19:24 +0700 -Subject: [PATCH 18/37] Try to get libjvm.so path from /proc/self/maps on +Subject: [PATCH 18/41] Try to get libjvm.so path from /proc/self/maps on android --- @@ -9,10 +9,10 @@ Subject: [PATCH 18/37] Try to get libjvm.so path from /proc/self/maps on 1 file changed, 44 insertions(+) diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp -index 93cdec6dd..c8fb1f10c 100644 +index 04bee9e5ff3..25ad8934d4e 100644 --- a/src/hotspot/os/linux/os_linux.cpp +++ b/src/hotspot/os/linux/os_linux.cpp -@@ -217,6 +217,8 @@ static int clock_tics_per_sec = 100; +@@ -221,6 +221,8 @@ static int clock_tics_per_sec = 100; // avoid this static bool suppress_primordial_thread_resolution = false; @@ -21,7 +21,7 @@ index 93cdec6dd..c8fb1f10c 100644 // utility functions julong os::Linux::available_memory_in_container() { -@@ -1498,6 +1500,34 @@ bool os::dll_address_to_library_name(address addr, char* buf, +@@ -1534,6 +1536,34 @@ bool os::dll_address_to_library_name(address addr, char* buf, return false; } @@ -56,7 +56,7 @@ index 93cdec6dd..c8fb1f10c 100644 // Remember the stack's state. The Linux dynamic linker will change // the stack to 'executable' at most once, so we must safepoint only once. bool os::Linux::_stack_is_executable = false; -@@ -2595,6 +2625,19 @@ void os::jvm_path(char *buf, jint buflen) { +@@ -2664,6 +2694,19 @@ void os::jvm_path(char *buf, jint buflen) { CAST_FROM_FN_PTR(address, os::jvm_path), dli_fname, sizeof(dli_fname), nullptr); assert(ret, "cannot locate libjvm"); @@ -76,7 +76,7 @@ index 93cdec6dd..c8fb1f10c 100644 char *rp = nullptr; if (ret && dli_fname[0] != '\0') { rp = os::Posix::realpath(dli_fname, buf, buflen); -@@ -2660,6 +2703,7 @@ void os::jvm_path(char *buf, jint buflen) { +@@ -2729,6 +2772,7 @@ void os::jvm_path(char *buf, jint buflen) { } } } @@ -85,5 +85,5 @@ index 93cdec6dd..c8fb1f10c 100644 strncpy(saved_jvm_path, buf, MAXPATHLEN); saved_jvm_path[MAXPATHLEN - 1] = '\0'; -- -2.45.2 +2.50.0 diff --git a/packages/openjdk-21/0019-Warn-instead-of-exiting-if-getcpu-2-is-unsupported.patch b/packages/openjdk-21/0019-Warn-instead-of-exiting-if-getcpu-2-is-unsupported.patch index 9eba9f2772d1d61..7bfc49f852dd858 100644 --- a/packages/openjdk-21/0019-Warn-instead-of-exiting-if-getcpu-2-is-unsupported.patch +++ b/packages/openjdk-21/0019-Warn-instead-of-exiting-if-getcpu-2-is-unsupported.patch @@ -1,17 +1,17 @@ -From 58c60eede946cdd1dd334e719d52b25829138741 Mon Sep 17 00:00:00 2001 +From 85b2e41ce6a8908837328ba16bec032691086690 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Mon, 28 Jun 2021 17:47:31 +0700 -Subject: [PATCH 19/37] Warn instead of exiting if getcpu(2) is unsupported +Subject: [PATCH 19/41] Warn instead of exiting if getcpu(2) is unsupported --- src/hotspot/os/linux/os_linux.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp -index c8fb1f10c..fdc7aad3d 100644 +index 25ad8934d4e..45014f0b176 100644 --- a/src/hotspot/os/linux/os_linux.cpp +++ b/src/hotspot/os/linux/os_linux.cpp -@@ -3019,7 +3019,8 @@ void os::Linux::sched_getcpu_init() { +@@ -3134,7 +3134,8 @@ void os::Linux::sched_getcpu_init() { } if (sched_getcpu() == -1) { @@ -22,5 +22,5 @@ index c8fb1f10c..fdc7aad3d 100644 } -- -2.45.2 +2.50.0 diff --git a/packages/openjdk-21/0020-Remove-pre-UAL-aliases.patch b/packages/openjdk-21/0020-Remove-pre-UAL-aliases.patch index 03f93abaa874f72..2f2a2f9395245cf 100644 --- a/packages/openjdk-21/0020-Remove-pre-UAL-aliases.patch +++ b/packages/openjdk-21/0020-Remove-pre-UAL-aliases.patch @@ -1,14 +1,14 @@ -From 0d40424c10b8dbf94b5ffd6101faf7f25791dedb Mon Sep 17 00:00:00 2001 +From e0a685dc429b3cc40ec19c2e5e0c75b3bd737faa Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Wed, 30 Jun 2021 14:28:14 +0700 -Subject: [PATCH 20/37] Remove pre-UAL aliases +Subject: [PATCH 20/41] Remove pre-UAL aliases --- src/hotspot/os_cpu/linux_arm/linux_arm_32.S | 40 ++++++++++----------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/src/hotspot/os_cpu/linux_arm/linux_arm_32.S b/src/hotspot/os_cpu/linux_arm/linux_arm_32.S -index eb560d8f0..be8da136b 100644 +index eb560d8f0c7..be8da136ba2 100644 --- a/src/hotspot/os_cpu/linux_arm/linux_arm_32.S +++ b/src/hotspot/os_cpu/linux_arm/linux_arm_32.S @@ -88,7 +88,7 @@ dw_f2b_loop_32: @@ -132,5 +132,5 @@ index eb560d8f0..be8da136b 100644 cmp r2, #16 blt cl_b2f_copy_8 -- -2.45.2 +2.50.0 diff --git a/packages/openjdk-21/0021-arm-fix-assembly-in-os_linux_arm.cpp.patch b/packages/openjdk-21/0021-arm-fix-assembly-in-os_linux_arm.cpp.patch index d5249b8fbf6b80f..ac970f6e670de6a 100644 --- a/packages/openjdk-21/0021-arm-fix-assembly-in-os_linux_arm.cpp.patch +++ b/packages/openjdk-21/0021-arm-fix-assembly-in-os_linux_arm.cpp.patch @@ -1,17 +1,17 @@ -From 6ca44df2c8a0e3c48ccfd04e7520a87ba46112c5 Mon Sep 17 00:00:00 2001 +From 3ac9e292433c5a566cf833c68fc42bf40bea5848 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Wed, 30 Jun 2021 14:30:02 +0700 -Subject: [PATCH 21/37] arm: fix assembly in os_linux_arm.cpp +Subject: [PATCH 21/41] arm: fix assembly in os_linux_arm.cpp --- src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp b/src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp -index fc63deb13..ee7d1bbad 100644 +index 046e5e3eca5..c136e2981df 100644 --- a/src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp +++ b/src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp -@@ -417,8 +417,8 @@ void os::setup_fpu() { +@@ -435,8 +435,8 @@ void os::setup_fpu() { #if !defined(__SOFTFP__) && defined(__VFP_FP__) // Turn on IEEE-754 compliant VFP mode __asm__ volatile ( @@ -23,5 +23,5 @@ index fc63deb13..ee7d1bbad 100644 ); #endif -- -2.45.2 +2.50.0 diff --git a/packages/openjdk-21/0022-Add-workaround-for-tagged-pointers-on-Android-12.patch b/packages/openjdk-21/0022-Add-workaround-for-tagged-pointers-on-Android-12.patch index 5fdce14792f2a84..9dc02d54410711c 100644 --- a/packages/openjdk-21/0022-Add-workaround-for-tagged-pointers-on-Android-12.patch +++ b/packages/openjdk-21/0022-Add-workaround-for-tagged-pointers-on-Android-12.patch @@ -1,7 +1,7 @@ -From baa2fcecd9c29f7db40559e5b2757463805d8fe7 Mon Sep 17 00:00:00 2001 +From 0030babd8d4c0eeade2af3627aa070df686feb5c Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Fri, 3 Feb 2023 11:32:40 +0100 -Subject: [PATCH 22/37] Add workaround for tagged pointers on Android 12 +Subject: [PATCH 22/41] Add workaround for tagged pointers on Android 12 Co-authored-by: dev-bz <32380878+dev-bz@users.noreply.github.com> --- @@ -9,7 +9,7 @@ Co-authored-by: dev-bz <32380878+dev-bz@users.noreply.github.com> 1 file changed, 28 insertions(+) diff --git a/src/java.base/share/native/libjli/java.c b/src/java.base/share/native/libjli/java.c -index 3b4a15bac..514291c58 100644 +index 3b4a15bac5b..514291c5811 100644 --- a/src/java.base/share/native/libjli/java.c +++ b/src/java.base/share/native/libjli/java.c @@ -56,6 +56,32 @@ @@ -55,5 +55,5 @@ index 3b4a15bac..514291c58 100644 DumpState(); if (JLI_IsTraceLauncher()) { -- -2.45.2 +2.50.0 diff --git a/packages/openjdk-21/0023-x86-always-compile-with-PIC.patch b/packages/openjdk-21/0023-x86-always-compile-with-PIC.patch index a5aa2612c5b9b25..0c36be186166d73 100644 --- a/packages/openjdk-21/0023-x86-always-compile-with-PIC.patch +++ b/packages/openjdk-21/0023-x86-always-compile-with-PIC.patch @@ -1,14 +1,14 @@ -From 12e5079cd615e4bd3c8fa1b7d87909cc87f4aedb Mon Sep 17 00:00:00 2001 +From a12b0dcb1cc5c6ab8e40af3166d47ee044f2e653 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BA=AF=E6=B4=84?= <1840686745@qq.com> Date: Thu, 26 Aug 2021 14:00:54 +0800 -Subject: [PATCH 23/37] x86: always compile with PIC +Subject: [PATCH 23/41] x86: always compile with PIC --- make/hotspot/lib/JvmOverrideFiles.gmk | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/make/hotspot/lib/JvmOverrideFiles.gmk b/make/hotspot/lib/JvmOverrideFiles.gmk -index b50d6f8bb..a962649a9 100644 +index b50d6f8bb36..a962649a9ca 100644 --- a/make/hotspot/lib/JvmOverrideFiles.gmk +++ b/make/hotspot/lib/JvmOverrideFiles.gmk @@ -62,24 +62,6 @@ ifeq ($(call isTargetOs, linux), true) @@ -37,5 +37,5 @@ index b50d6f8bb..a962649a9 100644 # The copied fdlibm routines in these files must not be optimized BUILD_LIBJVM_sharedRuntimeTrig.cpp_CXXFLAGS := $(FDLIBM_CFLAGS) $(LIBJVM_FDLIBM_COPY_OPT_FLAG) -- -2.45.2 +2.50.0 diff --git a/packages/openjdk-21/0024-Fix-StackOverflowError-on-ARM.patch b/packages/openjdk-21/0024-Fix-StackOverflowError-on-ARM.patch index f5b99865da822cf..8ff8cc5effc0928 100644 --- a/packages/openjdk-21/0024-Fix-StackOverflowError-on-ARM.patch +++ b/packages/openjdk-21/0024-Fix-StackOverflowError-on-ARM.patch @@ -1,14 +1,14 @@ -From 5e010b218d6e4e8750aefef98222665fca3e5b5d Mon Sep 17 00:00:00 2001 +From 9b4a6ce8b7cc8f7627273e54e09c9d0cca8312af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BA=AF=E6=B4=84?= <1840686745@qq.com> Date: Thu, 26 Aug 2021 03:53:25 +0800 -Subject: [PATCH 24/37] Fix StackOverflowError on ARM +Subject: [PATCH 24/41] Fix StackOverflowError on ARM --- src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp b/src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp -index ee7d1bbad..42e7791ed 100644 +index c136e2981df..0358bb8739a 100644 --- a/src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp +++ b/src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp @@ -92,8 +92,14 @@ enum { @@ -27,5 +27,5 @@ index ee7d1bbad..42e7791ed 100644 char* os::non_memory_address_word() { -- -2.45.2 +2.50.0 diff --git a/packages/openjdk-21/0025-android-dlvsym-is-available-if-ANDROID_API-24.patch b/packages/openjdk-21/0025-android-dlvsym-is-available-if-ANDROID_API-24.patch index 5fdbd59d2269dac..5f8542f19ceae3c 100644 --- a/packages/openjdk-21/0025-android-dlvsym-is-available-if-ANDROID_API-24.patch +++ b/packages/openjdk-21/0025-android-dlvsym-is-available-if-ANDROID_API-24.patch @@ -1,17 +1,17 @@ -From 8d37569e6fb7419ce5736754b9f9968d14b7e087 Mon Sep 17 00:00:00 2001 +From fe01c8a84d50ee0a247ea3e9eef4baa99356659a Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Fri, 3 Feb 2023 11:50:57 +0100 -Subject: [PATCH 25/37] android: dlvsym is available if ANDROID_API >= 24 +Subject: [PATCH 25/41] android: dlvsym is available if ANDROID_API >= 24 --- src/hotspot/os/linux/os_linux.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp -index fdc7aad3d..05e258c87 100644 +index 45014f0b176..a753cb52221 100644 --- a/src/hotspot/os/linux/os_linux.cpp +++ b/src/hotspot/os/linux/os_linux.cpp -@@ -138,7 +138,7 @@ +@@ -143,7 +143,7 @@ // for timer info max values which include all bits #define ALL_64_BITS CONST64(0xFFFFFFFFFFFFFFFF) @@ -21,5 +21,5 @@ index fdc7aad3d..05e258c87 100644 // and musl libc doesn't implement it. static void *dlvsym(void *handle, -- -2.45.2 +2.50.0 diff --git a/packages/openjdk-21/0026-configure-do-not-require-alsa.patch b/packages/openjdk-21/0026-configure-do-not-require-alsa.patch index 72264119b210ed4..29ae3ece31354f4 100644 --- a/packages/openjdk-21/0026-configure-do-not-require-alsa.patch +++ b/packages/openjdk-21/0026-configure-do-not-require-alsa.patch @@ -1,7 +1,7 @@ -From e34eb60bf0131ee6b6dad462f0c2252e4ee87ae2 Mon Sep 17 00:00:00 2001 +From 58f917a53d23f4ed65c83b0d05f7edbff4830c5a Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Wed, 8 Feb 2023 15:36:25 +0100 -Subject: [PATCH 26/37] configure: do not require alsa +Subject: [PATCH 26/41] configure: do not require alsa Android, which counts as linux according to configure check, does not have alsa so we cannot use it. @@ -10,7 +10,7 @@ have alsa so we cannot use it. 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/make/autoconf/libraries.m4 b/make/autoconf/libraries.m4 -index a1fc81564..fc0356e92 100644 +index 51d4f724c33..cd8cda862dc 100644 --- a/make/autoconf/libraries.m4 +++ b/make/autoconf/libraries.m4 @@ -74,12 +74,7 @@ AC_DEFUN_ONCE([LIB_DETERMINE_DEPENDENCIES], @@ -28,5 +28,5 @@ index a1fc81564..fc0356e92 100644 # Check if ffi is needed if HOTSPOT_CHECK_JVM_VARIANT(zero) || test "x$ENABLE_FALLBACK_LINKER" = "xtrue"; then -- -2.45.2 +2.50.0 diff --git a/packages/openjdk-21/0027-Update-hardcoded-paths-to-work-in-termux.patch b/packages/openjdk-21/0027-Update-hardcoded-paths-to-work-in-termux.patch index 79029dceea48e03..95016b709a93aec 100644 --- a/packages/openjdk-21/0027-Update-hardcoded-paths-to-work-in-termux.patch +++ b/packages/openjdk-21/0027-Update-hardcoded-paths-to-work-in-termux.patch @@ -1,7 +1,7 @@ -From b3425e9b3a1919fd5ea8d427d8bc4a8a36a11e5f Mon Sep 17 00:00:00 2001 +From ad98be8113e5abc18d53b06e19277063dc62b6ff Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Tue, 6 Jul 2021 18:29:24 +0700 -Subject: [PATCH 27/37] Update hardcoded paths to work in termux +Subject: [PATCH 27/41] Update hardcoded paths to work in termux --- src/hotspot/os/linux/os_linux.cpp | 10 +++++-- @@ -24,18 +24,18 @@ Subject: [PATCH 27/37] Update hardcoded paths to work in termux .../util/prefs/FileSystemPreferences.java | 2 +- .../classes/sun/security/krb5/Config.java | 2 +- .../internal/ccache/FileCredentialsCache.java | 2 +- - .../security/smartcardio/PlatformPCSC.java | 6 ++-- + .../security/smartcardio/PlatformPCSC.java | 10 +++---- .../linux/native/libsaproc/symtab.c | 2 +- .../jpackage/internal/LinuxDebBundler.java | 6 ++-- .../internal/LinuxPackageBundler.java | 4 +-- .../internal/resources/desktop_utils.sh | 2 +- - 25 files changed, 73 insertions(+), 71 deletions(-) + 25 files changed, 75 insertions(+), 73 deletions(-) diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp -index 05e258c87..95f808a59 100644 +index a753cb52221..c44280ea2ef 100644 --- a/src/hotspot/os/linux/os_linux.cpp +++ b/src/hotspot/os/linux/os_linux.cpp -@@ -1428,7 +1428,13 @@ int os::current_process_id() { +@@ -1461,7 +1461,13 @@ int os::current_process_id() { // This must be hard coded because it's the system's temporary // directory not the java application's temp directory, ala java.io.tmpdir. @@ -50,7 +50,7 @@ index 05e258c87..95f808a59 100644 // check if addr is inside libjvm.so bool os::address_is_in_vm(address addr) { -@@ -2278,7 +2284,7 @@ void os::Linux::print_process_memory_info(outputStream* st) { +@@ -2347,7 +2353,7 @@ void os::Linux::print_process_memory_info(outputStream* st) { } bool os::Linux::print_ld_preload_file(outputStream* st) { @@ -60,7 +60,7 @@ index 05e258c87..95f808a59 100644 void os::Linux::print_uptime_info(outputStream* st) { diff --git a/src/hotspot/share/utilities/virtualizationSupport.cpp b/src/hotspot/share/utilities/virtualizationSupport.cpp -index f3031a958..321941838 100644 +index f3031a9582d..32194183856 100644 --- a/src/hotspot/share/utilities/virtualizationSupport.cpp +++ b/src/hotspot/share/utilities/virtualizationSupport.cpp @@ -52,7 +52,7 @@ void VirtualizationSupport::initialize() { @@ -73,7 +73,7 @@ index f3031a958..321941838 100644 #endif if (dlHandle == nullptr) { diff --git a/src/java.base/linux/classes/sun/nio/fs/LinuxFileSystem.java b/src/java.base/linux/classes/sun/nio/fs/LinuxFileSystem.java -index 44e957f54..ddbb02b53 100644 +index 44e957f54fb..ddbb02b53e5 100644 --- a/src/java.base/linux/classes/sun/nio/fs/LinuxFileSystem.java +++ b/src/java.base/linux/classes/sun/nio/fs/LinuxFileSystem.java @@ -124,7 +124,7 @@ class LinuxFileSystem extends UnixFileSystem { @@ -86,7 +86,7 @@ index 44e957f54..ddbb02b53 100644 @Override diff --git a/src/java.base/linux/classes/sun/nio/fs/LinuxFileSystemProvider.java b/src/java.base/linux/classes/sun/nio/fs/LinuxFileSystemProvider.java -index a1c2aed4b..23c7df39c 100644 +index a1c2aed4bd2..23c7df39c31 100644 --- a/src/java.base/linux/classes/sun/nio/fs/LinuxFileSystemProvider.java +++ b/src/java.base/linux/classes/sun/nio/fs/LinuxFileSystemProvider.java @@ -104,7 +104,7 @@ class LinuxFileSystemProvider extends UnixFileSystemProvider { @@ -99,7 +99,7 @@ index a1c2aed4b..23c7df39c 100644 return chain(new MimeTypesFileTypeDetector(userMimeTypes), new MimeTypesFileTypeDetector(etcMimeTypes)); diff --git a/src/java.base/share/classes/sun/security/jca/ProviderConfig.java b/src/java.base/share/classes/sun/security/jca/ProviderConfig.java -index 06f5144e9..a2bb2dd3f 100644 +index 06f5144e9b2..a2bb2dd3f5b 100644 --- a/src/java.base/share/classes/sun/security/jca/ProviderConfig.java +++ b/src/java.base/share/classes/sun/security/jca/ProviderConfig.java @@ -98,7 +98,7 @@ final class ProviderConfig { @@ -112,7 +112,7 @@ index 06f5144e9..a2bb2dd3f 100644 return Boolean.FALSE; } diff --git a/src/java.base/unix/classes/sun/net/dns/ResolverConfigurationImpl.java b/src/java.base/unix/classes/sun/net/dns/ResolverConfigurationImpl.java -index 6074d323f..8fe76e41b 100644 +index 6074d323fa5..8fe76e41bb5 100644 --- a/src/java.base/unix/classes/sun/net/dns/ResolverConfigurationImpl.java +++ b/src/java.base/unix/classes/sun/net/dns/ResolverConfigurationImpl.java @@ -64,7 +64,7 @@ public final class ResolverConfigurationImpl @@ -125,7 +125,7 @@ index 6074d323f..8fe76e41b 100644 while ((line = in.readLine()) != null) { int maxvalues = maxperkeyword; diff --git a/src/java.base/unix/native/libjava/ProcessImpl_md.c b/src/java.base/unix/native/libjava/ProcessImpl_md.c -index 66c44956b..8f7d09bfa 100644 +index 5a3a5cd088a..e41fd8f9b2b 100644 --- a/src/java.base/unix/native/libjava/ProcessImpl_md.c +++ b/src/java.base/unix/native/libjava/ProcessImpl_md.c @@ -230,7 +230,7 @@ xmalloc(JNIEnv *env, size_t size) @@ -138,7 +138,7 @@ index 66c44956b..8f7d09bfa 100644 static const char* diff --git a/src/java.base/unix/native/libjava/TimeZone_md.c b/src/java.base/unix/native/libjava/TimeZone_md.c -index eaf00fa10..0e68b57b0 100644 +index eaf00fa1027..0e68b57b0b5 100644 --- a/src/java.base/unix/native/libjava/TimeZone_md.c +++ b/src/java.base/unix/native/libjava/TimeZone_md.c @@ -61,9 +61,9 @@ static char *isFileIdentical(char* buf, size_t size, char *pathname); @@ -155,7 +155,7 @@ index eaf00fa10..0e68b57b0 100644 static const char *SYS_INIT_FILE = "/etc/default/init"; static const char *ZONEINFO_DIR = "/usr/share/lib/zoneinfo"; diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java -index 295e47457..0d6dde233 100644 +index 295e474579b..0d6dde23338 100644 --- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java +++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java @@ -526,13 +526,10 @@ class Metacity implements SynthConstants { @@ -177,7 +177,7 @@ index 295e47457..0d6dde233 100644 URL themeDir = null; diff --git a/src/java.desktop/share/classes/com/sun/media/sound/SoftSynthesizer.java b/src/java.desktop/share/classes/com/sun/media/sound/SoftSynthesizer.java -index e951a6a65..930846978 100644 +index e951a6a6578..930846978a2 100644 --- a/src/java.desktop/share/classes/com/sun/media/sound/SoftSynthesizer.java +++ b/src/java.desktop/share/classes/com/sun/media/sound/SoftSynthesizer.java @@ -685,11 +685,11 @@ public final class SoftSynthesizer implements AudioSynthesizer, @@ -197,7 +197,7 @@ index e951a6a65..930846978 100644 /* diff --git a/src/java.desktop/share/classes/sun/font/SunFontManager.java b/src/java.desktop/share/classes/sun/font/SunFontManager.java -index f2e4e530b..1a506c29a 100644 +index f2e4e530b2e..1a506c29ab6 100644 --- a/src/java.desktop/share/classes/sun/font/SunFontManager.java +++ b/src/java.desktop/share/classes/sun/font/SunFontManager.java @@ -3406,7 +3406,7 @@ public abstract class SunFontManager implements FontSupport, FontManagerForSGE { @@ -210,7 +210,7 @@ index f2e4e530b..1a506c29a 100644 false, false); return null; diff --git a/src/java.desktop/share/classes/sun/print/PSPrinterJob.java b/src/java.desktop/share/classes/sun/print/PSPrinterJob.java -index b1c303ec1..616f96620 100644 +index b1c303ec1fe..616f966200a 100644 --- a/src/java.desktop/share/classes/sun/print/PSPrinterJob.java +++ b/src/java.desktop/share/classes/sun/print/PSPrinterJob.java @@ -1626,7 +1626,7 @@ public class PSPrinterJob extends RasterPrinterJob { @@ -232,7 +232,7 @@ index b1c303ec1..616f96620 100644 if ((pFlags & PRINTER) != 0) { execCmd[n++] = "-d" + printer; diff --git a/src/java.desktop/unix/classes/sun/awt/X11/MotifColorUtilities.java b/src/java.desktop/unix/classes/sun/awt/X11/MotifColorUtilities.java -index 664de4910..06eb6f9a3 100644 +index 664de49103f..06eb6f9a357 100644 --- a/src/java.desktop/unix/classes/sun/awt/X11/MotifColorUtilities.java +++ b/src/java.desktop/unix/classes/sun/awt/X11/MotifColorUtilities.java @@ -410,7 +410,7 @@ class MotifColorUtilities { @@ -245,7 +245,7 @@ index 664de4910..06eb6f9a3 100644 if (!pFile.exists()) { diff --git a/src/java.desktop/unix/classes/sun/print/PrintServiceLookupProvider.java b/src/java.desktop/unix/classes/sun/print/PrintServiceLookupProvider.java -index b38b36b8a..27f6ddd70 100644 +index b38b36b8a3e..27f6ddd7057 100644 --- a/src/java.desktop/unix/classes/sun/print/PrintServiceLookupProvider.java +++ b/src/java.desktop/unix/classes/sun/print/PrintServiceLookupProvider.java @@ -79,10 +79,10 @@ public class PrintServiceLookupProvider extends PrintServiceLookup @@ -336,7 +336,7 @@ index b38b36b8a..27f6ddd70 100644 cmd[2] = "env LC_ALL=C " + command; } else { diff --git a/src/java.desktop/unix/classes/sun/print/UnixPrintJob.java b/src/java.desktop/unix/classes/sun/print/UnixPrintJob.java -index 913c69e40..127161feb 100644 +index 913c69e40ee..127161feb4f 100644 --- a/src/java.desktop/unix/classes/sun/print/UnixPrintJob.java +++ b/src/java.desktop/unix/classes/sun/print/UnixPrintJob.java @@ -873,7 +873,7 @@ public class UnixPrintJob implements CancelablePrintJob { @@ -349,7 +349,7 @@ index 913c69e40..127161feb 100644 execCmd[n++] = "-P" + printer; } diff --git a/src/java.desktop/unix/classes/sun/print/UnixPrintService.java b/src/java.desktop/unix/classes/sun/print/UnixPrintService.java -index bbd8c6c9c..afc1c572f 100644 +index bbd8c6c9c78..afc1c572f95 100644 --- a/src/java.desktop/unix/classes/sun/print/UnixPrintService.java +++ b/src/java.desktop/unix/classes/sun/print/UnixPrintService.java @@ -228,7 +228,7 @@ public class UnixPrintService implements PrintService, AttributeUpdater, @@ -389,10 +389,10 @@ index bbd8c6c9c..afc1c572f 100644 // Remove headers and bogus entries added by remote printers. diff --git a/src/java.desktop/unix/native/common/awt/fontpath.c b/src/java.desktop/unix/native/common/awt/fontpath.c -index e64a9b051..64aed6dc9 100644 +index b270a3fc94d..fc145d0b829 100644 --- a/src/java.desktop/unix/native/common/awt/fontpath.c +++ b/src/java.desktop/unix/native/common/awt/fontpath.c -@@ -66,19 +66,18 @@ extern Display *awt_display; +@@ -62,19 +62,18 @@ extern Display *awt_display; * various flavors of Linux */ static char *fullLinuxFontPath[] = { @@ -425,7 +425,7 @@ index e64a9b051..64aed6dc9 100644 }; #elif defined(_AIX) diff --git a/src/java.prefs/unix/classes/java/util/prefs/FileSystemPreferences.java b/src/java.prefs/unix/classes/java/util/prefs/FileSystemPreferences.java -index 2a8947146..c549c9adc 100644 +index 2a894714666..c549c9adc5d 100644 --- a/src/java.prefs/unix/classes/java/util/prefs/FileSystemPreferences.java +++ b/src/java.prefs/unix/classes/java/util/prefs/FileSystemPreferences.java @@ -190,7 +190,7 @@ class FileSystemPreferences extends AbstractPreferences { @@ -438,7 +438,7 @@ index 2a8947146..c549c9adc 100644 new File(systemPrefsDirName, ".systemPrefs"); // Attempt to create root dir if it does not yet exist. diff --git a/src/java.security.jgss/share/classes/sun/security/krb5/Config.java b/src/java.security.jgss/share/classes/sun/security/krb5/Config.java -index b5601b9be..90f0f0539 100644 +index b5601b9bef1..90f0f0539c8 100644 --- a/src/java.security.jgss/share/classes/sun/security/krb5/Config.java +++ b/src/java.security.jgss/share/classes/sun/security/krb5/Config.java @@ -934,7 +934,7 @@ public class Config { @@ -450,9 +450,8 @@ index b5601b9be..90f0f0539 100644 } if (DEBUG) { System.out.println("Native config name: " + name); -# modified diff --git a/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java -index 0eac81511..4302f711e 100644 +index 0eac815118b..4302f711e78 100644 --- a/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java +++ b/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java @@ -578,7 +578,7 @@ public class FileCredentialsCache extends CredentialsCache @@ -465,11 +464,11 @@ index 0eac81511..4302f711e 100644 if (s1.length() >= 11) { if ((s1.substring(0, 11)).equalsIgnoreCase diff --git a/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java b/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java -index bacff32ef..ba4f7960c 100644 +index 10a27e7a1b2..b088d88a8d0 100644 --- a/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java +++ b/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java -@@ -49,11 +49,11 @@ - +@@ -49,11 +49,11 @@ class PlatformPCSC { + // The architecture templates are for Debian-based systems: https://wiki.debian.org/Multiarch/Tuples // 32-bit arm differs from the pattern of the rest and has to be specified explicitly - private static final String[] LIB_TEMPLATES = { "/usr/$LIBISA/libpcsclite.so", @@ -483,10 +482,10 @@ index bacff32ef..ba4f7960c 100644 + "@TERMUX_PREFIX@/lib/arm-linux-gnueabi/libpcsclite.so", + "@TERMUX_PREFIX@/lib/arm-linux-gnueabihf/libpcsclite.so" }; private static final String[] LIB_SUFFIXES = { ".1", ".0", "" }; - private static final String PCSC_FRAMEWORK = "/System/Library/Frameworks/PCSC.framework/Versions/Current/PCSC"; - + private static final String PCSC_FRAMEWORK = "/System/Library/Frameworks/PCSC.framework/Versions/Current/PCSC"; + diff --git a/src/jdk.hotspot.agent/linux/native/libsaproc/symtab.c b/src/jdk.hotspot.agent/linux/native/libsaproc/symtab.c -index d3b4d3d1a..86a38bb92 100644 +index 4cb791111bc..98918d7ee12 100644 --- a/src/jdk.hotspot.agent/linux/native/libsaproc/symtab.c +++ b/src/jdk.hotspot.agent/linux/native/libsaproc/symtab.c @@ -53,7 +53,7 @@ typedef struct symtab { @@ -499,10 +498,10 @@ index d3b4d3d1a..86a38bb92 100644 /* The CRC used in gnu_debuglink, retrieved from http://sourceware.org/gdb/current/onlinedocs/gdb/Separate-Debug-Files.html#Separate-Debug-Files. */ diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxDebBundler.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxDebBundler.java -index e97cfc90a..cb3b29c0c 100644 +index 478ec078797..4781874883b 100644 --- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxDebBundler.java +++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxDebBundler.java -@@ -422,7 +422,7 @@ public class LinuxDebBundler extends LinuxPackageBundler { +@@ -438,7 +438,7 @@ public class LinuxDebBundler extends LinuxPackageBundler { final String installDir = LINUX_INSTALL_DIR.fetchFrom(params); if (!StandardBundlerParam.isRuntimeInstaller(params) @@ -511,7 +510,7 @@ index e97cfc90a..cb3b29c0c 100644 debianFiles.add(new DebianFile( getConfig_CopyrightFile(params), "resource.copyright-file")); -@@ -459,8 +459,8 @@ public class LinuxDebBundler extends LinuxPackageBundler { +@@ -475,8 +475,8 @@ public class LinuxDebBundler extends LinuxPackageBundler { final String packageName = PACKAGE_NAME.fetchFrom(params); final Path installPath; @@ -523,7 +522,7 @@ index e97cfc90a..cb3b29c0c 100644 installPath = Path.of(installDir, packageName, "share/doc/copyright"); } diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackageBundler.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackageBundler.java -index 374f88878..ef5d2fbb0 100644 +index 374f88878e8..ef5d2fbb061 100644 --- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackageBundler.java +++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackageBundler.java @@ -337,7 +337,7 @@ abstract class LinuxPackageBundler extends AbstractBundler { @@ -545,7 +544,7 @@ index 374f88878..ef5d2fbb0 100644 (s, p) -> s ); diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/desktop_utils.sh b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/desktop_utils.sh -index 1ed960762..7673dc0e9 100644 +index 1ed96076282..7673dc0e9b4 100644 --- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/desktop_utils.sh +++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/desktop_utils.sh @@ -92,7 +92,7 @@ _uninstall_default_mime_handler () @@ -558,5 +557,5 @@ index 1ed960762..7673dc0e9 100644 done } -- -2.45.2 +2.50.0 diff --git a/packages/openjdk-21/0028-elfFile.hpp-no-need-to-define-ELF-32-64-_ST_TYPE-on-.patch b/packages/openjdk-21/0028-elfFile.hpp-no-need-to-define-ELF-32-64-_ST_TYPE-on-.patch index 39dfa3d1b0935c5..21f4d5b98cdb9a1 100644 --- a/packages/openjdk-21/0028-elfFile.hpp-no-need-to-define-ELF-32-64-_ST_TYPE-on-.patch +++ b/packages/openjdk-21/0028-elfFile.hpp-no-need-to-define-ELF-32-64-_ST_TYPE-on-.patch @@ -1,7 +1,7 @@ -From 6739fe17e247baa9de9362550876a51c2e5dadf1 Mon Sep 17 00:00:00 2001 +From baca0f0dbf59a745322376164c5260c3cca98585 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sat, 4 Feb 2023 22:45:13 +0100 -Subject: [PATCH 28/37] elfFile.hpp: no need to define ELF{32,64}_ST_TYPE on +Subject: [PATCH 28/41] elfFile.hpp: no need to define ELF{32,64}_ST_TYPE on android As the elf.h header already provides defintions. @@ -10,7 +10,7 @@ As the elf.h header already provides defintions. 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/hotspot/share/utilities/elfFile.hpp b/src/hotspot/share/utilities/elfFile.hpp -index bad92f82a..4ef2dd501 100644 +index 579837ebf80..ac13e345aee 100644 --- a/src/hotspot/share/utilities/elfFile.hpp +++ b/src/hotspot/share/utilities/elfFile.hpp @@ -46,7 +46,7 @@ typedef Elf64_Shdr Elf_Shdr; @@ -32,5 +32,5 @@ index bad92f82a..4ef2dd501 100644 #endif #endif -- -2.45.2 +2.50.0 diff --git a/packages/openjdk-21/0029-os-linux-add-getloadavg-implementation-for-android.patch b/packages/openjdk-21/0029-os-linux-add-getloadavg-implementation-for-android.patch index fb41cc111cff360..a3770198db49273 100644 --- a/packages/openjdk-21/0029-os-linux-add-getloadavg-implementation-for-android.patch +++ b/packages/openjdk-21/0029-os-linux-add-getloadavg-implementation-for-android.patch @@ -1,17 +1,17 @@ -From aea37453514b2fbb4dcd7d000e152e0f7cc9ceb8 Mon Sep 17 00:00:00 2001 +From ab54d1bd590a3642a28c161d0716a2429fa7d7af Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 5 Feb 2023 09:14:50 +0100 -Subject: [PATCH 29/37] os: linux: add getloadavg implementation for android +Subject: [PATCH 29/41] os: linux: add getloadavg implementation for android --- src/hotspot/os/linux/os_linux.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp -index 95f808a59..d8a460519 100644 +index c44280ea2ef..8c04f45c660 100644 --- a/src/hotspot/os/linux/os_linux.cpp +++ b/src/hotspot/os/linux/os_linux.cpp -@@ -5271,7 +5271,20 @@ bool os::is_thread_cpu_time_supported() { +@@ -5375,7 +5375,20 @@ bool os::is_thread_cpu_time_supported() { // Linux doesn't yet have a (official) notion of processor sets, // so just return the system wide load average. int os::loadavg(double loadavg[], int nelem) { @@ -33,5 +33,5 @@ index 95f808a59..d8a460519 100644 // Get the default path to the core file -- -2.45.2 +2.50.0 diff --git a/packages/openjdk-21/0030-os-linux-use-getpagesize-instad-of-SHMLBA.patch b/packages/openjdk-21/0030-os-linux-use-getpagesize-instad-of-SHMLBA.patch index 46a45ee68536981..1bf31f5972e1294 100644 --- a/packages/openjdk-21/0030-os-linux-use-getpagesize-instad-of-SHMLBA.patch +++ b/packages/openjdk-21/0030-os-linux-use-getpagesize-instad-of-SHMLBA.patch @@ -1,7 +1,7 @@ -From ea2a813e727738bb664bf5321097b5f7026feab5 Mon Sep 17 00:00:00 2001 +From 8ad67b00975085bb0d5713e20f4d188f18de830c Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 5 Feb 2023 09:21:57 +0100 -Subject: [PATCH 30/37] os: linux: use getpagesize() instad of SHMLBA +Subject: [PATCH 30/41] os: linux: use getpagesize() instad of SHMLBA Since the latter is not defined on android. --- @@ -9,10 +9,10 @@ Since the latter is not defined on android. 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp -index d8a460519..c41d459c1 100644 +index 8c04f45c660..f41a83ebeba 100644 --- a/src/hotspot/os/linux/os_linux.cpp +++ b/src/hotspot/os/linux/os_linux.cpp -@@ -3952,7 +3952,7 @@ void os::large_page_init() { +@@ -4063,7 +4063,7 @@ void os::large_page_init() { static char* shmat_with_alignment(int shmid, size_t bytes, size_t alignment) { assert(is_aligned(bytes, alignment), "Must be divisible by the alignment"); @@ -21,7 +21,7 @@ index d8a460519..c41d459c1 100644 assert(false, "Code below assumes that alignment is at least SHMLBA aligned"); return nullptr; } -@@ -3988,7 +3988,7 @@ static char* shmat_with_alignment(int shmid, size_t bytes, size_t alignment) { +@@ -4099,7 +4099,7 @@ static char* shmat_with_alignment(int shmid, size_t bytes, size_t alignment) { } static char* shmat_at_address(int shmid, char* req_addr) { @@ -31,5 +31,5 @@ index d8a460519..c41d459c1 100644 return nullptr; } -- -2.45.2 +2.50.0 diff --git a/packages/openjdk-21/0031-libjava-change-return-type-of-strerror_r.patch b/packages/openjdk-21/0031-libjava-change-return-type-of-strerror_r.patch index 825f45887f975c4..e7e684d71f3556d 100644 --- a/packages/openjdk-21/0031-libjava-change-return-type-of-strerror_r.patch +++ b/packages/openjdk-21/0031-libjava-change-return-type-of-strerror_r.patch @@ -1,7 +1,7 @@ -From c1638a8b8781450099c4421a50362b7f7f4d7b73 Mon Sep 17 00:00:00 2001 +From 90138bdd8b8940574335ca608fa599b070d34335 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 5 Feb 2023 11:47:24 +0100 -Subject: [PATCH 31/37] libjava: change return type of strerror_r +Subject: [PATCH 31/41] libjava: change return type of strerror_r Later versions of android uses the GNU style and returns a char pointer. Adjust jni function to match this. @@ -12,7 +12,7 @@ pointer. Adjust jni function to match this. 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/java.base/share/native/libjava/jni_util.h b/src/java.base/share/native/libjava/jni_util.h -index 238a20b18..3587b9348 100644 +index 238a20b18ea..3587b934874 100644 --- a/src/java.base/share/native/libjava/jni_util.h +++ b/src/java.base/share/native/libjava/jni_util.h @@ -360,7 +360,7 @@ void buildJniFunctionName(const char *sym, const char *cname, @@ -25,10 +25,10 @@ index 238a20b18..3587b9348 100644 #ifdef STATIC_BUILD diff --git a/src/java.base/unix/native/libjava/ProcessImpl_md.c b/src/java.base/unix/native/libjava/ProcessImpl_md.c -index 8f7d09bfa..588f41344 100644 +index e41fd8f9b2b..922ce0c3187 100644 --- a/src/java.base/unix/native/libjava/ProcessImpl_md.c +++ b/src/java.base/unix/native/libjava/ProcessImpl_md.c -@@ -325,10 +325,9 @@ throwIOException(JNIEnv *env, int errnum, const char *defaultDetail) +@@ -329,10 +329,9 @@ throwIOException(JNIEnv *env, int errnum, const char *defaultDetail) char tmpbuf[1024]; jstring s; @@ -43,7 +43,7 @@ index 8f7d09bfa..588f41344 100644 /* ASCII Decimal representation uses 2.4 times as many bits as binary. */ fmtsize = sizeof(IOE_FORMAT) + strlen(detail) + 3 * sizeof(errnum); diff --git a/src/java.base/unix/native/libjava/jni_util_md.c b/src/java.base/unix/native/libjava/jni_util_md.c -index 06d5501a8..a494ccc3c 100644 +index 06d5501a807..a494ccc3c38 100644 --- a/src/java.base/unix/native/libjava/jni_util_md.c +++ b/src/java.base/unix/native/libjava/jni_util_md.c @@ -62,7 +62,7 @@ getLastErrorString(JNIEnv *env) @@ -56,5 +56,5 @@ index 06d5501a8..a494ccc3c 100644 { if (err == 0 || len < 1) return 0; -- -2.45.2 +2.50.0 diff --git a/packages/openjdk-21/0032-make-cflags-handle-arm-like-other-arches.patch b/packages/openjdk-21/0032-make-cflags-handle-arm-like-other-arches.patch index ef21584297b415a..cdf7d0547c39d66 100644 --- a/packages/openjdk-21/0032-make-cflags-handle-arm-like-other-arches.patch +++ b/packages/openjdk-21/0032-make-cflags-handle-arm-like-other-arches.patch @@ -1,17 +1,17 @@ -From 75547149552c9027478ef5cc8b27adf729a1e1fc Mon Sep 17 00:00:00 2001 +From 1bfe90e6a5debb51ff2ec26540d9da0fa11799cc Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Mon, 13 Feb 2023 13:49:47 +0100 -Subject: [PATCH 32/37] make: cflags: handle arm like other arches +Subject: [PATCH 32/41] make: cflags: handle arm like other arches --- make/autoconf/flags-cflags.m4 | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/make/autoconf/flags-cflags.m4 b/make/autoconf/flags-cflags.m4 -index f8fbe14cc..4cfc77586 100644 +index 1aa827b6139..3b35d00795a 100644 --- a/make/autoconf/flags-cflags.m4 +++ b/make/autoconf/flags-cflags.m4 -@@ -66,13 +66,7 @@ AC_DEFUN([FLAGS_SETUP_SHARED_LIBS], +@@ -72,13 +72,7 @@ AC_DEFUN([FLAGS_SETUP_SHARED_LIBS], SET_SHARED_LIBRARY_NAME='-Wl,-soname=[$]1' SET_SHARED_LIBRARY_MAPFILE='-Wl,-version-script=[$]1' @@ -27,5 +27,5 @@ index f8fbe14cc..4cfc77586 100644 elif test "x$TOOLCHAIN_TYPE" = xxlc; then -- -2.45.2 +2.50.0 diff --git a/packages/openjdk-21/0033-Fix-bugs-in-File.getCanonicalPath.patch b/packages/openjdk-21/0033-Fix-bugs-in-File.getCanonicalPath.patch index f39aec9e4e8ff7b..77b6f896d13ed78 100644 --- a/packages/openjdk-21/0033-Fix-bugs-in-File.getCanonicalPath.patch +++ b/packages/openjdk-21/0033-Fix-bugs-in-File.getCanonicalPath.patch @@ -1,7 +1,7 @@ -From 9b8125e6a37d96cf96173e328416fc6a67831fb3 Mon Sep 17 00:00:00 2001 +From e63bff751a02be681aae543941f2451d84ed6810 Mon Sep 17 00:00:00 2001 From: agnostic-apollo Date: Thu, 28 Mar 2024 18:46:02 +0100 -Subject: [PATCH 33/37] Fix bugs in File.getCanonicalPath() +Subject: [PATCH 33/41] Fix bugs in File.getCanonicalPath() 1. If path length is `>= PATH_MAX` (4096) characters, return error. 2. If any path component length is `> NAME_MAX` (255) characters, return @@ -16,7 +16,7 @@ Subject: [PATCH 33/37] Fix bugs in File.getCanonicalPath() 2 files changed, 86 insertions(+), 14 deletions(-) diff --git a/src/java.base/unix/native/libjava/canonicalize_md.c b/src/java.base/unix/native/libjava/canonicalize_md.c -index 0585aa3bb..37d8be18a 100644 +index 0585aa3bbdf..37d8be18a6f 100644 --- a/src/java.base/unix/native/libjava/canonicalize_md.c +++ b/src/java.base/unix/native/libjava/canonicalize_md.c @@ -53,7 +53,7 @@ JDK_Canonicalize(const char *orig, char *out, int len) @@ -111,7 +111,7 @@ index 0585aa3bb..37d8be18a 100644 } } diff --git a/src/java.base/unix/native/libjava/path_util.c b/src/java.base/unix/native/libjava/path_util.c -index 1f2cdc46f..e2445ee30 100644 +index 1f2cdc46f0c..e2445ee30cd 100644 --- a/src/java.base/unix/native/libjava/path_util.c +++ b/src/java.base/unix/native/libjava/path_util.c @@ -28,9 +28,41 @@ @@ -216,5 +216,5 @@ index 1f2cdc46f..e2445ee30 100644 /* i will be incremented at the top of the loop */ } -- -2.45.2 +2.50.0 diff --git a/packages/openjdk-21/0034-JvmMapfile.gmk-filter-same-symbols-for-linux-and-and.patch b/packages/openjdk-21/0034-JvmMapfile.gmk-filter-same-symbols-for-linux-and-and.patch index 07de8a431878e20..ac013574aab8876 100644 --- a/packages/openjdk-21/0034-JvmMapfile.gmk-filter-same-symbols-for-linux-and-and.patch +++ b/packages/openjdk-21/0034-JvmMapfile.gmk-filter-same-symbols-for-linux-and-and.patch @@ -1,10 +1,7 @@ -# modified: -# - DUMP_SYMBOLS_CMD := $(NM) --defined-only *$(OBJ_SUFFIX) -# + DUMP_SYMBOLS_CMD := $(NM) $(NMFLAGS) --defined-only *$(OBJ_SUFFIX) -From b234acd243bf7b79e8ccdf63055785927de29ef4 Mon Sep 17 00:00:00 2001 +From d4e4c8406157b22070fe430c9edb7826549ddf3c Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Sat, 5 Jun 2021 17:25:37 +0700 -Subject: [PATCH 34/37] JvmMapfile.gmk: filter same symbols for linux and +Subject: [PATCH 34/41] JvmMapfile.gmk: filter same symbols for linux and android --- @@ -12,7 +9,7 @@ Subject: [PATCH 34/37] JvmMapfile.gmk: filter same symbols for linux and 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make/hotspot/lib/JvmMapfile.gmk b/make/hotspot/lib/JvmMapfile.gmk -index d80b804a2..fd2a8ed15 100644 +index 2808ac2af03..182b01a6bb4 100644 --- a/make/hotspot/lib/JvmMapfile.gmk +++ b/make/hotspot/lib/JvmMapfile.gmk @@ -52,7 +52,7 @@ endif @@ -25,5 +22,5 @@ index d80b804a2..fd2a8ed15 100644 ifneq ($(FILTER_SYMBOLS_PATTERN), ) FILTER_SYMBOLS_PATTERN := $(FILTER_SYMBOLS_PATTERN)| -- -2.45.2 +2.50.0 diff --git a/packages/openjdk-21/0035-Fix-build-with-lld-17.patch b/packages/openjdk-21/0035-Fix-build-with-lld-17.patch index a84c73f1b702e97..18d1c3da915a7bd 100644 --- a/packages/openjdk-21/0035-Fix-build-with-lld-17.patch +++ b/packages/openjdk-21/0035-Fix-build-with-lld-17.patch @@ -1,8 +1,7 @@ -# modified: see 0034 -From 7e4d301e96936507a34a2d7706ddf3274b206dc3 Mon Sep 17 00:00:00 2001 +From bc77cbbb84d0cc36f629149ecbdbed11e31e7f6a Mon Sep 17 00:00:00 2001 From: agnostic-apollo Date: Thu, 28 Mar 2024 18:52:49 +0100 -Subject: [PATCH 35/37] Fix build with lld 17 +Subject: [PATCH 35/41] Fix build with lld 17 Original Author: Dimitry Andric @@ -12,7 +11,7 @@ https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=274109 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make/hotspot/lib/JvmMapfile.gmk b/make/hotspot/lib/JvmMapfile.gmk -index fd2a8ed15..4c69ebf4f 100644 +index 182b01a6bb4..4da8076cb3f 100644 --- a/make/hotspot/lib/JvmMapfile.gmk +++ b/make/hotspot/lib/JvmMapfile.gmk @@ -53,7 +53,7 @@ endif @@ -25,5 +24,5 @@ index fd2a8ed15..4c69ebf4f 100644 FILTER_SYMBOLS_PATTERN := $(FILTER_SYMBOLS_PATTERN)| endif -- -2.45.2 +2.50.0 diff --git a/packages/openjdk-21/0036-make-autoconf-define-ARM-for-arm-build-with-clang.patch b/packages/openjdk-21/0036-make-autoconf-define-ARM-for-arm-build-with-clang.patch index e8dc15a28e1f080..ffd7d91fa1a828d 100644 --- a/packages/openjdk-21/0036-make-autoconf-define-ARM-for-arm-build-with-clang.patch +++ b/packages/openjdk-21/0036-make-autoconf-define-ARM-for-arm-build-with-clang.patch @@ -1,7 +1,7 @@ -From 06429af2ea014a40696c2937196c6474966a78d5 Mon Sep 17 00:00:00 2001 +From 747dc8d5c76ca1dc1fd0d98e356ae46609e73285 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 31 Mar 2024 12:02:51 +0200 -Subject: [PATCH 36/37] make: autoconf: define ARM for arm build with clang +Subject: [PATCH 36/41] make: autoconf: define ARM for arm build with clang Fixes error like @@ -15,10 +15,10 @@ gmake[2]: *** [make/Main.gmk:252: hotspot-server-libs] Error 2 1 file changed, 6 insertions(+) diff --git a/make/autoconf/flags-cflags.m4 b/make/autoconf/flags-cflags.m4 -index 4cfc77586..ab4811036 100644 +index 3b35d00795a..1b966e2706e 100644 --- a/make/autoconf/flags-cflags.m4 +++ b/make/autoconf/flags-cflags.m4 -@@ -769,6 +769,12 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP], +@@ -839,6 +839,12 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP], $1_CFLAGS_CPU="-mcpu=pwr8" fi @@ -32,5 +32,5 @@ index 4cfc77586..ab4811036 100644 if test "x$FLAGS_CPU" = xppc64; then $1_CFLAGS_CPU_JVM="-qarch=ppc64" -- -2.45.2 +2.50.0 diff --git a/packages/openjdk-21/0037-hotspot-os_linux-do-not-use-dlinfo-and-RTLD_DI_LINKM.patch b/packages/openjdk-21/0037-hotspot-os_linux-do-not-use-dlinfo-and-RTLD_DI_LINKM.patch index 8d48d7471765db2..6de39d793128b57 100644 --- a/packages/openjdk-21/0037-hotspot-os_linux-do-not-use-dlinfo-and-RTLD_DI_LINKM.patch +++ b/packages/openjdk-21/0037-hotspot-os_linux-do-not-use-dlinfo-and-RTLD_DI_LINKM.patch @@ -1,7 +1,7 @@ -From ac9a6de051aa1ffea5ea1ce843954cc2fbd67e69 Mon Sep 17 00:00:00 2001 +From a4ad553ba8fb9e5985c19036b6acc04df2ffb186 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 31 Mar 2024 20:20:05 +0200 -Subject: [PATCH 37/37] hotspot: os_linux: do not use dlinfo and +Subject: [PATCH 37/41] hotspot: os_linux: do not use dlinfo and RTLD_DI_LINKMAP on android As they are not available. @@ -10,10 +10,10 @@ As they are not available. 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp -index c41d459c1..7efca5710 100644 +index f41a83ebeba..190df2e87ab 100644 --- a/src/hotspot/os/linux/os_linux.cpp +++ b/src/hotspot/os/linux/os_linux.cpp -@@ -1870,11 +1870,12 @@ const char* os::Linux::dll_path(void* lib) { +@@ -1935,11 +1935,12 @@ const char* os::Linux::dll_path(void* lib) { struct link_map *lmap; const char* l_path = nullptr; assert(lib != nullptr, "dll_path parameter must not be null"); @@ -28,5 +28,5 @@ index c41d459c1..7efca5710 100644 } -- -2.45.2 +2.50.0 diff --git a/packages/openjdk-21/0038-OUTTREE-bionic-type-redef-fix.patch b/packages/openjdk-21/0038-OUTTREE-bionic-type-redef-fix.patch index e8e24a001ad590e..e0fc2a55ecccdc8 100644 --- a/packages/openjdk-21/0038-OUTTREE-bionic-type-redef-fix.patch +++ b/packages/openjdk-21/0038-OUTTREE-bionic-type-redef-fix.patch @@ -1,3 +1,15 @@ +From a51df00ee8073dcd8043207d9e86245dc75a1e8b Mon Sep 17 00:00:00 2001 +From: Robert Kirkman <31490854+robertkirkman@users.noreply.github.com> +Date: Fri, 11 Jul 2025 14:40:58 +0800 +Subject: [PATCH 38/41] OUTTREE bionic type redef fix + +Co-authored-by: eval Nya <11857526-nexplorer-3e@users.noreply.gitlab.com> +--- + src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c b/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c +index e470bbc4e03..2cd14f259c4 100644 --- a/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c +++ b/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c @@ -79,7 +79,7 @@ @@ -9,3 +21,6 @@ // Alpine doesn't know these types, define them typedef unsigned int __uint32_t; typedef unsigned short __uint16_t; +-- +2.50.0 + diff --git a/packages/openjdk-21/0039-Fix-hardcoded-paths-in-jdk.attach.patch b/packages/openjdk-21/0039-Fix-hardcoded-paths-in-jdk.attach.patch index d96f00f2895ebe4..c50a2c61adf6c7d 100644 --- a/packages/openjdk-21/0039-Fix-hardcoded-paths-in-jdk.attach.patch +++ b/packages/openjdk-21/0039-Fix-hardcoded-paths-in-jdk.attach.patch @@ -1,14 +1,14 @@ -From e7570675c4db70ea7314ae342def2445b0eea3c8 Mon Sep 17 00:00:00 2001 +From c1fc4dece3ed94c4ae8b6a8baa2513ffb2080ec8 Mon Sep 17 00:00:00 2001 From: Chongyun Lee <45286352+licy183@users.noreply.github.com> Date: Tue, 3 Sep 2024 12:34:31 +0800 -Subject: [PATCH] Fix: hardcoded paths in jdk.attach +Subject: [PATCH 39/41] Fix: hardcoded paths in jdk.attach --- .../linux/classes/sun/tools/attach/VirtualMachineImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/jdk.attach/linux/classes/sun/tools/attach/VirtualMachineImpl.java b/src/jdk.attach/linux/classes/sun/tools/attach/VirtualMachineImpl.java -index a5d743a2635..3d32c514f54 100644 +index 6a70d5d9f71..c0c571c5e57 100644 --- a/src/jdk.attach/linux/classes/sun/tools/attach/VirtualMachineImpl.java +++ b/src/jdk.attach/linux/classes/sun/tools/attach/VirtualMachineImpl.java @@ -46,7 +46,7 @@ public class VirtualMachineImpl extends HotSpotVirtualMachine { @@ -20,3 +20,6 @@ index a5d743a2635..3d32c514f54 100644 String socket_path; /** * Attaches to the target VM +-- +2.50.0 + diff --git a/packages/openjdk-21/0040-Do-not-disable-new-dtags.patch b/packages/openjdk-21/0040-Do-not-disable-new-dtags.patch index 2178ab3694e724e..0fa0b078cb2f0ec 100644 --- a/packages/openjdk-21/0040-Do-not-disable-new-dtags.patch +++ b/packages/openjdk-21/0040-Do-not-disable-new-dtags.patch @@ -1,7 +1,17 @@ -diff -u -r ../src/make/autoconf/flags-cflags.m4 ./make/autoconf/flags-cflags.m4 ---- ../src/make/autoconf/flags-cflags.m4 2024-09-01 20:09:35.611261408 +0000 -+++ ./make/autoconf/flags-cflags.m4 2024-09-01 20:10:49.387795908 +0000 -@@ -66,9 +66,6 @@ +From e53100099fda50e7f36dff26f3586ab7e6ae0b9c Mon Sep 17 00:00:00 2001 +From: Fredrik Fornwall +Date: Fri, 11 Jul 2025 14:51:08 +0800 +Subject: [PATCH 40/41] Do not disable new dtags + +--- + make/autoconf/flags-cflags.m4 | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/make/autoconf/flags-cflags.m4 b/make/autoconf/flags-cflags.m4 +index 1b966e2706e..705bd7feca9 100644 +--- a/make/autoconf/flags-cflags.m4 ++++ b/make/autoconf/flags-cflags.m4 +@@ -66,9 +66,6 @@ AC_DEFUN([FLAGS_SETUP_SHARED_LIBS], # Default works for linux, might work on other platforms as well. SHARED_LIBRARY_FLAGS='-shared' SET_EXECUTABLE_ORIGIN='-Wl,-rpath,\$$ORIGIN[$]1' @@ -11,3 +21,6 @@ diff -u -r ../src/make/autoconf/flags-cflags.m4 ./make/autoconf/flags-cflags.m4 SET_SHARED_LIBRARY_NAME='-Wl,-soname=[$]1' SET_SHARED_LIBRARY_MAPFILE='-Wl,-version-script=[$]1' +-- +2.50.0 + diff --git a/packages/openjdk-21/0041-disable-statx-syscall.patch b/packages/openjdk-21/0041-disable-statx-syscall.patch index 48eaf434fcf9420..1bba858c99e3b6f 100644 --- a/packages/openjdk-21/0041-disable-statx-syscall.patch +++ b/packages/openjdk-21/0041-disable-statx-syscall.patch @@ -1,13 +1,17 @@ -This turns off dynamically loading the statx() symbol, which has the same effect as reverting -https://github.com/openjdk/jdk21u/commit/4cf572e3b99b675418e456e7815fb6fd79245e30 , -which was fixing https://bugs.openjdk.org/browse/JDK-8316304 , -because on some devices, for some reason it causes launching any JAR to crash the Java runtime. +From 5f0bb6d64252847599cbb94e09cf2be1ce919fc8 Mon Sep 17 00:00:00 2001 +From: Robert Kirkman <31490854+robertkirkman@users.noreply.github.com> +Date: Fri, 11 Jul 2025 14:52:14 +0800 +Subject: [PATCH 41/41] disable statx syscall -Fixes https://github.com/termux/termux-packages/issues/24651 +--- + src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +diff --git a/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c b/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c +index 2cd14f259c4..cb3ce06e1dc 100644 --- a/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c +++ b/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c -@@ -434,7 +438,7 @@ Java_sun_nio_fs_UnixNativeDispatcher_init(JNIEnv* env, jclass this) +@@ -434,7 +434,7 @@ Java_sun_nio_fs_UnixNativeDispatcher_init(JNIEnv* env, jclass this) #ifdef _DARWIN_FEATURE_64_BIT_INODE capabilities |= sun_nio_fs_UnixNativeDispatcher_SUPPORTS_BIRTHTIME; #endif @@ -16,3 +20,6 @@ Fixes https://github.com/termux/termux-packages/issues/24651 my_statx_func = (statx_func*) dlsym(RTLD_DEFAULT, "statx"); if (my_statx_func != NULL) { capabilities |= sun_nio_fs_UnixNativeDispatcher_SUPPORTS_BIRTHTIME; +-- +2.50.0 + From 5d202cee0021ee03c5f3768f9e96f1cbed93dadd Mon Sep 17 00:00:00 2001 From: alexytomi <60690056+alexytomi@users.noreply.github.com> Date: Fri, 11 Jul 2025 15:40:06 +0800 Subject: [PATCH 2/9] fix(main/openjdk-21): Build ALSA This was disabled before someone made the `alsa-utils`, `alsa-lib` and `alsa-plugins` packages and added a pulseaudio backend to ALSA This is no longer true, we now have ALSA --- ...lude-netinet-in.h-for-android-builds.patch | 2 +- ...s_linux-add-android-checks-and-fixes.patch | 2 +- ...Define-sys-gettid-on-arm-and-aarch64.patch | 2 +- ...six-print-uptime-overridden-by-linux.patch | 2 +- ...prevent-build-of-libjsound-and-libsa.patch | 2 +- .../0006-Link-against-system-libiconv.patch | 2 +- ...h64_get_thread_helper-Thread-current.patch | 2 +- ...008-Remove-aarch64_get_thread_helper.patch | 2 +- .../0009-Use-Android-s-strerror_r.patch | 2 +- .../0010-Use-utimensat-on-android.patch | 2 +- ..._nio_fs_UnixNativeDispatcher_futimes.patch | 2 +- ...0012-Add-CXXFLAGS_JDKLIB-to-CXXFLAGS.patch | 2 +- .../0013-Use-ASCII-codeset-on-android.patch | 2 +- ...vm.so-path-when-run-from-Android-app.patch | 2 +- ...-address-to-char-when-clearing-cache.patch | 2 +- ...control-related-functions-on-Android.patch | 2 +- ...ink-against-libawt-to-fix-link-error.patch | 2 +- ...m.so-path-from-proc-self-maps-on-and.patch | 2 +- ...f-exiting-if-getcpu-2-is-unsupported.patch | 2 +- .../0020-Remove-pre-UAL-aliases.patch | 2 +- ...arm-fix-assembly-in-os_linux_arm.cpp.patch | 2 +- ...nd-for-tagged-pointers-on-Android-12.patch | 2 +- .../0023-x86-always-compile-with-PIC.patch | 2 +- .../0024-Fix-StackOverflowError-on-ARM.patch | 2 +- ...lvsym-is-available-if-ANDROID_API-24.patch | 2 +- ...e-hardcoded-paths-to-work-in-termux.patch} | 4 +-- .../0026-configure-do-not-require-alsa.patch | 32 ------------------- ...ed-to-define-ELF-32-64-_ST_TYPE-on-.patch} | 4 +-- ...tloadavg-implementation-for-android.patch} | 4 +-- ...ux-use-getpagesize-instad-of-SHMLBA.patch} | 4 +-- ...va-change-return-type-of-strerror_r.patch} | 4 +-- ...cflags-handle-arm-like-other-arches.patch} | 4 +-- ...2-Fix-bugs-in-File.getCanonicalPath.patch} | 4 +-- ...lter-same-symbols-for-linux-and-and.patch} | 0 ...patch => 0034-Fix-build-with-lld-17.patch} | 0 ...define-ARM-for-arm-build-with-clang.patch} | 4 +-- ...do-not-use-dlinfo-and-RTLD_DI_LINKM.patch} | 4 +-- ... 0037-OUTTREE-bionic-type-redef-fix.patch} | 4 +-- ...8-Fix-hardcoded-paths-in-jdk.attach.patch} | 4 +-- ...ch => 0039-Do-not-disable-new-dtags.patch} | 4 +-- ...patch => 0040-disable-statx-syscall.patch} | 4 +-- 41 files changed, 51 insertions(+), 83 deletions(-) rename packages/openjdk-21/{0027-Update-hardcoded-paths-to-work-in-termux.patch => 0026-Update-hardcoded-paths-to-work-in-termux.patch} (99%) delete mode 100644 packages/openjdk-21/0026-configure-do-not-require-alsa.patch rename packages/openjdk-21/{0028-elfFile.hpp-no-need-to-define-ELF-32-64-_ST_TYPE-on-.patch => 0027-elfFile.hpp-no-need-to-define-ELF-32-64-_ST_TYPE-on-.patch} (89%) rename packages/openjdk-21/{0029-os-linux-add-getloadavg-implementation-for-android.patch => 0028-os-linux-add-getloadavg-implementation-for-android.patch} (89%) rename packages/openjdk-21/{0030-os-linux-use-getpagesize-instad-of-SHMLBA.patch => 0029-os-linux-use-getpagesize-instad-of-SHMLBA.patch} (90%) rename packages/openjdk-21/{0031-libjava-change-return-type-of-strerror_r.patch => 0030-libjava-change-return-type-of-strerror_r.patch} (94%) rename packages/openjdk-21/{0032-make-cflags-handle-arm-like-other-arches.patch => 0031-make-cflags-handle-arm-like-other-arches.patch} (88%) rename packages/openjdk-21/{0033-Fix-bugs-in-File.getCanonicalPath.patch => 0032-Fix-bugs-in-File.getCanonicalPath.patch} (98%) rename packages/openjdk-21/{0034-JvmMapfile.gmk-filter-same-symbols-for-linux-and-and.patch => 0033-JvmMapfile.gmk-filter-same-symbols-for-linux-and-and.patch} (100%) rename packages/openjdk-21/{0035-Fix-build-with-lld-17.patch => 0034-Fix-build-with-lld-17.patch} (100%) rename packages/openjdk-21/{0036-make-autoconf-define-ARM-for-arm-build-with-clang.patch => 0035-make-autoconf-define-ARM-for-arm-build-with-clang.patch} (90%) rename packages/openjdk-21/{0037-hotspot-os_linux-do-not-use-dlinfo-and-RTLD_DI_LINKM.patch => 0036-hotspot-os_linux-do-not-use-dlinfo-and-RTLD_DI_LINKM.patch} (86%) rename packages/openjdk-21/{0038-OUTTREE-bionic-type-redef-fix.patch => 0037-OUTTREE-bionic-type-redef-fix.patch} (88%) rename packages/openjdk-21/{0039-Fix-hardcoded-paths-in-jdk.attach.patch => 0038-Fix-hardcoded-paths-in-jdk.attach.patch} (89%) rename packages/openjdk-21/{0040-Do-not-disable-new-dtags.patch => 0039-Do-not-disable-new-dtags.patch} (88%) rename packages/openjdk-21/{0041-disable-statx-syscall.patch => 0040-disable-statx-syscall.patch} (90%) diff --git a/packages/openjdk-21/0001-libinet-include-netinet-in.h-for-android-builds.patch b/packages/openjdk-21/0001-libinet-include-netinet-in.h-for-android-builds.patch index cb334ffb100fa15..1859a870368f245 100644 --- a/packages/openjdk-21/0001-libinet-include-netinet-in.h-for-android-builds.patch +++ b/packages/openjdk-21/0001-libinet-include-netinet-in.h-for-android-builds.patch @@ -1,7 +1,7 @@ From 2c006533a199190b1895555ecd22e57504b8410d Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 31 Mar 2024 16:31:48 +0200 -Subject: [PATCH 01/41] libinet: include netinet/in.h for android builds +Subject: [PATCH 01/40] libinet: include netinet/in.h for android builds --- src/java.base/unix/native/libnet/net_util_md.h | 3 +++ diff --git a/packages/openjdk-21/0002-os_linux-add-android-checks-and-fixes.patch b/packages/openjdk-21/0002-os_linux-add-android-checks-and-fixes.patch index 59845e1c9655ef1..95f1deee725f634 100644 --- a/packages/openjdk-21/0002-os_linux-add-android-checks-and-fixes.patch +++ b/packages/openjdk-21/0002-os_linux-add-android-checks-and-fixes.patch @@ -1,7 +1,7 @@ From c5c06ff0ad56d3b6ec013f352e3a60c28dd43467 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Sun, 6 Jun 2021 20:11:11 +0700 -Subject: [PATCH 02/41] os_linux: add android checks and fixes +Subject: [PATCH 02/40] os_linux: add android checks and fixes --- src/hotspot/os/linux/os_linux.cpp | 6 +++++- diff --git a/packages/openjdk-21/0003-Define-sys-gettid-on-arm-and-aarch64.patch b/packages/openjdk-21/0003-Define-sys-gettid-on-arm-and-aarch64.patch index 305563efcfdb8aa..97140a14b9463d7 100644 --- a/packages/openjdk-21/0003-Define-sys-gettid-on-arm-and-aarch64.patch +++ b/packages/openjdk-21/0003-Define-sys-gettid-on-arm-and-aarch64.patch @@ -1,7 +1,7 @@ From 4792a9c8a80a854707a45d1c326bc53e985b1571 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Mon, 7 Jun 2021 06:27:26 +0700 -Subject: [PATCH 03/41] Define sys gettid on arm and aarch64 +Subject: [PATCH 03/40] Define sys gettid on arm and aarch64 --- src/hotspot/os/linux/os_linux.cpp | 6 ++++-- diff --git a/packages/openjdk-21/0004-Disable-posix-print-uptime-overridden-by-linux.patch b/packages/openjdk-21/0004-Disable-posix-print-uptime-overridden-by-linux.patch index e51250d88df3265..7374fd62acda9ac 100644 --- a/packages/openjdk-21/0004-Disable-posix-print-uptime-overridden-by-linux.patch +++ b/packages/openjdk-21/0004-Disable-posix-print-uptime-overridden-by-linux.patch @@ -1,7 +1,7 @@ From daa941f61e7da80c98deef776c7b0f6e2b46963e Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Mon, 7 Jun 2021 08:05:09 +0700 -Subject: [PATCH 04/41] Disable posix print uptime (overridden by linux!) +Subject: [PATCH 04/40] Disable posix print uptime (overridden by linux!) --- src/hotspot/os/posix/os_posix.cpp | 4 ++++ diff --git a/packages/openjdk-21/0005-android-prevent-build-of-libjsound-and-libsa.patch b/packages/openjdk-21/0005-android-prevent-build-of-libjsound-and-libsa.patch index 7f29eb4fa8bd3c7..d53a347ed8a4806 100644 --- a/packages/openjdk-21/0005-android-prevent-build-of-libjsound-and-libsa.patch +++ b/packages/openjdk-21/0005-android-prevent-build-of-libjsound-and-libsa.patch @@ -1,7 +1,7 @@ From 511c74a42767a438af8489ab1d88d561b80a0498 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Fri, 3 Feb 2023 11:06:24 +0100 -Subject: [PATCH 05/41] android: prevent build of libjsound and libsa +Subject: [PATCH 05/40] android: prevent build of libjsound and libsa --- make/modules/java.desktop/Lib.gmk | 2 -- diff --git a/packages/openjdk-21/0006-Link-against-system-libiconv.patch b/packages/openjdk-21/0006-Link-against-system-libiconv.patch index 58c76f019f9d85a..029038ba27a02ec 100644 --- a/packages/openjdk-21/0006-Link-against-system-libiconv.patch +++ b/packages/openjdk-21/0006-Link-against-system-libiconv.patch @@ -1,7 +1,7 @@ From b464de6f87da8c7d4d25a965ebf94ff963ba0b18 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Fri, 3 Feb 2023 11:09:10 +0100 -Subject: [PATCH 06/41] Link against system libiconv +Subject: [PATCH 06/40] Link against system libiconv --- make/modules/java.instrument/Lib.gmk | 2 +- diff --git a/packages/openjdk-21/0007-aarch64_get_thread_helper-Thread-current.patch b/packages/openjdk-21/0007-aarch64_get_thread_helper-Thread-current.patch index dc22d58194e389b..b966e0425ce5f8f 100644 --- a/packages/openjdk-21/0007-aarch64_get_thread_helper-Thread-current.patch +++ b/packages/openjdk-21/0007-aarch64_get_thread_helper-Thread-current.patch @@ -1,7 +1,7 @@ From 55c385abc94cfbc9e92ce089b3a17c9e1cfdf418 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Thu, 10 Jun 2021 08:45:16 +0700 -Subject: [PATCH 07/41] aarch64_get_thread_helper() -> Thread::current() +Subject: [PATCH 07/40] aarch64_get_thread_helper() -> Thread::current() Can't build for Android: diff --git a/packages/openjdk-21/0008-Remove-aarch64_get_thread_helper.patch b/packages/openjdk-21/0008-Remove-aarch64_get_thread_helper.patch index 1d21f44971818c9..258cc7ae8f036cc 100644 --- a/packages/openjdk-21/0008-Remove-aarch64_get_thread_helper.patch +++ b/packages/openjdk-21/0008-Remove-aarch64_get_thread_helper.patch @@ -1,7 +1,7 @@ From f92b331cd7a93e2aefb01f3234b5f15242b9d888 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Thu, 10 Jun 2021 08:46:35 +0700 -Subject: [PATCH 08/41] Remove aarch64_get_thread_helper() +Subject: [PATCH 08/40] Remove aarch64_get_thread_helper() See commit 6f407090fda1 ("aarch64_get_thread_helper() -> Thread::current()") for more details. diff --git a/packages/openjdk-21/0009-Use-Android-s-strerror_r.patch b/packages/openjdk-21/0009-Use-Android-s-strerror_r.patch index 9ad867b4457d328..50f6efc3b649bbd 100644 --- a/packages/openjdk-21/0009-Use-Android-s-strerror_r.patch +++ b/packages/openjdk-21/0009-Use-Android-s-strerror_r.patch @@ -1,7 +1,7 @@ From a832c53829edff3a34ad7c63ad451f9a479d429d Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Thu, 10 Jun 2021 09:36:26 +0700 -Subject: [PATCH 09/41] Use Android's strerror_r() +Subject: [PATCH 09/40] Use Android's strerror_r() --- src/java.base/unix/native/libjava/jni_util_md.c | 7 ------- diff --git a/packages/openjdk-21/0010-Use-utimensat-on-android.patch b/packages/openjdk-21/0010-Use-utimensat-on-android.patch index 9e42e1e1d0d1561..ee9abbc4e740be9 100644 --- a/packages/openjdk-21/0010-Use-utimensat-on-android.patch +++ b/packages/openjdk-21/0010-Use-utimensat-on-android.patch @@ -1,7 +1,7 @@ From bc9f7a9d77eafc4345421a9b7c3d188b82a881dd Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Thu, 10 Jun 2021 16:42:56 +0700 -Subject: [PATCH 10/41] Use utimensat on android +Subject: [PATCH 10/40] Use utimensat on android --- .../native/libnio/fs/UnixNativeDispatcher.c | 22 ++++++++++++++----- diff --git a/packages/openjdk-21/0011-Fixed-Java_sun_nio_fs_UnixNativeDispatcher_futimes.patch b/packages/openjdk-21/0011-Fixed-Java_sun_nio_fs_UnixNativeDispatcher_futimes.patch index 6b111f043f1ced8..a9f5013193d68ce 100644 --- a/packages/openjdk-21/0011-Fixed-Java_sun_nio_fs_UnixNativeDispatcher_futimes.patch +++ b/packages/openjdk-21/0011-Fixed-Java_sun_nio_fs_UnixNativeDispatcher_futimes.patch @@ -1,7 +1,7 @@ From 0d135aacba52a406e146d232fc402cbfeaa9228e Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Thu, 10 Jun 2021 18:36:56 +0700 -Subject: [PATCH 11/41] Fixed Java_sun_nio_fs_UnixNativeDispatcher_futimes +Subject: [PATCH 11/40] Fixed Java_sun_nio_fs_UnixNativeDispatcher_futimes --- .../unix/native/libnio/fs/UnixNativeDispatcher.c | 11 ++++++----- diff --git a/packages/openjdk-21/0012-Add-CXXFLAGS_JDKLIB-to-CXXFLAGS.patch b/packages/openjdk-21/0012-Add-CXXFLAGS_JDKLIB-to-CXXFLAGS.patch index 102516dcd289e23..b697eb35f461e75 100644 --- a/packages/openjdk-21/0012-Add-CXXFLAGS_JDKLIB-to-CXXFLAGS.patch +++ b/packages/openjdk-21/0012-Add-CXXFLAGS_JDKLIB-to-CXXFLAGS.patch @@ -1,7 +1,7 @@ From a35c17767b0228a062b6353dd8e3c695942d3e70 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Thu, 10 Jun 2021 19:23:03 +0700 -Subject: [PATCH 12/41] Add CXXFLAGS_JDKLIB to CXXFLAGS +Subject: [PATCH 12/40] Add CXXFLAGS_JDKLIB to CXXFLAGS For modules jdk.jdwp.agent and java.instrument. --- diff --git a/packages/openjdk-21/0013-Use-ASCII-codeset-on-android.patch b/packages/openjdk-21/0013-Use-ASCII-codeset-on-android.patch index 1f79f40d1c34a79..11fb2a7c8869bd4 100644 --- a/packages/openjdk-21/0013-Use-ASCII-codeset-on-android.patch +++ b/packages/openjdk-21/0013-Use-ASCII-codeset-on-android.patch @@ -1,7 +1,7 @@ From 10e8861d94c2656e68825f2c9c6bd449f68d66ab Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Thu, 10 Jun 2021 20:42:40 +0700 -Subject: [PATCH 13/41] Use ASCII codeset on android +Subject: [PATCH 13/40] Use ASCII codeset on android Since android's locale support is very rudimentary. --- diff --git a/packages/openjdk-21/0014-Fix-libjvm.so-path-when-run-from-Android-app.patch b/packages/openjdk-21/0014-Fix-libjvm.so-path-when-run-from-Android-app.patch index 9a535273ca1f3c8..524e2394824c34a 100644 --- a/packages/openjdk-21/0014-Fix-libjvm.so-path-when-run-from-Android-app.patch +++ b/packages/openjdk-21/0014-Fix-libjvm.so-path-when-run-from-Android-app.patch @@ -1,7 +1,7 @@ From ba9d61796887a2238dcf9843d4e7d1810dc35deb Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Fri, 11 Jun 2021 07:48:28 +0700 -Subject: [PATCH 14/41] Fix libjvm.so path when run from Android app +Subject: [PATCH 14/40] Fix libjvm.so path when run from Android app --- src/java.base/unix/native/libjli/java_md.c | 49 ++++++++++++++++++++++ diff --git a/packages/openjdk-21/0015-arm-cast-address-to-char-when-clearing-cache.patch b/packages/openjdk-21/0015-arm-cast-address-to-char-when-clearing-cache.patch index aa21a5c58a19057..66ac97283af34c9 100644 --- a/packages/openjdk-21/0015-arm-cast-address-to-char-when-clearing-cache.patch +++ b/packages/openjdk-21/0015-arm-cast-address-to-char-when-clearing-cache.patch @@ -1,7 +1,7 @@ From 77578ca9c214819ade267c018a14d2e0c0cfd11c Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Sat, 12 Jun 2021 06:55:18 +0700 -Subject: [PATCH 15/41] arm: cast address to char when clearing cache +Subject: [PATCH 15/40] arm: cast address to char when clearing cache --- src/hotspot/cpu/arm/icache_arm.cpp | 2 +- diff --git a/packages/openjdk-21/0016-Don-t-run-fpu_control-related-functions-on-Android.patch b/packages/openjdk-21/0016-Don-t-run-fpu_control-related-functions-on-Android.patch index ad825f54edbb0f9..ac26ee9d390b1a1 100644 --- a/packages/openjdk-21/0016-Don-t-run-fpu_control-related-functions-on-Android.patch +++ b/packages/openjdk-21/0016-Don-t-run-fpu_control-related-functions-on-Android.patch @@ -1,7 +1,7 @@ From c75f58fe006c640e9704983a2689e51bb3eee1e9 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Sat, 12 Jun 2021 06:58:20 +0700 -Subject: [PATCH 16/41] Don't run fpu_control related functions on Android +Subject: [PATCH 16/40] Don't run fpu_control related functions on Android --- src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp | 2 ++ diff --git a/packages/openjdk-21/0017-Libfontmanager-link-against-libawt-to-fix-link-error.patch b/packages/openjdk-21/0017-Libfontmanager-link-against-libawt-to-fix-link-error.patch index 257552ed57a3219..f211b9ed6a88e97 100644 --- a/packages/openjdk-21/0017-Libfontmanager-link-against-libawt-to-fix-link-error.patch +++ b/packages/openjdk-21/0017-Libfontmanager-link-against-libawt-to-fix-link-error.patch @@ -1,7 +1,7 @@ From 2251e288212f39b2dec98d62d866e3bb184dd853 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Sat, 12 Jun 2021 17:03:05 +0700 -Subject: [PATCH 17/41] Libfontmanager: link against libawt to fix link error +Subject: [PATCH 17/40] Libfontmanager: link against libawt to fix link error Partly based on commit from androidports: https://github.com/androidports/openjdk/commit/a3e4f0281154537f01c2e59286a6ceed9c827b11 diff --git a/packages/openjdk-21/0018-Try-to-get-libjvm.so-path-from-proc-self-maps-on-and.patch b/packages/openjdk-21/0018-Try-to-get-libjvm.so-path-from-proc-self-maps-on-and.patch index fe78100f7d867a4..2ec4afa8c6bad8f 100644 --- a/packages/openjdk-21/0018-Try-to-get-libjvm.so-path-from-proc-self-maps-on-and.patch +++ b/packages/openjdk-21/0018-Try-to-get-libjvm.so-path-from-proc-self-maps-on-and.patch @@ -1,7 +1,7 @@ From ebe7bef9eaba9a1da97a90fcae8e60054574c245 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Fri, 25 Jun 2021 17:19:24 +0700 -Subject: [PATCH 18/41] Try to get libjvm.so path from /proc/self/maps on +Subject: [PATCH 18/40] Try to get libjvm.so path from /proc/self/maps on android --- diff --git a/packages/openjdk-21/0019-Warn-instead-of-exiting-if-getcpu-2-is-unsupported.patch b/packages/openjdk-21/0019-Warn-instead-of-exiting-if-getcpu-2-is-unsupported.patch index 7bfc49f852dd858..a5222d5cabe6f4c 100644 --- a/packages/openjdk-21/0019-Warn-instead-of-exiting-if-getcpu-2-is-unsupported.patch +++ b/packages/openjdk-21/0019-Warn-instead-of-exiting-if-getcpu-2-is-unsupported.patch @@ -1,7 +1,7 @@ From 85b2e41ce6a8908837328ba16bec032691086690 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Mon, 28 Jun 2021 17:47:31 +0700 -Subject: [PATCH 19/41] Warn instead of exiting if getcpu(2) is unsupported +Subject: [PATCH 19/40] Warn instead of exiting if getcpu(2) is unsupported --- src/hotspot/os/linux/os_linux.cpp | 3 ++- diff --git a/packages/openjdk-21/0020-Remove-pre-UAL-aliases.patch b/packages/openjdk-21/0020-Remove-pre-UAL-aliases.patch index 2f2a2f9395245cf..bf916e057750c0e 100644 --- a/packages/openjdk-21/0020-Remove-pre-UAL-aliases.patch +++ b/packages/openjdk-21/0020-Remove-pre-UAL-aliases.patch @@ -1,7 +1,7 @@ From e0a685dc429b3cc40ec19c2e5e0c75b3bd737faa Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Wed, 30 Jun 2021 14:28:14 +0700 -Subject: [PATCH 20/41] Remove pre-UAL aliases +Subject: [PATCH 20/40] Remove pre-UAL aliases --- src/hotspot/os_cpu/linux_arm/linux_arm_32.S | 40 ++++++++++----------- diff --git a/packages/openjdk-21/0021-arm-fix-assembly-in-os_linux_arm.cpp.patch b/packages/openjdk-21/0021-arm-fix-assembly-in-os_linux_arm.cpp.patch index ac970f6e670de6a..34bd9e7d3291def 100644 --- a/packages/openjdk-21/0021-arm-fix-assembly-in-os_linux_arm.cpp.patch +++ b/packages/openjdk-21/0021-arm-fix-assembly-in-os_linux_arm.cpp.patch @@ -1,7 +1,7 @@ From 3ac9e292433c5a566cf833c68fc42bf40bea5848 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Wed, 30 Jun 2021 14:30:02 +0700 -Subject: [PATCH 21/41] arm: fix assembly in os_linux_arm.cpp +Subject: [PATCH 21/40] arm: fix assembly in os_linux_arm.cpp --- src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp | 4 ++-- diff --git a/packages/openjdk-21/0022-Add-workaround-for-tagged-pointers-on-Android-12.patch b/packages/openjdk-21/0022-Add-workaround-for-tagged-pointers-on-Android-12.patch index 9dc02d54410711c..1142d59b07b2f76 100644 --- a/packages/openjdk-21/0022-Add-workaround-for-tagged-pointers-on-Android-12.patch +++ b/packages/openjdk-21/0022-Add-workaround-for-tagged-pointers-on-Android-12.patch @@ -1,7 +1,7 @@ From 0030babd8d4c0eeade2af3627aa070df686feb5c Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Fri, 3 Feb 2023 11:32:40 +0100 -Subject: [PATCH 22/41] Add workaround for tagged pointers on Android 12 +Subject: [PATCH 22/40] Add workaround for tagged pointers on Android 12 Co-authored-by: dev-bz <32380878+dev-bz@users.noreply.github.com> --- diff --git a/packages/openjdk-21/0023-x86-always-compile-with-PIC.patch b/packages/openjdk-21/0023-x86-always-compile-with-PIC.patch index 0c36be186166d73..d6bac90b3c2bc5c 100644 --- a/packages/openjdk-21/0023-x86-always-compile-with-PIC.patch +++ b/packages/openjdk-21/0023-x86-always-compile-with-PIC.patch @@ -1,7 +1,7 @@ From a12b0dcb1cc5c6ab8e40af3166d47ee044f2e653 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BA=AF=E6=B4=84?= <1840686745@qq.com> Date: Thu, 26 Aug 2021 14:00:54 +0800 -Subject: [PATCH 23/41] x86: always compile with PIC +Subject: [PATCH 23/40] x86: always compile with PIC --- make/hotspot/lib/JvmOverrideFiles.gmk | 18 ------------------ diff --git a/packages/openjdk-21/0024-Fix-StackOverflowError-on-ARM.patch b/packages/openjdk-21/0024-Fix-StackOverflowError-on-ARM.patch index 8ff8cc5effc0928..7c16473e6096d65 100644 --- a/packages/openjdk-21/0024-Fix-StackOverflowError-on-ARM.patch +++ b/packages/openjdk-21/0024-Fix-StackOverflowError-on-ARM.patch @@ -1,7 +1,7 @@ From 9b4a6ce8b7cc8f7627273e54e09c9d0cca8312af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BA=AF=E6=B4=84?= <1840686745@qq.com> Date: Thu, 26 Aug 2021 03:53:25 +0800 -Subject: [PATCH 24/41] Fix StackOverflowError on ARM +Subject: [PATCH 24/40] Fix StackOverflowError on ARM --- src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp | 6 ++++++ diff --git a/packages/openjdk-21/0025-android-dlvsym-is-available-if-ANDROID_API-24.patch b/packages/openjdk-21/0025-android-dlvsym-is-available-if-ANDROID_API-24.patch index 5f8542f19ceae3c..399fd1b3212e3a1 100644 --- a/packages/openjdk-21/0025-android-dlvsym-is-available-if-ANDROID_API-24.patch +++ b/packages/openjdk-21/0025-android-dlvsym-is-available-if-ANDROID_API-24.patch @@ -1,7 +1,7 @@ From fe01c8a84d50ee0a247ea3e9eef4baa99356659a Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Fri, 3 Feb 2023 11:50:57 +0100 -Subject: [PATCH 25/41] android: dlvsym is available if ANDROID_API >= 24 +Subject: [PATCH 25/40] android: dlvsym is available if ANDROID_API >= 24 --- src/hotspot/os/linux/os_linux.cpp | 2 +- diff --git a/packages/openjdk-21/0027-Update-hardcoded-paths-to-work-in-termux.patch b/packages/openjdk-21/0026-Update-hardcoded-paths-to-work-in-termux.patch similarity index 99% rename from packages/openjdk-21/0027-Update-hardcoded-paths-to-work-in-termux.patch rename to packages/openjdk-21/0026-Update-hardcoded-paths-to-work-in-termux.patch index 95016b709a93aec..7cc2755d6a3baa3 100644 --- a/packages/openjdk-21/0027-Update-hardcoded-paths-to-work-in-termux.patch +++ b/packages/openjdk-21/0026-Update-hardcoded-paths-to-work-in-termux.patch @@ -1,7 +1,7 @@ -From ad98be8113e5abc18d53b06e19277063dc62b6ff Mon Sep 17 00:00:00 2001 +From 57d9085478249a915a1778da343b1b46a3f66c0a Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Tue, 6 Jul 2021 18:29:24 +0700 -Subject: [PATCH 27/41] Update hardcoded paths to work in termux +Subject: [PATCH 26/40] Update hardcoded paths to work in termux --- src/hotspot/os/linux/os_linux.cpp | 10 +++++-- diff --git a/packages/openjdk-21/0026-configure-do-not-require-alsa.patch b/packages/openjdk-21/0026-configure-do-not-require-alsa.patch deleted file mode 100644 index 29ae3ece31354f4..000000000000000 --- a/packages/openjdk-21/0026-configure-do-not-require-alsa.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 58f917a53d23f4ed65c83b0d05f7edbff4830c5a Mon Sep 17 00:00:00 2001 -From: Henrik Grimler -Date: Wed, 8 Feb 2023 15:36:25 +0100 -Subject: [PATCH 26/41] configure: do not require alsa - -Android, which counts as linux according to configure check, does not -have alsa so we cannot use it. ---- - make/autoconf/libraries.m4 | 7 +------ - 1 file changed, 1 insertion(+), 6 deletions(-) - -diff --git a/make/autoconf/libraries.m4 b/make/autoconf/libraries.m4 -index 51d4f724c33..cd8cda862dc 100644 ---- a/make/autoconf/libraries.m4 -+++ b/make/autoconf/libraries.m4 -@@ -74,12 +74,7 @@ AC_DEFUN_ONCE([LIB_DETERMINE_DEPENDENCIES], - NEEDS_LIB_FREETYPE=true - fi - -- # Check if alsa is needed -- if test "x$OPENJDK_TARGET_OS" = xlinux; then -- NEEDS_LIB_ALSA=true -- else -- NEEDS_LIB_ALSA=false -- fi -+ NEEDS_LIB_ALSA=false - - # Check if ffi is needed - if HOTSPOT_CHECK_JVM_VARIANT(zero) || test "x$ENABLE_FALLBACK_LINKER" = "xtrue"; then --- -2.50.0 - diff --git a/packages/openjdk-21/0028-elfFile.hpp-no-need-to-define-ELF-32-64-_ST_TYPE-on-.patch b/packages/openjdk-21/0027-elfFile.hpp-no-need-to-define-ELF-32-64-_ST_TYPE-on-.patch similarity index 89% rename from packages/openjdk-21/0028-elfFile.hpp-no-need-to-define-ELF-32-64-_ST_TYPE-on-.patch rename to packages/openjdk-21/0027-elfFile.hpp-no-need-to-define-ELF-32-64-_ST_TYPE-on-.patch index 21f4d5b98cdb9a1..97f2856443cb77f 100644 --- a/packages/openjdk-21/0028-elfFile.hpp-no-need-to-define-ELF-32-64-_ST_TYPE-on-.patch +++ b/packages/openjdk-21/0027-elfFile.hpp-no-need-to-define-ELF-32-64-_ST_TYPE-on-.patch @@ -1,7 +1,7 @@ -From baca0f0dbf59a745322376164c5260c3cca98585 Mon Sep 17 00:00:00 2001 +From 79670895c1d7b9c91995ae8dccd2c09bb6f1c4fc Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sat, 4 Feb 2023 22:45:13 +0100 -Subject: [PATCH 28/41] elfFile.hpp: no need to define ELF{32,64}_ST_TYPE on +Subject: [PATCH 27/40] elfFile.hpp: no need to define ELF{32,64}_ST_TYPE on android As the elf.h header already provides defintions. diff --git a/packages/openjdk-21/0029-os-linux-add-getloadavg-implementation-for-android.patch b/packages/openjdk-21/0028-os-linux-add-getloadavg-implementation-for-android.patch similarity index 89% rename from packages/openjdk-21/0029-os-linux-add-getloadavg-implementation-for-android.patch rename to packages/openjdk-21/0028-os-linux-add-getloadavg-implementation-for-android.patch index a3770198db49273..554c93662bf3ed4 100644 --- a/packages/openjdk-21/0029-os-linux-add-getloadavg-implementation-for-android.patch +++ b/packages/openjdk-21/0028-os-linux-add-getloadavg-implementation-for-android.patch @@ -1,7 +1,7 @@ -From ab54d1bd590a3642a28c161d0716a2429fa7d7af Mon Sep 17 00:00:00 2001 +From 1a56b8e983c2dc2fe825327c81d9b44b4f5f39b2 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 5 Feb 2023 09:14:50 +0100 -Subject: [PATCH 29/41] os: linux: add getloadavg implementation for android +Subject: [PATCH 28/40] os: linux: add getloadavg implementation for android --- src/hotspot/os/linux/os_linux.cpp | 13 +++++++++++++ diff --git a/packages/openjdk-21/0030-os-linux-use-getpagesize-instad-of-SHMLBA.patch b/packages/openjdk-21/0029-os-linux-use-getpagesize-instad-of-SHMLBA.patch similarity index 90% rename from packages/openjdk-21/0030-os-linux-use-getpagesize-instad-of-SHMLBA.patch rename to packages/openjdk-21/0029-os-linux-use-getpagesize-instad-of-SHMLBA.patch index 1bf31f5972e1294..c385b704d51f7f3 100644 --- a/packages/openjdk-21/0030-os-linux-use-getpagesize-instad-of-SHMLBA.patch +++ b/packages/openjdk-21/0029-os-linux-use-getpagesize-instad-of-SHMLBA.patch @@ -1,7 +1,7 @@ -From 8ad67b00975085bb0d5713e20f4d188f18de830c Mon Sep 17 00:00:00 2001 +From 83437e5ed3676dd0d931cc04d6ea7902da4d02ab Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 5 Feb 2023 09:21:57 +0100 -Subject: [PATCH 30/41] os: linux: use getpagesize() instad of SHMLBA +Subject: [PATCH 29/40] os: linux: use getpagesize() instad of SHMLBA Since the latter is not defined on android. --- diff --git a/packages/openjdk-21/0031-libjava-change-return-type-of-strerror_r.patch b/packages/openjdk-21/0030-libjava-change-return-type-of-strerror_r.patch similarity index 94% rename from packages/openjdk-21/0031-libjava-change-return-type-of-strerror_r.patch rename to packages/openjdk-21/0030-libjava-change-return-type-of-strerror_r.patch index e7e684d71f3556d..0229346f0be8d01 100644 --- a/packages/openjdk-21/0031-libjava-change-return-type-of-strerror_r.patch +++ b/packages/openjdk-21/0030-libjava-change-return-type-of-strerror_r.patch @@ -1,7 +1,7 @@ -From 90138bdd8b8940574335ca608fa599b070d34335 Mon Sep 17 00:00:00 2001 +From edf72152b4335bdaac6074c256fda2c5383e043a Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 5 Feb 2023 11:47:24 +0100 -Subject: [PATCH 31/41] libjava: change return type of strerror_r +Subject: [PATCH 30/40] libjava: change return type of strerror_r Later versions of android uses the GNU style and returns a char pointer. Adjust jni function to match this. diff --git a/packages/openjdk-21/0032-make-cflags-handle-arm-like-other-arches.patch b/packages/openjdk-21/0031-make-cflags-handle-arm-like-other-arches.patch similarity index 88% rename from packages/openjdk-21/0032-make-cflags-handle-arm-like-other-arches.patch rename to packages/openjdk-21/0031-make-cflags-handle-arm-like-other-arches.patch index cdf7d0547c39d66..dbcff2d9f214a19 100644 --- a/packages/openjdk-21/0032-make-cflags-handle-arm-like-other-arches.patch +++ b/packages/openjdk-21/0031-make-cflags-handle-arm-like-other-arches.patch @@ -1,7 +1,7 @@ -From 1bfe90e6a5debb51ff2ec26540d9da0fa11799cc Mon Sep 17 00:00:00 2001 +From 9df5cb085f8b191b63137b2aeb91c060d9cfa115 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Mon, 13 Feb 2023 13:49:47 +0100 -Subject: [PATCH 32/41] make: cflags: handle arm like other arches +Subject: [PATCH 31/40] make: cflags: handle arm like other arches --- make/autoconf/flags-cflags.m4 | 8 +------- diff --git a/packages/openjdk-21/0033-Fix-bugs-in-File.getCanonicalPath.patch b/packages/openjdk-21/0032-Fix-bugs-in-File.getCanonicalPath.patch similarity index 98% rename from packages/openjdk-21/0033-Fix-bugs-in-File.getCanonicalPath.patch rename to packages/openjdk-21/0032-Fix-bugs-in-File.getCanonicalPath.patch index 77b6f896d13ed78..f89e8c55eaf833d 100644 --- a/packages/openjdk-21/0033-Fix-bugs-in-File.getCanonicalPath.patch +++ b/packages/openjdk-21/0032-Fix-bugs-in-File.getCanonicalPath.patch @@ -1,7 +1,7 @@ -From e63bff751a02be681aae543941f2451d84ed6810 Mon Sep 17 00:00:00 2001 +From a8ed3d182be0b6f92f6f95007fc4759fde57caba Mon Sep 17 00:00:00 2001 From: agnostic-apollo Date: Thu, 28 Mar 2024 18:46:02 +0100 -Subject: [PATCH 33/41] Fix bugs in File.getCanonicalPath() +Subject: [PATCH 32/40] Fix bugs in File.getCanonicalPath() 1. If path length is `>= PATH_MAX` (4096) characters, return error. 2. If any path component length is `> NAME_MAX` (255) characters, return diff --git a/packages/openjdk-21/0034-JvmMapfile.gmk-filter-same-symbols-for-linux-and-and.patch b/packages/openjdk-21/0033-JvmMapfile.gmk-filter-same-symbols-for-linux-and-and.patch similarity index 100% rename from packages/openjdk-21/0034-JvmMapfile.gmk-filter-same-symbols-for-linux-and-and.patch rename to packages/openjdk-21/0033-JvmMapfile.gmk-filter-same-symbols-for-linux-and-and.patch diff --git a/packages/openjdk-21/0035-Fix-build-with-lld-17.patch b/packages/openjdk-21/0034-Fix-build-with-lld-17.patch similarity index 100% rename from packages/openjdk-21/0035-Fix-build-with-lld-17.patch rename to packages/openjdk-21/0034-Fix-build-with-lld-17.patch diff --git a/packages/openjdk-21/0036-make-autoconf-define-ARM-for-arm-build-with-clang.patch b/packages/openjdk-21/0035-make-autoconf-define-ARM-for-arm-build-with-clang.patch similarity index 90% rename from packages/openjdk-21/0036-make-autoconf-define-ARM-for-arm-build-with-clang.patch rename to packages/openjdk-21/0035-make-autoconf-define-ARM-for-arm-build-with-clang.patch index ffd7d91fa1a828d..f19842039ff55d7 100644 --- a/packages/openjdk-21/0036-make-autoconf-define-ARM-for-arm-build-with-clang.patch +++ b/packages/openjdk-21/0035-make-autoconf-define-ARM-for-arm-build-with-clang.patch @@ -1,7 +1,7 @@ -From 747dc8d5c76ca1dc1fd0d98e356ae46609e73285 Mon Sep 17 00:00:00 2001 +From 562a0619ee79a5d53705b3575cf97dfde4a95810 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 31 Mar 2024 12:02:51 +0200 -Subject: [PATCH 36/41] make: autoconf: define ARM for arm build with clang +Subject: [PATCH 35/40] make: autoconf: define ARM for arm build with clang Fixes error like diff --git a/packages/openjdk-21/0037-hotspot-os_linux-do-not-use-dlinfo-and-RTLD_DI_LINKM.patch b/packages/openjdk-21/0036-hotspot-os_linux-do-not-use-dlinfo-and-RTLD_DI_LINKM.patch similarity index 86% rename from packages/openjdk-21/0037-hotspot-os_linux-do-not-use-dlinfo-and-RTLD_DI_LINKM.patch rename to packages/openjdk-21/0036-hotspot-os_linux-do-not-use-dlinfo-and-RTLD_DI_LINKM.patch index 6de39d793128b57..5b9ac9f433975e8 100644 --- a/packages/openjdk-21/0037-hotspot-os_linux-do-not-use-dlinfo-and-RTLD_DI_LINKM.patch +++ b/packages/openjdk-21/0036-hotspot-os_linux-do-not-use-dlinfo-and-RTLD_DI_LINKM.patch @@ -1,7 +1,7 @@ -From a4ad553ba8fb9e5985c19036b6acc04df2ffb186 Mon Sep 17 00:00:00 2001 +From d94a7093a824089f0c5107bf293f484cba58fe60 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 31 Mar 2024 20:20:05 +0200 -Subject: [PATCH 37/41] hotspot: os_linux: do not use dlinfo and +Subject: [PATCH 36/40] hotspot: os_linux: do not use dlinfo and RTLD_DI_LINKMAP on android As they are not available. diff --git a/packages/openjdk-21/0038-OUTTREE-bionic-type-redef-fix.patch b/packages/openjdk-21/0037-OUTTREE-bionic-type-redef-fix.patch similarity index 88% rename from packages/openjdk-21/0038-OUTTREE-bionic-type-redef-fix.patch rename to packages/openjdk-21/0037-OUTTREE-bionic-type-redef-fix.patch index e0fc2a55ecccdc8..2622ec9dc44d768 100644 --- a/packages/openjdk-21/0038-OUTTREE-bionic-type-redef-fix.patch +++ b/packages/openjdk-21/0037-OUTTREE-bionic-type-redef-fix.patch @@ -1,7 +1,7 @@ -From a51df00ee8073dcd8043207d9e86245dc75a1e8b Mon Sep 17 00:00:00 2001 +From 25f824a2435ab98dc8a889613db88c9f195211d5 Mon Sep 17 00:00:00 2001 From: Robert Kirkman <31490854+robertkirkman@users.noreply.github.com> Date: Fri, 11 Jul 2025 14:40:58 +0800 -Subject: [PATCH 38/41] OUTTREE bionic type redef fix +Subject: [PATCH 37/40] OUTTREE bionic type redef fix Co-authored-by: eval Nya <11857526-nexplorer-3e@users.noreply.gitlab.com> --- diff --git a/packages/openjdk-21/0039-Fix-hardcoded-paths-in-jdk.attach.patch b/packages/openjdk-21/0038-Fix-hardcoded-paths-in-jdk.attach.patch similarity index 89% rename from packages/openjdk-21/0039-Fix-hardcoded-paths-in-jdk.attach.patch rename to packages/openjdk-21/0038-Fix-hardcoded-paths-in-jdk.attach.patch index c50a2c61adf6c7d..683bb490d7c3ca5 100644 --- a/packages/openjdk-21/0039-Fix-hardcoded-paths-in-jdk.attach.patch +++ b/packages/openjdk-21/0038-Fix-hardcoded-paths-in-jdk.attach.patch @@ -1,7 +1,7 @@ -From c1fc4dece3ed94c4ae8b6a8baa2513ffb2080ec8 Mon Sep 17 00:00:00 2001 +From 5bc8c9169088f13c43930a3b09d8adf60822deb7 Mon Sep 17 00:00:00 2001 From: Chongyun Lee <45286352+licy183@users.noreply.github.com> Date: Tue, 3 Sep 2024 12:34:31 +0800 -Subject: [PATCH 39/41] Fix: hardcoded paths in jdk.attach +Subject: [PATCH 38/40] Fix: hardcoded paths in jdk.attach --- .../linux/classes/sun/tools/attach/VirtualMachineImpl.java | 2 +- diff --git a/packages/openjdk-21/0040-Do-not-disable-new-dtags.patch b/packages/openjdk-21/0039-Do-not-disable-new-dtags.patch similarity index 88% rename from packages/openjdk-21/0040-Do-not-disable-new-dtags.patch rename to packages/openjdk-21/0039-Do-not-disable-new-dtags.patch index 0fa0b078cb2f0ec..abe90158114a5ca 100644 --- a/packages/openjdk-21/0040-Do-not-disable-new-dtags.patch +++ b/packages/openjdk-21/0039-Do-not-disable-new-dtags.patch @@ -1,7 +1,7 @@ -From e53100099fda50e7f36dff26f3586ab7e6ae0b9c Mon Sep 17 00:00:00 2001 +From ecc7c290c0bd82ae2fa6bfff9706b00525509d81 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Fri, 11 Jul 2025 14:51:08 +0800 -Subject: [PATCH 40/41] Do not disable new dtags +Subject: [PATCH 39/40] Do not disable new dtags --- make/autoconf/flags-cflags.m4 | 3 --- diff --git a/packages/openjdk-21/0041-disable-statx-syscall.patch b/packages/openjdk-21/0040-disable-statx-syscall.patch similarity index 90% rename from packages/openjdk-21/0041-disable-statx-syscall.patch rename to packages/openjdk-21/0040-disable-statx-syscall.patch index 1bba858c99e3b6f..ead418945762119 100644 --- a/packages/openjdk-21/0041-disable-statx-syscall.patch +++ b/packages/openjdk-21/0040-disable-statx-syscall.patch @@ -1,7 +1,7 @@ -From 5f0bb6d64252847599cbb94e09cf2be1ce919fc8 Mon Sep 17 00:00:00 2001 +From ff1e198dcc805d15980a370253732f71661cc17b Mon Sep 17 00:00:00 2001 From: Robert Kirkman <31490854+robertkirkman@users.noreply.github.com> Date: Fri, 11 Jul 2025 14:52:14 +0800 -Subject: [PATCH 41/41] disable statx syscall +Subject: [PATCH 40/40] disable statx syscall --- src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c | 2 +- From ce97e15de6939d94bfa78fed69fb7319bb3de88a Mon Sep 17 00:00:00 2001 From: alexytomi <60690056+alexytomi@users.noreply.github.com> Date: Fri, 11 Jul 2025 15:50:21 +0800 Subject: [PATCH 3/9] fix(main/openjdk-21): Build jsound Since we have ALSA, we can now use jsound, as it uses ALSA as the backend for linux --- ...lude-netinet-in.h-for-android-builds.patch | 2 +- ...s_linux-add-android-checks-and-fixes.patch | 2 +- ...Define-sys-gettid-on-arm-and-aarch64.patch | 2 +- ...six-print-uptime-overridden-by-linux.patch | 2 +- ...> 0005-Link-against-system-libiconv.patch} | 6 +-- ...prevent-build-of-libjsound-and-libsa.patch | 37 ------------------- ...64_get_thread_helper-Thread-current.patch} | 6 +-- ...07-Remove-aarch64_get_thread_helper.patch} | 6 +-- ...ch => 0008-Use-Android-s-strerror_r.patch} | 6 +-- ...ch => 0009-Use-utimensat-on-android.patch} | 6 +-- ...nio_fs_UnixNativeDispatcher_futimes.patch} | 6 +-- ...011-Add-CXXFLAGS_JDKLIB-to-CXXFLAGS.patch} | 6 +-- ...> 0012-Use-ASCII-codeset-on-android.patch} | 6 +-- ...m.so-path-when-run-from-Android-app.patch} | 6 +-- ...address-to-char-when-clearing-cache.patch} | 6 +-- ...ontrol-related-functions-on-Android.patch} | 6 +-- ...nk-against-libawt-to-fix-link-error.patch} | 6 +-- ....so-path-from-proc-self-maps-on-and.patch} | 6 +-- ...-exiting-if-getcpu-2-is-unsupported.patch} | 6 +-- ...atch => 0019-Remove-pre-UAL-aliases.patch} | 6 +-- ...rm-fix-assembly-in-os_linux_arm.cpp.patch} | 6 +-- ...d-for-tagged-pointers-on-Android-12.patch} | 6 +-- ...=> 0022-x86-always-compile-with-PIC.patch} | 6 +-- ... 0023-Fix-StackOverflowError-on-ARM.patch} | 6 +-- ...vsym-is-available-if-ANDROID_API-24.patch} | 6 +-- ...e-hardcoded-paths-to-work-in-termux.patch} | 6 +-- ...ed-to-define-ELF-32-64-_ST_TYPE-on-.patch} | 6 +-- ...tloadavg-implementation-for-android.patch} | 6 +-- ...ux-use-getpagesize-instad-of-SHMLBA.patch} | 6 +-- ...va-change-return-type-of-strerror_r.patch} | 6 +-- ...cflags-handle-arm-like-other-arches.patch} | 6 +-- ...1-Fix-bugs-in-File.getCanonicalPath.patch} | 6 +-- ...lter-same-symbols-for-linux-and-and.patch} | 0 ...patch => 0033-Fix-build-with-lld-17.patch} | 0 ...define-ARM-for-arm-build-with-clang.patch} | 6 +-- ...do-not-use-dlinfo-and-RTLD_DI_LINKM.patch} | 6 +-- ... 0036-OUTTREE-bionic-type-redef-fix.patch} | 6 +-- ...7-Fix-hardcoded-paths-in-jdk.attach.patch} | 6 +-- ...ch => 0038-Do-not-disable-new-dtags.patch} | 6 +-- ...patch => 0039-disable-statx-syscall.patch} | 6 +-- ...0-android-Prevent-build-of-libsaproc.patch | 32 ++++++++++++++++ 41 files changed, 135 insertions(+), 140 deletions(-) rename packages/openjdk-21/{0006-Link-against-system-libiconv.patch => 0005-Link-against-system-libiconv.patch} (92%) delete mode 100644 packages/openjdk-21/0005-android-prevent-build-of-libjsound-and-libsa.patch rename packages/openjdk-21/{0007-aarch64_get_thread_helper-Thread-current.patch => 0006-aarch64_get_thread_helper-Thread-current.patch} (89%) rename packages/openjdk-21/{0008-Remove-aarch64_get_thread_helper.patch => 0007-Remove-aarch64_get_thread_helper.patch} (89%) rename packages/openjdk-21/{0009-Use-Android-s-strerror_r.patch => 0008-Use-Android-s-strerror_r.patch} (88%) rename packages/openjdk-21/{0010-Use-utimensat-on-android.patch => 0009-Use-utimensat-on-android.patch} (97%) rename packages/openjdk-21/{0011-Fixed-Java_sun_nio_fs_UnixNativeDispatcher_futimes.patch => 0010-Fixed-Java_sun_nio_fs_UnixNativeDispatcher_futimes.patch} (93%) rename packages/openjdk-21/{0012-Add-CXXFLAGS_JDKLIB-to-CXXFLAGS.patch => 0011-Add-CXXFLAGS_JDKLIB-to-CXXFLAGS.patch} (92%) rename packages/openjdk-21/{0013-Use-ASCII-codeset-on-android.patch => 0012-Use-ASCII-codeset-on-android.patch} (93%) rename packages/openjdk-21/{0014-Fix-libjvm.so-path-when-run-from-Android-app.patch => 0013-Fix-libjvm.so-path-when-run-from-Android-app.patch} (95%) rename packages/openjdk-21/{0015-arm-cast-address-to-char-when-clearing-cache.patch => 0014-arm-cast-address-to-char-when-clearing-cache.patch} (83%) rename packages/openjdk-21/{0016-Don-t-run-fpu_control-related-functions-on-Android.patch => 0015-Don-t-run-fpu_control-related-functions-on-Android.patch} (94%) rename packages/openjdk-21/{0017-Libfontmanager-link-against-libawt-to-fix-link-error.patch => 0016-Libfontmanager-link-against-libawt-to-fix-link-error.patch} (91%) rename packages/openjdk-21/{0018-Try-to-get-libjvm.so-path-from-proc-self-maps-on-and.patch => 0017-Try-to-get-libjvm.so-path-from-proc-self-maps-on-and.patch} (95%) rename packages/openjdk-21/{0019-Warn-instead-of-exiting-if-getcpu-2-is-unsupported.patch => 0018-Warn-instead-of-exiting-if-getcpu-2-is-unsupported.patch} (84%) rename packages/openjdk-21/{0020-Remove-pre-UAL-aliases.patch => 0019-Remove-pre-UAL-aliases.patch} (97%) rename packages/openjdk-21/{0021-arm-fix-assembly-in-os_linux_arm.cpp.patch => 0020-arm-fix-assembly-in-os_linux_arm.cpp.patch} (85%) rename packages/openjdk-21/{0022-Add-workaround-for-tagged-pointers-on-Android-12.patch => 0021-Add-workaround-for-tagged-pointers-on-Android-12.patch} (93%) rename packages/openjdk-21/{0023-x86-always-compile-with-PIC.patch => 0022-x86-always-compile-with-PIC.patch} (93%) rename packages/openjdk-21/{0024-Fix-StackOverflowError-on-ARM.patch => 0023-Fix-StackOverflowError-on-ARM.patch} (86%) rename packages/openjdk-21/{0025-android-dlvsym-is-available-if-ANDROID_API-24.patch => 0024-android-dlvsym-is-available-if-ANDROID_API-24.patch} (84%) rename packages/openjdk-21/{0026-Update-hardcoded-paths-to-work-in-termux.patch => 0025-Update-hardcoded-paths-to-work-in-termux.patch} (99%) rename packages/openjdk-21/{0027-elfFile.hpp-no-need-to-define-ELF-32-64-_ST_TYPE-on-.patch => 0026-elfFile.hpp-no-need-to-define-ELF-32-64-_ST_TYPE-on-.patch} (89%) rename packages/openjdk-21/{0028-os-linux-add-getloadavg-implementation-for-android.patch => 0027-os-linux-add-getloadavg-implementation-for-android.patch} (88%) rename packages/openjdk-21/{0029-os-linux-use-getpagesize-instad-of-SHMLBA.patch => 0028-os-linux-use-getpagesize-instad-of-SHMLBA.patch} (89%) rename packages/openjdk-21/{0030-libjava-change-return-type-of-strerror_r.patch => 0029-libjava-change-return-type-of-strerror_r.patch} (94%) rename packages/openjdk-21/{0031-make-cflags-handle-arm-like-other-arches.patch => 0030-make-cflags-handle-arm-like-other-arches.patch} (87%) rename packages/openjdk-21/{0032-Fix-bugs-in-File.getCanonicalPath.patch => 0031-Fix-bugs-in-File.getCanonicalPath.patch} (98%) rename packages/openjdk-21/{0033-JvmMapfile.gmk-filter-same-symbols-for-linux-and-and.patch => 0032-JvmMapfile.gmk-filter-same-symbols-for-linux-and-and.patch} (100%) rename packages/openjdk-21/{0034-Fix-build-with-lld-17.patch => 0033-Fix-build-with-lld-17.patch} (100%) rename packages/openjdk-21/{0035-make-autoconf-define-ARM-for-arm-build-with-clang.patch => 0034-make-autoconf-define-ARM-for-arm-build-with-clang.patch} (89%) rename packages/openjdk-21/{0036-hotspot-os_linux-do-not-use-dlinfo-and-RTLD_DI_LINKM.patch => 0035-hotspot-os_linux-do-not-use-dlinfo-and-RTLD_DI_LINKM.patch} (85%) rename packages/openjdk-21/{0037-OUTTREE-bionic-type-redef-fix.patch => 0036-OUTTREE-bionic-type-redef-fix.patch} (88%) rename packages/openjdk-21/{0038-Fix-hardcoded-paths-in-jdk.attach.patch => 0037-Fix-hardcoded-paths-in-jdk.attach.patch} (88%) rename packages/openjdk-21/{0039-Do-not-disable-new-dtags.patch => 0038-Do-not-disable-new-dtags.patch} (87%) rename packages/openjdk-21/{0040-disable-statx-syscall.patch => 0039-disable-statx-syscall.patch} (89%) create mode 100644 packages/openjdk-21/0040-android-Prevent-build-of-libsaproc.patch diff --git a/packages/openjdk-21/0001-libinet-include-netinet-in.h-for-android-builds.patch b/packages/openjdk-21/0001-libinet-include-netinet-in.h-for-android-builds.patch index 1859a870368f245..19e384dc6ffade6 100644 --- a/packages/openjdk-21/0001-libinet-include-netinet-in.h-for-android-builds.patch +++ b/packages/openjdk-21/0001-libinet-include-netinet-in.h-for-android-builds.patch @@ -22,5 +22,5 @@ index 902cf96732f..e74b6265b5d 100644 #include #include -- -2.50.0 +2.50.1 diff --git a/packages/openjdk-21/0002-os_linux-add-android-checks-and-fixes.patch b/packages/openjdk-21/0002-os_linux-add-android-checks-and-fixes.patch index 95f1deee725f634..9e29a38bc514501 100644 --- a/packages/openjdk-21/0002-os_linux-add-android-checks-and-fixes.patch +++ b/packages/openjdk-21/0002-os_linux-add-android-checks-and-fixes.patch @@ -39,5 +39,5 @@ index 5ebd57fb300..77057c1d39c 100644 ///////////////////////////////////////////////////////////////////////////// -- -2.50.0 +2.50.1 diff --git a/packages/openjdk-21/0003-Define-sys-gettid-on-arm-and-aarch64.patch b/packages/openjdk-21/0003-Define-sys-gettid-on-arm-and-aarch64.patch index 97140a14b9463d7..82d370794309864 100644 --- a/packages/openjdk-21/0003-Define-sys-gettid-on-arm-and-aarch64.patch +++ b/packages/openjdk-21/0003-Define-sys-gettid-on-arm-and-aarch64.patch @@ -35,5 +35,5 @@ index 77057c1d39c..04bee9e5ff3 100644 #error define gettid for the arch #endif -- -2.50.0 +2.50.1 diff --git a/packages/openjdk-21/0004-Disable-posix-print-uptime-overridden-by-linux.patch b/packages/openjdk-21/0004-Disable-posix-print-uptime-overridden-by-linux.patch index 7374fd62acda9ac..fa7c4ce965e1ba6 100644 --- a/packages/openjdk-21/0004-Disable-posix-print-uptime-overridden-by-linux.patch +++ b/packages/openjdk-21/0004-Disable-posix-print-uptime-overridden-by-linux.patch @@ -38,5 +38,5 @@ index 7f95560a19e..6bac1d4edc2 100644 static void print_rlimit(outputStream* st, const char* msg, -- -2.50.0 +2.50.1 diff --git a/packages/openjdk-21/0006-Link-against-system-libiconv.patch b/packages/openjdk-21/0005-Link-against-system-libiconv.patch similarity index 92% rename from packages/openjdk-21/0006-Link-against-system-libiconv.patch rename to packages/openjdk-21/0005-Link-against-system-libiconv.patch index 029038ba27a02ec..bc0f080ea1fc1a7 100644 --- a/packages/openjdk-21/0006-Link-against-system-libiconv.patch +++ b/packages/openjdk-21/0005-Link-against-system-libiconv.patch @@ -1,7 +1,7 @@ -From b464de6f87da8c7d4d25a965ebf94ff963ba0b18 Mon Sep 17 00:00:00 2001 +From 07f38091c2cc90526d2112e7ff29d8e8696387f4 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Fri, 3 Feb 2023 11:09:10 +0100 -Subject: [PATCH 06/40] Link against system libiconv +Subject: [PATCH 05/40] Link against system libiconv --- make/modules/java.instrument/Lib.gmk | 2 +- @@ -35,5 +35,5 @@ index ba694f50e1b..9631bf239f7 100644 LIBS_aix := -liconv, \ )) -- -2.50.0 +2.50.1 diff --git a/packages/openjdk-21/0005-android-prevent-build-of-libjsound-and-libsa.patch b/packages/openjdk-21/0005-android-prevent-build-of-libjsound-and-libsa.patch deleted file mode 100644 index d53a347ed8a4806..000000000000000 --- a/packages/openjdk-21/0005-android-prevent-build-of-libjsound-and-libsa.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 511c74a42767a438af8489ab1d88d561b80a0498 Mon Sep 17 00:00:00 2001 -From: Henrik Grimler -Date: Fri, 3 Feb 2023 11:06:24 +0100 -Subject: [PATCH 05/40] android: prevent build of libjsound and libsa - ---- - make/modules/java.desktop/Lib.gmk | 2 -- - make/modules/jdk.hotspot.agent/Lib.gmk | 2 -- - 2 files changed, 4 deletions(-) - -diff --git a/make/modules/java.desktop/Lib.gmk b/make/modules/java.desktop/Lib.gmk -index be1ac3f1fb8..069c1b46da6 100644 ---- a/make/modules/java.desktop/Lib.gmk -+++ b/make/modules/java.desktop/Lib.gmk -@@ -76,8 +76,6 @@ ifeq ($(call isTargetOs, aix), false) - - $(BUILD_LIBJSOUND): $(call FindLib, java.base, java) - -- TARGETS += $(BUILD_LIBJSOUND) -- - endif - - ################################################################################ -diff --git a/make/modules/jdk.hotspot.agent/Lib.gmk b/make/modules/jdk.hotspot.agent/Lib.gmk -index d21c969c188..ca7a8988a2b 100644 ---- a/make/modules/jdk.hotspot.agent/Lib.gmk -+++ b/make/modules/jdk.hotspot.agent/Lib.gmk -@@ -77,6 +77,4 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBSA, \ - LIBS_windows := dbgeng.lib $(WIN_JAVA_LIB), \ - )) - --TARGETS += $(BUILD_LIBSA) -- - ################################################################################ --- -2.50.0 - diff --git a/packages/openjdk-21/0007-aarch64_get_thread_helper-Thread-current.patch b/packages/openjdk-21/0006-aarch64_get_thread_helper-Thread-current.patch similarity index 89% rename from packages/openjdk-21/0007-aarch64_get_thread_helper-Thread-current.patch rename to packages/openjdk-21/0006-aarch64_get_thread_helper-Thread-current.patch index b966e0425ce5f8f..9819ff4776e5426 100644 --- a/packages/openjdk-21/0007-aarch64_get_thread_helper-Thread-current.patch +++ b/packages/openjdk-21/0006-aarch64_get_thread_helper-Thread-current.patch @@ -1,7 +1,7 @@ -From 55c385abc94cfbc9e92ce089b3a17c9e1cfdf418 Mon Sep 17 00:00:00 2001 +From 094e18a447354548e9038f8dcbe5dd9124135516 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Thu, 10 Jun 2021 08:45:16 +0700 -Subject: [PATCH 07/40] aarch64_get_thread_helper() -> Thread::current() +Subject: [PATCH 06/40] aarch64_get_thread_helper() -> Thread::current() Can't build for Android: @@ -32,5 +32,5 @@ index c6e012ecfdd..b19468fd0c4 100644 #endif // OS_CPU_LINUX_AARCH64_JAVATHREAD_LINUX_AARCH64_HPP -- -2.50.0 +2.50.1 diff --git a/packages/openjdk-21/0008-Remove-aarch64_get_thread_helper.patch b/packages/openjdk-21/0007-Remove-aarch64_get_thread_helper.patch similarity index 89% rename from packages/openjdk-21/0008-Remove-aarch64_get_thread_helper.patch rename to packages/openjdk-21/0007-Remove-aarch64_get_thread_helper.patch index 258cc7ae8f036cc..2d53f394d2e61ea 100644 --- a/packages/openjdk-21/0008-Remove-aarch64_get_thread_helper.patch +++ b/packages/openjdk-21/0007-Remove-aarch64_get_thread_helper.patch @@ -1,7 +1,7 @@ -From f92b331cd7a93e2aefb01f3234b5f15242b9d888 Mon Sep 17 00:00:00 2001 +From 5b02a238fa185fad337528bca0988e2116cb65dd Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Thu, 10 Jun 2021 08:46:35 +0700 -Subject: [PATCH 08/40] Remove aarch64_get_thread_helper() +Subject: [PATCH 07/40] Remove aarch64_get_thread_helper() See commit 6f407090fda1 ("aarch64_get_thread_helper() -> Thread::current()") for more details. @@ -27,5 +27,5 @@ index ac60d6aa941..0645f0e005e 100644 .size _ZN10JavaThread25aarch64_get_thread_helperEv, .-_ZN10JavaThread25aarch64_get_thread_helperEv +#endif -- -2.50.0 +2.50.1 diff --git a/packages/openjdk-21/0009-Use-Android-s-strerror_r.patch b/packages/openjdk-21/0008-Use-Android-s-strerror_r.patch similarity index 88% rename from packages/openjdk-21/0009-Use-Android-s-strerror_r.patch rename to packages/openjdk-21/0008-Use-Android-s-strerror_r.patch index 50f6efc3b649bbd..6270aa874febb76 100644 --- a/packages/openjdk-21/0009-Use-Android-s-strerror_r.patch +++ b/packages/openjdk-21/0008-Use-Android-s-strerror_r.patch @@ -1,7 +1,7 @@ -From a832c53829edff3a34ad7c63ad451f9a479d429d Mon Sep 17 00:00:00 2001 +From 5db3bc8d40aaf7f463ed8bb24bdd1f2a18696f04 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Thu, 10 Jun 2021 09:36:26 +0700 -Subject: [PATCH 09/40] Use Android's strerror_r() +Subject: [PATCH 08/40] Use Android's strerror_r() --- src/java.base/unix/native/libjava/jni_util_md.c | 7 ------- @@ -26,5 +26,5 @@ index 32b477aa7ac..06d5501a807 100644 static void *procHandle = NULL; if (procHandle != NULL) { -- -2.50.0 +2.50.1 diff --git a/packages/openjdk-21/0010-Use-utimensat-on-android.patch b/packages/openjdk-21/0009-Use-utimensat-on-android.patch similarity index 97% rename from packages/openjdk-21/0010-Use-utimensat-on-android.patch rename to packages/openjdk-21/0009-Use-utimensat-on-android.patch index ee9abbc4e740be9..890ef947b9f0fe8 100644 --- a/packages/openjdk-21/0010-Use-utimensat-on-android.patch +++ b/packages/openjdk-21/0009-Use-utimensat-on-android.patch @@ -1,7 +1,7 @@ -From bc9f7a9d77eafc4345421a9b7c3d188b82a881dd Mon Sep 17 00:00:00 2001 +From fd9f1d19464a5e9f057661bc157dc3b70408da77 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Thu, 10 Jun 2021 16:42:56 +0700 -Subject: [PATCH 10/40] Use utimensat on android +Subject: [PATCH 09/40] Use utimensat on android --- .../native/libnio/fs/UnixNativeDispatcher.c | 22 ++++++++++++++----- @@ -81,5 +81,5 @@ index 9499bae2dcb..f97b4a2fa1d 100644 if (err == -1) { throwUnixException(env, errno); -- -2.50.0 +2.50.1 diff --git a/packages/openjdk-21/0011-Fixed-Java_sun_nio_fs_UnixNativeDispatcher_futimes.patch b/packages/openjdk-21/0010-Fixed-Java_sun_nio_fs_UnixNativeDispatcher_futimes.patch similarity index 93% rename from packages/openjdk-21/0011-Fixed-Java_sun_nio_fs_UnixNativeDispatcher_futimes.patch rename to packages/openjdk-21/0010-Fixed-Java_sun_nio_fs_UnixNativeDispatcher_futimes.patch index a9f5013193d68ce..d06d3a31b48e364 100644 --- a/packages/openjdk-21/0011-Fixed-Java_sun_nio_fs_UnixNativeDispatcher_futimes.patch +++ b/packages/openjdk-21/0010-Fixed-Java_sun_nio_fs_UnixNativeDispatcher_futimes.patch @@ -1,7 +1,7 @@ -From 0d135aacba52a406e146d232fc402cbfeaa9228e Mon Sep 17 00:00:00 2001 +From 09f92103742c681eea12b31ca7bd8047bd6d0a59 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Thu, 10 Jun 2021 18:36:56 +0700 -Subject: [PATCH 11/40] Fixed Java_sun_nio_fs_UnixNativeDispatcher_futimes +Subject: [PATCH 10/40] Fixed Java_sun_nio_fs_UnixNativeDispatcher_futimes --- .../unix/native/libnio/fs/UnixNativeDispatcher.c | 11 ++++++----- @@ -43,5 +43,5 @@ index f97b4a2fa1d..e470bbc4e03 100644 #endif if (err == -1) { -- -2.50.0 +2.50.1 diff --git a/packages/openjdk-21/0012-Add-CXXFLAGS_JDKLIB-to-CXXFLAGS.patch b/packages/openjdk-21/0011-Add-CXXFLAGS_JDKLIB-to-CXXFLAGS.patch similarity index 92% rename from packages/openjdk-21/0012-Add-CXXFLAGS_JDKLIB-to-CXXFLAGS.patch rename to packages/openjdk-21/0011-Add-CXXFLAGS_JDKLIB-to-CXXFLAGS.patch index b697eb35f461e75..3fd303db0961cc4 100644 --- a/packages/openjdk-21/0012-Add-CXXFLAGS_JDKLIB-to-CXXFLAGS.patch +++ b/packages/openjdk-21/0011-Add-CXXFLAGS_JDKLIB-to-CXXFLAGS.patch @@ -1,7 +1,7 @@ -From a35c17767b0228a062b6353dd8e3c695942d3e70 Mon Sep 17 00:00:00 2001 +From 475cb3fe6b6fd8a12d21aeb35d2e28275499da37 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Thu, 10 Jun 2021 19:23:03 +0700 -Subject: [PATCH 12/40] Add CXXFLAGS_JDKLIB to CXXFLAGS +Subject: [PATCH 11/40] Add CXXFLAGS_JDKLIB to CXXFLAGS For modules jdk.jdwp.agent and java.instrument. --- @@ -34,5 +34,5 @@ index 9631bf239f7..ae889b6f582 100644 include \ libjdwp/export, \ -- -2.50.0 +2.50.1 diff --git a/packages/openjdk-21/0013-Use-ASCII-codeset-on-android.patch b/packages/openjdk-21/0012-Use-ASCII-codeset-on-android.patch similarity index 93% rename from packages/openjdk-21/0013-Use-ASCII-codeset-on-android.patch rename to packages/openjdk-21/0012-Use-ASCII-codeset-on-android.patch index 11fb2a7c8869bd4..082b2cfd0b9eb5e 100644 --- a/packages/openjdk-21/0013-Use-ASCII-codeset-on-android.patch +++ b/packages/openjdk-21/0012-Use-ASCII-codeset-on-android.patch @@ -1,7 +1,7 @@ -From 10e8861d94c2656e68825f2c9c6bd449f68d66ab Mon Sep 17 00:00:00 2001 +From 7b8ef593e9a4e7107688273e2494a03865b8e56c Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Thu, 10 Jun 2021 20:42:40 +0700 -Subject: [PATCH 13/40] Use ASCII codeset on android +Subject: [PATCH 12/40] Use ASCII codeset on android Since android's locale support is very rudimentary. --- @@ -42,5 +42,5 @@ index f5573930d34..b64e30046d3 100644 if (codeset == NULL) { -- -2.50.0 +2.50.1 diff --git a/packages/openjdk-21/0014-Fix-libjvm.so-path-when-run-from-Android-app.patch b/packages/openjdk-21/0013-Fix-libjvm.so-path-when-run-from-Android-app.patch similarity index 95% rename from packages/openjdk-21/0014-Fix-libjvm.so-path-when-run-from-Android-app.patch rename to packages/openjdk-21/0013-Fix-libjvm.so-path-when-run-from-Android-app.patch index 524e2394824c34a..fdc23bc4ced65f5 100644 --- a/packages/openjdk-21/0014-Fix-libjvm.so-path-when-run-from-Android-app.patch +++ b/packages/openjdk-21/0013-Fix-libjvm.so-path-when-run-from-Android-app.patch @@ -1,7 +1,7 @@ -From ba9d61796887a2238dcf9843d4e7d1810dc35deb Mon Sep 17 00:00:00 2001 +From 34145419ef9781d9b3ffab94d7cc660637dfe78a Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Fri, 11 Jun 2021 07:48:28 +0700 -Subject: [PATCH 14/40] Fix libjvm.so path when run from Android app +Subject: [PATCH 13/40] Fix libjvm.so path when run from Android app --- src/java.base/unix/native/libjli/java_md.c | 49 ++++++++++++++++++++++ @@ -68,5 +68,5 @@ index d2c04d8c25d..ba600daddec 100644 { /* Not implemented */ -- -2.50.0 +2.50.1 diff --git a/packages/openjdk-21/0015-arm-cast-address-to-char-when-clearing-cache.patch b/packages/openjdk-21/0014-arm-cast-address-to-char-when-clearing-cache.patch similarity index 83% rename from packages/openjdk-21/0015-arm-cast-address-to-char-when-clearing-cache.patch rename to packages/openjdk-21/0014-arm-cast-address-to-char-when-clearing-cache.patch index 66ac97283af34c9..bb3fc01001177a7 100644 --- a/packages/openjdk-21/0015-arm-cast-address-to-char-when-clearing-cache.patch +++ b/packages/openjdk-21/0014-arm-cast-address-to-char-when-clearing-cache.patch @@ -1,7 +1,7 @@ -From 77578ca9c214819ade267c018a14d2e0c0cfd11c Mon Sep 17 00:00:00 2001 +From 33ad7926d63078cb26e491a0c6361dd0fd7a1cf8 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Sat, 12 Jun 2021 06:55:18 +0700 -Subject: [PATCH 15/40] arm: cast address to char when clearing cache +Subject: [PATCH 14/40] arm: cast address to char when clearing cache --- src/hotspot/cpu/arm/icache_arm.cpp | 2 +- @@ -21,5 +21,5 @@ index 61fcb8a3580..93d2ad4f494 100644 } -- -2.50.0 +2.50.1 diff --git a/packages/openjdk-21/0016-Don-t-run-fpu_control-related-functions-on-Android.patch b/packages/openjdk-21/0015-Don-t-run-fpu_control-related-functions-on-Android.patch similarity index 94% rename from packages/openjdk-21/0016-Don-t-run-fpu_control-related-functions-on-Android.patch rename to packages/openjdk-21/0015-Don-t-run-fpu_control-related-functions-on-Android.patch index ac26ee9d390b1a1..48a04c0a32750d2 100644 --- a/packages/openjdk-21/0016-Don-t-run-fpu_control-related-functions-on-Android.patch +++ b/packages/openjdk-21/0015-Don-t-run-fpu_control-related-functions-on-Android.patch @@ -1,7 +1,7 @@ -From c75f58fe006c640e9704983a2689e51bb3eee1e9 Mon Sep 17 00:00:00 2001 +From b87c85a3c08ba167e262fba0f407c1f13480ba82 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Sat, 12 Jun 2021 06:58:20 +0700 -Subject: [PATCH 16/40] Don't run fpu_control related functions on Android +Subject: [PATCH 15/40] Don't run fpu_control related functions on Android --- src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp | 2 ++ @@ -71,5 +71,5 @@ index 30d546508e2..c912e8d122c 100644 __asm__ volatile ( "fldcw (%0)" : : "r" (fpu_cntrl) : "memory"); -- -2.50.0 +2.50.1 diff --git a/packages/openjdk-21/0017-Libfontmanager-link-against-libawt-to-fix-link-error.patch b/packages/openjdk-21/0016-Libfontmanager-link-against-libawt-to-fix-link-error.patch similarity index 91% rename from packages/openjdk-21/0017-Libfontmanager-link-against-libawt-to-fix-link-error.patch rename to packages/openjdk-21/0016-Libfontmanager-link-against-libawt-to-fix-link-error.patch index f211b9ed6a88e97..f0b73f5752b37ca 100644 --- a/packages/openjdk-21/0017-Libfontmanager-link-against-libawt-to-fix-link-error.patch +++ b/packages/openjdk-21/0016-Libfontmanager-link-against-libawt-to-fix-link-error.patch @@ -1,7 +1,7 @@ -From 2251e288212f39b2dec98d62d866e3bb184dd853 Mon Sep 17 00:00:00 2001 +From e76f6e247dae62a0b0d50cacaf9a5cedb6fcb4ca Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Sat, 12 Jun 2021 17:03:05 +0700 -Subject: [PATCH 17/40] Libfontmanager: link against libawt to fix link error +Subject: [PATCH 16/40] Libfontmanager: link against libawt to fix link error Partly based on commit from androidports: https://github.com/androidports/openjdk/commit/a3e4f0281154537f01c2e59286a6ceed9c827b11 @@ -30,5 +30,5 @@ index f0c92ee094f..64942a85aa4 100644 ifeq ($(call isTargetOs, macosx), true) $(BUILD_LIBFONTMANAGER): $(call FindLib, $(MODULE), awt_lwawt) -- -2.50.0 +2.50.1 diff --git a/packages/openjdk-21/0018-Try-to-get-libjvm.so-path-from-proc-self-maps-on-and.patch b/packages/openjdk-21/0017-Try-to-get-libjvm.so-path-from-proc-self-maps-on-and.patch similarity index 95% rename from packages/openjdk-21/0018-Try-to-get-libjvm.so-path-from-proc-self-maps-on-and.patch rename to packages/openjdk-21/0017-Try-to-get-libjvm.so-path-from-proc-self-maps-on-and.patch index 2ec4afa8c6bad8f..d1fc9abfd85e488 100644 --- a/packages/openjdk-21/0018-Try-to-get-libjvm.so-path-from-proc-self-maps-on-and.patch +++ b/packages/openjdk-21/0017-Try-to-get-libjvm.so-path-from-proc-self-maps-on-and.patch @@ -1,7 +1,7 @@ -From ebe7bef9eaba9a1da97a90fcae8e60054574c245 Mon Sep 17 00:00:00 2001 +From b06422b658c5673ab93f9e9fca514a93bd573ea8 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Fri, 25 Jun 2021 17:19:24 +0700 -Subject: [PATCH 18/40] Try to get libjvm.so path from /proc/self/maps on +Subject: [PATCH 17/40] Try to get libjvm.so path from /proc/self/maps on android --- @@ -85,5 +85,5 @@ index 04bee9e5ff3..25ad8934d4e 100644 strncpy(saved_jvm_path, buf, MAXPATHLEN); saved_jvm_path[MAXPATHLEN - 1] = '\0'; -- -2.50.0 +2.50.1 diff --git a/packages/openjdk-21/0019-Warn-instead-of-exiting-if-getcpu-2-is-unsupported.patch b/packages/openjdk-21/0018-Warn-instead-of-exiting-if-getcpu-2-is-unsupported.patch similarity index 84% rename from packages/openjdk-21/0019-Warn-instead-of-exiting-if-getcpu-2-is-unsupported.patch rename to packages/openjdk-21/0018-Warn-instead-of-exiting-if-getcpu-2-is-unsupported.patch index a5222d5cabe6f4c..0ad9da5d0845bca 100644 --- a/packages/openjdk-21/0019-Warn-instead-of-exiting-if-getcpu-2-is-unsupported.patch +++ b/packages/openjdk-21/0018-Warn-instead-of-exiting-if-getcpu-2-is-unsupported.patch @@ -1,7 +1,7 @@ -From 85b2e41ce6a8908837328ba16bec032691086690 Mon Sep 17 00:00:00 2001 +From 5aa1e197cc265faff035682254098a17bec02e0a Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Mon, 28 Jun 2021 17:47:31 +0700 -Subject: [PATCH 19/40] Warn instead of exiting if getcpu(2) is unsupported +Subject: [PATCH 18/40] Warn instead of exiting if getcpu(2) is unsupported --- src/hotspot/os/linux/os_linux.cpp | 3 ++- @@ -22,5 +22,5 @@ index 25ad8934d4e..45014f0b176 100644 } -- -2.50.0 +2.50.1 diff --git a/packages/openjdk-21/0020-Remove-pre-UAL-aliases.patch b/packages/openjdk-21/0019-Remove-pre-UAL-aliases.patch similarity index 97% rename from packages/openjdk-21/0020-Remove-pre-UAL-aliases.patch rename to packages/openjdk-21/0019-Remove-pre-UAL-aliases.patch index bf916e057750c0e..0a43a8db0989610 100644 --- a/packages/openjdk-21/0020-Remove-pre-UAL-aliases.patch +++ b/packages/openjdk-21/0019-Remove-pre-UAL-aliases.patch @@ -1,7 +1,7 @@ -From e0a685dc429b3cc40ec19c2e5e0c75b3bd737faa Mon Sep 17 00:00:00 2001 +From 4393e5370761d64084a53b2a31af5268308d24f5 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Wed, 30 Jun 2021 14:28:14 +0700 -Subject: [PATCH 20/40] Remove pre-UAL aliases +Subject: [PATCH 19/40] Remove pre-UAL aliases --- src/hotspot/os_cpu/linux_arm/linux_arm_32.S | 40 ++++++++++----------- @@ -132,5 +132,5 @@ index eb560d8f0c7..be8da136ba2 100644 cmp r2, #16 blt cl_b2f_copy_8 -- -2.50.0 +2.50.1 diff --git a/packages/openjdk-21/0021-arm-fix-assembly-in-os_linux_arm.cpp.patch b/packages/openjdk-21/0020-arm-fix-assembly-in-os_linux_arm.cpp.patch similarity index 85% rename from packages/openjdk-21/0021-arm-fix-assembly-in-os_linux_arm.cpp.patch rename to packages/openjdk-21/0020-arm-fix-assembly-in-os_linux_arm.cpp.patch index 34bd9e7d3291def..b81d30da21414d9 100644 --- a/packages/openjdk-21/0021-arm-fix-assembly-in-os_linux_arm.cpp.patch +++ b/packages/openjdk-21/0020-arm-fix-assembly-in-os_linux_arm.cpp.patch @@ -1,7 +1,7 @@ -From 3ac9e292433c5a566cf833c68fc42bf40bea5848 Mon Sep 17 00:00:00 2001 +From b70466b9377643b37b0e4158768f13de67b37b77 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Wed, 30 Jun 2021 14:30:02 +0700 -Subject: [PATCH 21/40] arm: fix assembly in os_linux_arm.cpp +Subject: [PATCH 20/40] arm: fix assembly in os_linux_arm.cpp --- src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp | 4 ++-- @@ -23,5 +23,5 @@ index 046e5e3eca5..c136e2981df 100644 ); #endif -- -2.50.0 +2.50.1 diff --git a/packages/openjdk-21/0022-Add-workaround-for-tagged-pointers-on-Android-12.patch b/packages/openjdk-21/0021-Add-workaround-for-tagged-pointers-on-Android-12.patch similarity index 93% rename from packages/openjdk-21/0022-Add-workaround-for-tagged-pointers-on-Android-12.patch rename to packages/openjdk-21/0021-Add-workaround-for-tagged-pointers-on-Android-12.patch index 1142d59b07b2f76..be283a80ab4a828 100644 --- a/packages/openjdk-21/0022-Add-workaround-for-tagged-pointers-on-Android-12.patch +++ b/packages/openjdk-21/0021-Add-workaround-for-tagged-pointers-on-Android-12.patch @@ -1,7 +1,7 @@ -From 0030babd8d4c0eeade2af3627aa070df686feb5c Mon Sep 17 00:00:00 2001 +From 5be5306a1499ec51a808ba453b011c892812cf97 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Fri, 3 Feb 2023 11:32:40 +0100 -Subject: [PATCH 22/40] Add workaround for tagged pointers on Android 12 +Subject: [PATCH 21/40] Add workaround for tagged pointers on Android 12 Co-authored-by: dev-bz <32380878+dev-bz@users.noreply.github.com> --- @@ -55,5 +55,5 @@ index 3b4a15bac5b..514291c5811 100644 DumpState(); if (JLI_IsTraceLauncher()) { -- -2.50.0 +2.50.1 diff --git a/packages/openjdk-21/0023-x86-always-compile-with-PIC.patch b/packages/openjdk-21/0022-x86-always-compile-with-PIC.patch similarity index 93% rename from packages/openjdk-21/0023-x86-always-compile-with-PIC.patch rename to packages/openjdk-21/0022-x86-always-compile-with-PIC.patch index d6bac90b3c2bc5c..039344520a0fe3e 100644 --- a/packages/openjdk-21/0023-x86-always-compile-with-PIC.patch +++ b/packages/openjdk-21/0022-x86-always-compile-with-PIC.patch @@ -1,7 +1,7 @@ -From a12b0dcb1cc5c6ab8e40af3166d47ee044f2e653 Mon Sep 17 00:00:00 2001 +From 765d3650f11009d3b7586d8080d273236f06ae23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BA=AF=E6=B4=84?= <1840686745@qq.com> Date: Thu, 26 Aug 2021 14:00:54 +0800 -Subject: [PATCH 23/40] x86: always compile with PIC +Subject: [PATCH 22/40] x86: always compile with PIC --- make/hotspot/lib/JvmOverrideFiles.gmk | 18 ------------------ @@ -37,5 +37,5 @@ index b50d6f8bb36..a962649a9ca 100644 # The copied fdlibm routines in these files must not be optimized BUILD_LIBJVM_sharedRuntimeTrig.cpp_CXXFLAGS := $(FDLIBM_CFLAGS) $(LIBJVM_FDLIBM_COPY_OPT_FLAG) -- -2.50.0 +2.50.1 diff --git a/packages/openjdk-21/0024-Fix-StackOverflowError-on-ARM.patch b/packages/openjdk-21/0023-Fix-StackOverflowError-on-ARM.patch similarity index 86% rename from packages/openjdk-21/0024-Fix-StackOverflowError-on-ARM.patch rename to packages/openjdk-21/0023-Fix-StackOverflowError-on-ARM.patch index 7c16473e6096d65..5545339048b6bc9 100644 --- a/packages/openjdk-21/0024-Fix-StackOverflowError-on-ARM.patch +++ b/packages/openjdk-21/0023-Fix-StackOverflowError-on-ARM.patch @@ -1,7 +1,7 @@ -From 9b4a6ce8b7cc8f7627273e54e09c9d0cca8312af Mon Sep 17 00:00:00 2001 +From 898a25ae638bc1035dddbf831fdfd7e53bf9fb51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BA=AF=E6=B4=84?= <1840686745@qq.com> Date: Thu, 26 Aug 2021 03:53:25 +0800 -Subject: [PATCH 24/40] Fix StackOverflowError on ARM +Subject: [PATCH 23/40] Fix StackOverflowError on ARM --- src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp | 6 ++++++ @@ -27,5 +27,5 @@ index c136e2981df..0358bb8739a 100644 char* os::non_memory_address_word() { -- -2.50.0 +2.50.1 diff --git a/packages/openjdk-21/0025-android-dlvsym-is-available-if-ANDROID_API-24.patch b/packages/openjdk-21/0024-android-dlvsym-is-available-if-ANDROID_API-24.patch similarity index 84% rename from packages/openjdk-21/0025-android-dlvsym-is-available-if-ANDROID_API-24.patch rename to packages/openjdk-21/0024-android-dlvsym-is-available-if-ANDROID_API-24.patch index 399fd1b3212e3a1..59e893dca8b64f3 100644 --- a/packages/openjdk-21/0025-android-dlvsym-is-available-if-ANDROID_API-24.patch +++ b/packages/openjdk-21/0024-android-dlvsym-is-available-if-ANDROID_API-24.patch @@ -1,7 +1,7 @@ -From fe01c8a84d50ee0a247ea3e9eef4baa99356659a Mon Sep 17 00:00:00 2001 +From 0ccd9748f93d11432725d32131747fb0b6674e7b Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Fri, 3 Feb 2023 11:50:57 +0100 -Subject: [PATCH 25/40] android: dlvsym is available if ANDROID_API >= 24 +Subject: [PATCH 24/40] android: dlvsym is available if ANDROID_API >= 24 --- src/hotspot/os/linux/os_linux.cpp | 2 +- @@ -21,5 +21,5 @@ index 45014f0b176..a753cb52221 100644 // and musl libc doesn't implement it. static void *dlvsym(void *handle, -- -2.50.0 +2.50.1 diff --git a/packages/openjdk-21/0026-Update-hardcoded-paths-to-work-in-termux.patch b/packages/openjdk-21/0025-Update-hardcoded-paths-to-work-in-termux.patch similarity index 99% rename from packages/openjdk-21/0026-Update-hardcoded-paths-to-work-in-termux.patch rename to packages/openjdk-21/0025-Update-hardcoded-paths-to-work-in-termux.patch index 7cc2755d6a3baa3..01eb361553dd957 100644 --- a/packages/openjdk-21/0026-Update-hardcoded-paths-to-work-in-termux.patch +++ b/packages/openjdk-21/0025-Update-hardcoded-paths-to-work-in-termux.patch @@ -1,7 +1,7 @@ -From 57d9085478249a915a1778da343b1b46a3f66c0a Mon Sep 17 00:00:00 2001 +From 84b3745a2a0ee53d09787887cfa9dc012c3a2016 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Tue, 6 Jul 2021 18:29:24 +0700 -Subject: [PATCH 26/40] Update hardcoded paths to work in termux +Subject: [PATCH 25/40] Update hardcoded paths to work in termux --- src/hotspot/os/linux/os_linux.cpp | 10 +++++-- @@ -557,5 +557,5 @@ index 1ed96076282..7673dc0e9b4 100644 done } -- -2.50.0 +2.50.1 diff --git a/packages/openjdk-21/0027-elfFile.hpp-no-need-to-define-ELF-32-64-_ST_TYPE-on-.patch b/packages/openjdk-21/0026-elfFile.hpp-no-need-to-define-ELF-32-64-_ST_TYPE-on-.patch similarity index 89% rename from packages/openjdk-21/0027-elfFile.hpp-no-need-to-define-ELF-32-64-_ST_TYPE-on-.patch rename to packages/openjdk-21/0026-elfFile.hpp-no-need-to-define-ELF-32-64-_ST_TYPE-on-.patch index 97f2856443cb77f..9e9001204e0dbdc 100644 --- a/packages/openjdk-21/0027-elfFile.hpp-no-need-to-define-ELF-32-64-_ST_TYPE-on-.patch +++ b/packages/openjdk-21/0026-elfFile.hpp-no-need-to-define-ELF-32-64-_ST_TYPE-on-.patch @@ -1,7 +1,7 @@ -From 79670895c1d7b9c91995ae8dccd2c09bb6f1c4fc Mon Sep 17 00:00:00 2001 +From 658761e4e21e68d6177996c38397d3b0e1afe015 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sat, 4 Feb 2023 22:45:13 +0100 -Subject: [PATCH 27/40] elfFile.hpp: no need to define ELF{32,64}_ST_TYPE on +Subject: [PATCH 26/40] elfFile.hpp: no need to define ELF{32,64}_ST_TYPE on android As the elf.h header already provides defintions. @@ -32,5 +32,5 @@ index 579837ebf80..ac13e345aee 100644 #endif #endif -- -2.50.0 +2.50.1 diff --git a/packages/openjdk-21/0028-os-linux-add-getloadavg-implementation-for-android.patch b/packages/openjdk-21/0027-os-linux-add-getloadavg-implementation-for-android.patch similarity index 88% rename from packages/openjdk-21/0028-os-linux-add-getloadavg-implementation-for-android.patch rename to packages/openjdk-21/0027-os-linux-add-getloadavg-implementation-for-android.patch index 554c93662bf3ed4..267c851d9052708 100644 --- a/packages/openjdk-21/0028-os-linux-add-getloadavg-implementation-for-android.patch +++ b/packages/openjdk-21/0027-os-linux-add-getloadavg-implementation-for-android.patch @@ -1,7 +1,7 @@ -From 1a56b8e983c2dc2fe825327c81d9b44b4f5f39b2 Mon Sep 17 00:00:00 2001 +From f90953b14db17253864edaa552e3b6308e436331 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 5 Feb 2023 09:14:50 +0100 -Subject: [PATCH 28/40] os: linux: add getloadavg implementation for android +Subject: [PATCH 27/40] os: linux: add getloadavg implementation for android --- src/hotspot/os/linux/os_linux.cpp | 13 +++++++++++++ @@ -33,5 +33,5 @@ index c44280ea2ef..8c04f45c660 100644 // Get the default path to the core file -- -2.50.0 +2.50.1 diff --git a/packages/openjdk-21/0029-os-linux-use-getpagesize-instad-of-SHMLBA.patch b/packages/openjdk-21/0028-os-linux-use-getpagesize-instad-of-SHMLBA.patch similarity index 89% rename from packages/openjdk-21/0029-os-linux-use-getpagesize-instad-of-SHMLBA.patch rename to packages/openjdk-21/0028-os-linux-use-getpagesize-instad-of-SHMLBA.patch index c385b704d51f7f3..0478b60fd2e6e17 100644 --- a/packages/openjdk-21/0029-os-linux-use-getpagesize-instad-of-SHMLBA.patch +++ b/packages/openjdk-21/0028-os-linux-use-getpagesize-instad-of-SHMLBA.patch @@ -1,7 +1,7 @@ -From 83437e5ed3676dd0d931cc04d6ea7902da4d02ab Mon Sep 17 00:00:00 2001 +From 8f2bdb23efe90b2fad93dfa55a81a630c7e84ca8 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 5 Feb 2023 09:21:57 +0100 -Subject: [PATCH 29/40] os: linux: use getpagesize() instad of SHMLBA +Subject: [PATCH 28/40] os: linux: use getpagesize() instad of SHMLBA Since the latter is not defined on android. --- @@ -31,5 +31,5 @@ index 8c04f45c660..f41a83ebeba 100644 return nullptr; } -- -2.50.0 +2.50.1 diff --git a/packages/openjdk-21/0030-libjava-change-return-type-of-strerror_r.patch b/packages/openjdk-21/0029-libjava-change-return-type-of-strerror_r.patch similarity index 94% rename from packages/openjdk-21/0030-libjava-change-return-type-of-strerror_r.patch rename to packages/openjdk-21/0029-libjava-change-return-type-of-strerror_r.patch index 0229346f0be8d01..4e27e53c2f9f908 100644 --- a/packages/openjdk-21/0030-libjava-change-return-type-of-strerror_r.patch +++ b/packages/openjdk-21/0029-libjava-change-return-type-of-strerror_r.patch @@ -1,7 +1,7 @@ -From edf72152b4335bdaac6074c256fda2c5383e043a Mon Sep 17 00:00:00 2001 +From 835395bc6a168a7740dd9254e5fbf991ec85da8f Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 5 Feb 2023 11:47:24 +0100 -Subject: [PATCH 30/40] libjava: change return type of strerror_r +Subject: [PATCH 29/40] libjava: change return type of strerror_r Later versions of android uses the GNU style and returns a char pointer. Adjust jni function to match this. @@ -56,5 +56,5 @@ index 06d5501a807..a494ccc3c38 100644 { if (err == 0 || len < 1) return 0; -- -2.50.0 +2.50.1 diff --git a/packages/openjdk-21/0031-make-cflags-handle-arm-like-other-arches.patch b/packages/openjdk-21/0030-make-cflags-handle-arm-like-other-arches.patch similarity index 87% rename from packages/openjdk-21/0031-make-cflags-handle-arm-like-other-arches.patch rename to packages/openjdk-21/0030-make-cflags-handle-arm-like-other-arches.patch index dbcff2d9f214a19..c9d9b8d502fc80e 100644 --- a/packages/openjdk-21/0031-make-cflags-handle-arm-like-other-arches.patch +++ b/packages/openjdk-21/0030-make-cflags-handle-arm-like-other-arches.patch @@ -1,7 +1,7 @@ -From 9df5cb085f8b191b63137b2aeb91c060d9cfa115 Mon Sep 17 00:00:00 2001 +From e179561dfc899e3382615a2924c625f23167ab98 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Mon, 13 Feb 2023 13:49:47 +0100 -Subject: [PATCH 31/40] make: cflags: handle arm like other arches +Subject: [PATCH 30/40] make: cflags: handle arm like other arches --- make/autoconf/flags-cflags.m4 | 8 +------- @@ -27,5 +27,5 @@ index 1aa827b6139..3b35d00795a 100644 elif test "x$TOOLCHAIN_TYPE" = xxlc; then -- -2.50.0 +2.50.1 diff --git a/packages/openjdk-21/0032-Fix-bugs-in-File.getCanonicalPath.patch b/packages/openjdk-21/0031-Fix-bugs-in-File.getCanonicalPath.patch similarity index 98% rename from packages/openjdk-21/0032-Fix-bugs-in-File.getCanonicalPath.patch rename to packages/openjdk-21/0031-Fix-bugs-in-File.getCanonicalPath.patch index f89e8c55eaf833d..162c295bc2edafa 100644 --- a/packages/openjdk-21/0032-Fix-bugs-in-File.getCanonicalPath.patch +++ b/packages/openjdk-21/0031-Fix-bugs-in-File.getCanonicalPath.patch @@ -1,7 +1,7 @@ -From a8ed3d182be0b6f92f6f95007fc4759fde57caba Mon Sep 17 00:00:00 2001 +From 9ed63fd98dc899a26a4c2596dab529e7ecdee3b5 Mon Sep 17 00:00:00 2001 From: agnostic-apollo Date: Thu, 28 Mar 2024 18:46:02 +0100 -Subject: [PATCH 32/40] Fix bugs in File.getCanonicalPath() +Subject: [PATCH 31/40] Fix bugs in File.getCanonicalPath() 1. If path length is `>= PATH_MAX` (4096) characters, return error. 2. If any path component length is `> NAME_MAX` (255) characters, return @@ -216,5 +216,5 @@ index 1f2cdc46f0c..e2445ee30cd 100644 /* i will be incremented at the top of the loop */ } -- -2.50.0 +2.50.1 diff --git a/packages/openjdk-21/0033-JvmMapfile.gmk-filter-same-symbols-for-linux-and-and.patch b/packages/openjdk-21/0032-JvmMapfile.gmk-filter-same-symbols-for-linux-and-and.patch similarity index 100% rename from packages/openjdk-21/0033-JvmMapfile.gmk-filter-same-symbols-for-linux-and-and.patch rename to packages/openjdk-21/0032-JvmMapfile.gmk-filter-same-symbols-for-linux-and-and.patch diff --git a/packages/openjdk-21/0034-Fix-build-with-lld-17.patch b/packages/openjdk-21/0033-Fix-build-with-lld-17.patch similarity index 100% rename from packages/openjdk-21/0034-Fix-build-with-lld-17.patch rename to packages/openjdk-21/0033-Fix-build-with-lld-17.patch diff --git a/packages/openjdk-21/0035-make-autoconf-define-ARM-for-arm-build-with-clang.patch b/packages/openjdk-21/0034-make-autoconf-define-ARM-for-arm-build-with-clang.patch similarity index 89% rename from packages/openjdk-21/0035-make-autoconf-define-ARM-for-arm-build-with-clang.patch rename to packages/openjdk-21/0034-make-autoconf-define-ARM-for-arm-build-with-clang.patch index f19842039ff55d7..59628a6c8b860f8 100644 --- a/packages/openjdk-21/0035-make-autoconf-define-ARM-for-arm-build-with-clang.patch +++ b/packages/openjdk-21/0034-make-autoconf-define-ARM-for-arm-build-with-clang.patch @@ -1,7 +1,7 @@ -From 562a0619ee79a5d53705b3575cf97dfde4a95810 Mon Sep 17 00:00:00 2001 +From 604aaa784100fdf5232ca128dc24867a78002287 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 31 Mar 2024 12:02:51 +0200 -Subject: [PATCH 35/40] make: autoconf: define ARM for arm build with clang +Subject: [PATCH 34/40] make: autoconf: define ARM for arm build with clang Fixes error like @@ -32,5 +32,5 @@ index 3b35d00795a..1b966e2706e 100644 if test "x$FLAGS_CPU" = xppc64; then $1_CFLAGS_CPU_JVM="-qarch=ppc64" -- -2.50.0 +2.50.1 diff --git a/packages/openjdk-21/0036-hotspot-os_linux-do-not-use-dlinfo-and-RTLD_DI_LINKM.patch b/packages/openjdk-21/0035-hotspot-os_linux-do-not-use-dlinfo-and-RTLD_DI_LINKM.patch similarity index 85% rename from packages/openjdk-21/0036-hotspot-os_linux-do-not-use-dlinfo-and-RTLD_DI_LINKM.patch rename to packages/openjdk-21/0035-hotspot-os_linux-do-not-use-dlinfo-and-RTLD_DI_LINKM.patch index 5b9ac9f433975e8..afb3ceb5c6ad3d2 100644 --- a/packages/openjdk-21/0036-hotspot-os_linux-do-not-use-dlinfo-and-RTLD_DI_LINKM.patch +++ b/packages/openjdk-21/0035-hotspot-os_linux-do-not-use-dlinfo-and-RTLD_DI_LINKM.patch @@ -1,7 +1,7 @@ -From d94a7093a824089f0c5107bf293f484cba58fe60 Mon Sep 17 00:00:00 2001 +From e51f4b12c11505f48a783f91b6d3680f5215e1ad Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 31 Mar 2024 20:20:05 +0200 -Subject: [PATCH 36/40] hotspot: os_linux: do not use dlinfo and +Subject: [PATCH 35/40] hotspot: os_linux: do not use dlinfo and RTLD_DI_LINKMAP on android As they are not available. @@ -28,5 +28,5 @@ index f41a83ebeba..190df2e87ab 100644 } -- -2.50.0 +2.50.1 diff --git a/packages/openjdk-21/0037-OUTTREE-bionic-type-redef-fix.patch b/packages/openjdk-21/0036-OUTTREE-bionic-type-redef-fix.patch similarity index 88% rename from packages/openjdk-21/0037-OUTTREE-bionic-type-redef-fix.patch rename to packages/openjdk-21/0036-OUTTREE-bionic-type-redef-fix.patch index 2622ec9dc44d768..cbadbd6710a3d61 100644 --- a/packages/openjdk-21/0037-OUTTREE-bionic-type-redef-fix.patch +++ b/packages/openjdk-21/0036-OUTTREE-bionic-type-redef-fix.patch @@ -1,7 +1,7 @@ -From 25f824a2435ab98dc8a889613db88c9f195211d5 Mon Sep 17 00:00:00 2001 +From 369eef576b1ad157d613ce4bab7d1779f60f4d04 Mon Sep 17 00:00:00 2001 From: Robert Kirkman <31490854+robertkirkman@users.noreply.github.com> Date: Fri, 11 Jul 2025 14:40:58 +0800 -Subject: [PATCH 37/40] OUTTREE bionic type redef fix +Subject: [PATCH 36/40] OUTTREE bionic type redef fix Co-authored-by: eval Nya <11857526-nexplorer-3e@users.noreply.gitlab.com> --- @@ -22,5 +22,5 @@ index e470bbc4e03..2cd14f259c4 100644 typedef unsigned int __uint32_t; typedef unsigned short __uint16_t; -- -2.50.0 +2.50.1 diff --git a/packages/openjdk-21/0038-Fix-hardcoded-paths-in-jdk.attach.patch b/packages/openjdk-21/0037-Fix-hardcoded-paths-in-jdk.attach.patch similarity index 88% rename from packages/openjdk-21/0038-Fix-hardcoded-paths-in-jdk.attach.patch rename to packages/openjdk-21/0037-Fix-hardcoded-paths-in-jdk.attach.patch index 683bb490d7c3ca5..8ff90c52b4410f2 100644 --- a/packages/openjdk-21/0038-Fix-hardcoded-paths-in-jdk.attach.patch +++ b/packages/openjdk-21/0037-Fix-hardcoded-paths-in-jdk.attach.patch @@ -1,7 +1,7 @@ -From 5bc8c9169088f13c43930a3b09d8adf60822deb7 Mon Sep 17 00:00:00 2001 +From 3227daf62ac28c14287d9ec7a7e3f0a21a261024 Mon Sep 17 00:00:00 2001 From: Chongyun Lee <45286352+licy183@users.noreply.github.com> Date: Tue, 3 Sep 2024 12:34:31 +0800 -Subject: [PATCH 38/40] Fix: hardcoded paths in jdk.attach +Subject: [PATCH 37/40] Fix: hardcoded paths in jdk.attach --- .../linux/classes/sun/tools/attach/VirtualMachineImpl.java | 2 +- @@ -21,5 +21,5 @@ index 6a70d5d9f71..c0c571c5e57 100644 /** * Attaches to the target VM -- -2.50.0 +2.50.1 diff --git a/packages/openjdk-21/0039-Do-not-disable-new-dtags.patch b/packages/openjdk-21/0038-Do-not-disable-new-dtags.patch similarity index 87% rename from packages/openjdk-21/0039-Do-not-disable-new-dtags.patch rename to packages/openjdk-21/0038-Do-not-disable-new-dtags.patch index abe90158114a5ca..9a2802babdaed3b 100644 --- a/packages/openjdk-21/0039-Do-not-disable-new-dtags.patch +++ b/packages/openjdk-21/0038-Do-not-disable-new-dtags.patch @@ -1,7 +1,7 @@ -From ecc7c290c0bd82ae2fa6bfff9706b00525509d81 Mon Sep 17 00:00:00 2001 +From 9a3d9e8417f1f2dc0c2d84d714c91423eb91a441 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Fri, 11 Jul 2025 14:51:08 +0800 -Subject: [PATCH 39/40] Do not disable new dtags +Subject: [PATCH 38/40] Do not disable new dtags --- make/autoconf/flags-cflags.m4 | 3 --- @@ -22,5 +22,5 @@ index 1b966e2706e..705bd7feca9 100644 SET_SHARED_LIBRARY_MAPFILE='-Wl,-version-script=[$]1' -- -2.50.0 +2.50.1 diff --git a/packages/openjdk-21/0040-disable-statx-syscall.patch b/packages/openjdk-21/0039-disable-statx-syscall.patch similarity index 89% rename from packages/openjdk-21/0040-disable-statx-syscall.patch rename to packages/openjdk-21/0039-disable-statx-syscall.patch index ead418945762119..d73a0320506fd64 100644 --- a/packages/openjdk-21/0040-disable-statx-syscall.patch +++ b/packages/openjdk-21/0039-disable-statx-syscall.patch @@ -1,7 +1,7 @@ -From ff1e198dcc805d15980a370253732f71661cc17b Mon Sep 17 00:00:00 2001 +From f97ac55d7949045c6ec39195ade04cf2cba4d709 Mon Sep 17 00:00:00 2001 From: Robert Kirkman <31490854+robertkirkman@users.noreply.github.com> Date: Fri, 11 Jul 2025 14:52:14 +0800 -Subject: [PATCH 40/40] disable statx syscall +Subject: [PATCH 39/40] disable statx syscall --- src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c | 2 +- @@ -21,5 +21,5 @@ index 2cd14f259c4..cb3ce06e1dc 100644 if (my_statx_func != NULL) { capabilities |= sun_nio_fs_UnixNativeDispatcher_SUPPORTS_BIRTHTIME; -- -2.50.0 +2.50.1 diff --git a/packages/openjdk-21/0040-android-Prevent-build-of-libsaproc.patch b/packages/openjdk-21/0040-android-Prevent-build-of-libsaproc.patch new file mode 100644 index 000000000000000..0973301f5205ac9 --- /dev/null +++ b/packages/openjdk-21/0040-android-Prevent-build-of-libsaproc.patch @@ -0,0 +1,32 @@ +From 2602cf58d57f40db090634be92380cb6f32cc038 Mon Sep 17 00:00:00 2001 +From: alexytomi <60690056+alexytomi@users.noreply.github.com> +Date: Fri, 11 Jul 2025 15:50:21 +0800 +Subject: [PATCH 40/40] android: Prevent build of libsaproc + +This is originally Grimler's but to allow jsound to build, this patch +needed to be changed. + +saproc still cannot be built though, this is a bionic limitation, it +requires prstatus_t, something missing from the ndk. It's just used for +debugging purposes though, not important + +Co-authored-by: Henrik Grimler +Co-authored-by: Robert Kirkman <31490854+robertkirkman@users.noreply.github.com> +--- + make/modules/jdk.hotspot.agent/Lib.gmk | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/make/modules/jdk.hotspot.agent/Lib.gmk b/make/modules/jdk.hotspot.agent/Lib.gmk +index d21c969c188..ca7a8988a2b 100644 +--- a/make/modules/jdk.hotspot.agent/Lib.gmk ++++ b/make/modules/jdk.hotspot.agent/Lib.gmk +@@ -77,6 +77,4 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBSA, \ + LIBS_windows := dbgeng.lib $(WIN_JAVA_LIB), \ + )) + +-TARGETS += $(BUILD_LIBSA) +- + ################################################################################ +-- +2.50.1 + From 3cd1ebb6c6d1112e866b5416663ae83848147ac6 Mon Sep 17 00:00:00 2001 From: alexytomi <60690056+alexytomi@users.noreply.github.com> Date: Mon, 21 Jul 2025 14:31:39 +0800 Subject: [PATCH 4/9] chore(main/openjdk-17): Regenerate patchset --- ...ude-netinet-in.h-for-android-builds.patch} | 8 +- ...s_linux-add-android-checks-and-fixes.patch | 14 +-- ...Define-sys-gettid-on-arm-and-aarch64.patch | 12 +-- ...six-print-uptime-overridden-by-linux.patch | 14 +-- ...prevent-build-of-libjsound-and-libsa.patch | 10 +- .../0006-Link-against-system-libiconv.patch | 10 +- ...h64_get_thread_helper-Thread-current.patch | 8 +- ...008-Remove-aarch64_get_thread_helper.patch | 8 +- .../0009-Use-Android-s-strerror_r.patch | 8 +- .../0010-Use-utimensat-on-android.patch | 20 ++-- ..._nio_fs_UnixNativeDispatcher_futimes.patch | 12 +-- ...0012-Add-CXXFLAGS_JDKLIB-to-CXXFLAGS.patch | 10 +- .../0013-Use-ASCII-codeset-on-android.patch | 10 +- ...vm.so-path-when-run-from-Android-app.patch | 8 +- ...-address-to-char-when-clearing-cache.patch | 8 +- ...control-related-functions-on-Android.patch | 16 +-- ...ink-against-libawt-to-fix-link-error.patch | 10 +- ...m.so-path-from-proc-self-maps-on-and.patch | 17 +-- ...f-exiting-if-getcpu-2-is-unsupported.patch | 10 +- .../0020-Remove-pre-UAL-aliases.patch | 8 +- ...arm-fix-assembly-in-os_linux_arm.cpp.patch | 8 +- ...nd-for-tagged-pointers-on-Android-12.patch | 12 +-- .../0023-x86-always-compile-with-PIC.patch | 8 +- .../0024-Fix-StackOverflowError-on-ARM.patch | 8 +- ...lvsym-is-available-if-ANDROID_API-24.patch | 10 +- .../0026-configure-do-not-require-alsa.patch | 8 +- ...te-hardcoded-paths-to-work-in-termux.patch | 100 +++++++++--------- ...eed-to-define-ELF-32-64-_ST_TYPE-on-.patch | 9 +- ...etloadavg-implementation-for-android.patch | 10 +- ...nux-use-getpagesize-instad-of-SHMLBA.patch | 12 +-- ...ava-change-return-type-of-strerror_r.patch | 16 +-- ...-cflags-handle-arm-like-other-arches.patch | 10 +- ...33-Fix-bugs-in-File.getCanonicalPath.patch | 8 +- ...ilter-same-symbols-for-linux-and-and.patch | 9 +- .../0035-Fix-build-with-lld-17.patch | 8 +- ...AvailableStackWithSlack-from-hotspot.patch | 11 +- ...-do-not-use-dlinfo-and-RTLD_DI_LINKM.patch | 13 +-- .../0038-OUTTREE-bionic-type-redef-fix.patch | 37 +++++-- ...39-Fix-hardcoded-paths-in-jdk.attach.patch | 9 +- .../0040-Do-not-disable-new-dtags.patch | 21 +++- .../0041-disable-statx-syscall.patch | 24 ++++- ...-define-ARM-for-arm-build-with-clang.patch | 10 +- 42 files changed, 317 insertions(+), 265 deletions(-) rename packages/openjdk-17/{0001-libnet-check-__ANDROID__-instead-of-ANDROID.patch => 0001-libinet-include-netinet-in.h-for-android-builds.patch} (77%) diff --git a/packages/openjdk-17/0001-libnet-check-__ANDROID__-instead-of-ANDROID.patch b/packages/openjdk-17/0001-libinet-include-netinet-in.h-for-android-builds.patch similarity index 77% rename from packages/openjdk-17/0001-libnet-check-__ANDROID__-instead-of-ANDROID.patch rename to packages/openjdk-17/0001-libinet-include-netinet-in.h-for-android-builds.patch index 31ed09fa227920a..b1909709debc238 100644 --- a/packages/openjdk-17/0001-libnet-check-__ANDROID__-instead-of-ANDROID.patch +++ b/packages/openjdk-17/0001-libinet-include-netinet-in.h-for-android-builds.patch @@ -1,14 +1,14 @@ -From 85913fabd90c355e9e5887ab01d026539e0d1e4e Mon Sep 17 00:00:00 2001 +From 30d319bb0a70bc55267d75dd8fa0ba597675ea13 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 31 Mar 2024 16:31:48 +0200 -Subject: [PATCH 01/37] libinet: include netinet/in.h for android builds +Subject: [PATCH 01/42] libinet: include netinet/in.h for android builds --- src/java.base/unix/native/libnet/net_util_md.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/java.base/unix/native/libnet/net_util_md.h b/src/java.base/unix/native/libnet/net_util_md.h -index 902cf9673..e74b6265b 100644 +index 68835987b64..986892f209a 100644 --- a/src/java.base/unix/native/libnet/net_util_md.h +++ b/src/java.base/unix/native/libnet/net_util_md.h @@ -26,6 +26,9 @@ @@ -22,5 +22,5 @@ index 902cf9673..e74b6265b 100644 #include #include -- -2.45.2 +2.50.1 diff --git a/packages/openjdk-17/0002-os_linux-add-android-checks-and-fixes.patch b/packages/openjdk-17/0002-os_linux-add-android-checks-and-fixes.patch index a7ed2717cdc5c20..790634c08eb74a0 100644 --- a/packages/openjdk-17/0002-os_linux-add-android-checks-and-fixes.patch +++ b/packages/openjdk-17/0002-os_linux-add-android-checks-and-fixes.patch @@ -1,17 +1,17 @@ -From 5398fe8adfa82d34f801f7861968ca2d6495fdc4 Mon Sep 17 00:00:00 2001 +From 3e61f8a4d1860dd91cffc4fa79c0faf1f392e4e6 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Sun, 6 Jun 2021 20:11:11 +0700 -Subject: [PATCH] os_linux: add android checks and fixes +Subject: [PATCH 02/42] os_linux: add android checks and fixes --- src/hotspot/os/linux/os_linux.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp -index ae0c73dcb711..e8e66887cd5a 100644 +index 7c951cee51c..0a96aef438f 100644 --- a/src/hotspot/os/linux/os_linux.cpp +++ b/src/hotspot/os/linux/os_linux.cpp -@@ -132,7 +132,7 @@ +@@ -135,7 +135,7 @@ // for timer info max values which include all bits #define ALL_64_BITS CONST64(0xFFFFFFFFFFFFFFFF) @@ -20,7 +20,7 @@ index ae0c73dcb711..e8e66887cd5a 100644 // dlvsym is not a part of POSIX // and musl libc doesn't implement it. static void *dlvsym(void *handle, -@@ -515,6 +515,7 @@ extern "C" void breakpoint() { +@@ -518,6 +518,7 @@ extern "C" void breakpoint() { // detecting pthread library void os::Linux::libpthread_init() { @@ -28,7 +28,7 @@ index ae0c73dcb711..e8e66887cd5a 100644 // Save glibc and pthread version strings. #if !defined(_CS_GNU_LIBC_VERSION) || \ !defined(_CS_GNU_LIBPTHREAD_VERSION) -@@ -539,6 +540,9 @@ void os::Linux::libpthread_init() { +@@ -542,6 +543,9 @@ void os::Linux::libpthread_init() { confstr(_CS_GNU_LIBPTHREAD_VERSION, str, n); os::Linux::set_libpthread_version(str); #endif @@ -39,5 +39,5 @@ index ae0c73dcb711..e8e66887cd5a 100644 ///////////////////////////////////////////////////////////////////////////// -- -2.44.0 +2.50.1 diff --git a/packages/openjdk-17/0003-Define-sys-gettid-on-arm-and-aarch64.patch b/packages/openjdk-17/0003-Define-sys-gettid-on-arm-and-aarch64.patch index 990bc823716fd73..1b70bc229f83789 100644 --- a/packages/openjdk-17/0003-Define-sys-gettid-on-arm-and-aarch64.patch +++ b/packages/openjdk-17/0003-Define-sys-gettid-on-arm-and-aarch64.patch @@ -1,17 +1,17 @@ -From b04c40ca7b8a3c6cb29d9e0e965ec592148327a2 Mon Sep 17 00:00:00 2001 +From f253413671f4f2bb39b7909297ab7edae69fbd0c Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Mon, 7 Jun 2021 06:27:26 +0700 -Subject: [PATCH] Define sys gettid on arm and aarch64 +Subject: [PATCH 03/42] Define sys gettid on arm and aarch64 --- src/hotspot/os/linux/os_linux.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp -index e8e66887cd5a..08b27d2dbe22 100644 +index 0a96aef438f..2c0d3b78eee 100644 --- a/src/hotspot/os/linux/os_linux.cpp +++ b/src/hotspot/os/linux/os_linux.cpp -@@ -322,11 +322,11 @@ bool os::have_special_privileges() { +@@ -319,11 +319,11 @@ bool os::have_special_privileges() { #ifndef SYS_gettid @@ -25,7 +25,7 @@ index e8e66887cd5a..08b27d2dbe22 100644 #define SYS_gettid 224 #else #ifdef __amd64__ -@@ -334,6 +334,8 @@ bool os::have_special_privileges() { +@@ -331,6 +331,8 @@ bool os::have_special_privileges() { #else #ifdef __sparc__ #define SYS_gettid 143 @@ -35,5 +35,5 @@ index e8e66887cd5a..08b27d2dbe22 100644 #error define gettid for the arch #endif -- -2.44.0 +2.50.1 diff --git a/packages/openjdk-17/0004-Disable-posix-print-uptime-overridden-by-linux.patch b/packages/openjdk-17/0004-Disable-posix-print-uptime-overridden-by-linux.patch index 81756ed3bcaa240..09f0894bad139bc 100644 --- a/packages/openjdk-17/0004-Disable-posix-print-uptime-overridden-by-linux.patch +++ b/packages/openjdk-17/0004-Disable-posix-print-uptime-overridden-by-linux.patch @@ -1,17 +1,17 @@ -From 2e669f0d90683894bc153351cae0ca20f83770dc Mon Sep 17 00:00:00 2001 +From a81dfe6609873342a44fd4e268e1810d01da974b Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Mon, 7 Jun 2021 08:05:09 +0700 -Subject: [PATCH] Disable posix print uptime (overridden by linux!) +Subject: [PATCH 04/42] Disable posix print uptime (overridden by linux!) --- src/hotspot/os/posix/os_posix.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/hotspot/os/posix/os_posix.cpp b/src/hotspot/os/posix/os_posix.cpp -index ae058dd345b8..ea99a3755b9a 100644 +index 4307a189edf..64c512255a5 100644 --- a/src/hotspot/os/posix/os_posix.cpp +++ b/src/hotspot/os/posix/os_posix.cpp -@@ -65,7 +65,9 @@ +@@ -67,7 +67,9 @@ #include #include #include @@ -21,7 +21,7 @@ index ae058dd345b8..ea99a3755b9a 100644 #ifdef __APPLE__ #include -@@ -418,6 +420,7 @@ void os::Posix::print_load_average(outputStream* st) { +@@ -440,6 +442,7 @@ void os::Posix::print_load_average(outputStream* st) { // unfortunately it does not work on macOS and Linux because the utx chain has no entry // for reboot at least on my test machines void os::Posix::print_uptime_info(outputStream* st) { @@ -29,7 +29,7 @@ index ae058dd345b8..ea99a3755b9a 100644 int bootsec = -1; int currsec = time(NULL); struct utmpx* ent; -@@ -432,6 +435,7 @@ void os::Posix::print_uptime_info(outputStream* st) { +@@ -454,6 +457,7 @@ void os::Posix::print_uptime_info(outputStream* st) { if (bootsec != -1) { os::print_dhm(st, "OS uptime:", (long) (currsec-bootsec)); } @@ -38,5 +38,5 @@ index ae058dd345b8..ea99a3755b9a 100644 static void print_rlimit(outputStream* st, const char* msg, -- -2.44.0 +2.50.1 diff --git a/packages/openjdk-17/0005-android-prevent-build-of-libjsound-and-libsa.patch b/packages/openjdk-17/0005-android-prevent-build-of-libjsound-and-libsa.patch index 936ef94bc649cc5..d873a204ca94c47 100644 --- a/packages/openjdk-17/0005-android-prevent-build-of-libjsound-and-libsa.patch +++ b/packages/openjdk-17/0005-android-prevent-build-of-libjsound-and-libsa.patch @@ -1,7 +1,7 @@ -From b71d08af5c67c9bee2bb025f310b1c3fdef9ebc4 Mon Sep 17 00:00:00 2001 +From de7625e18c25aed495c306f4b5302c32bb1aff81 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Fri, 3 Feb 2023 11:06:24 +0100 -Subject: [PATCH] android: prevent build of libjsound and libsa +Subject: [PATCH 05/42] android: prevent build of libjsound and libsa --- make/modules/java.desktop/Lib.gmk | 2 -- @@ -9,7 +9,7 @@ Subject: [PATCH] android: prevent build of libjsound and libsa 2 files changed, 4 deletions(-) diff --git a/make/modules/java.desktop/Lib.gmk b/make/modules/java.desktop/Lib.gmk -index 22b07289adf7..4f1c8c735024 100644 +index 22b07289adf..4f1c8c73502 100644 --- a/make/modules/java.desktop/Lib.gmk +++ b/make/modules/java.desktop/Lib.gmk @@ -76,8 +76,6 @@ ifeq ($(call isTargetOs, aix), false) @@ -22,7 +22,7 @@ index 22b07289adf7..4f1c8c735024 100644 ################################################################################ diff --git a/make/modules/jdk.hotspot.agent/Lib.gmk b/make/modules/jdk.hotspot.agent/Lib.gmk -index 59b24d0e4523..7bbd5e73ec2e 100644 +index 59b24d0e452..7bbd5e73ec2 100644 --- a/make/modules/jdk.hotspot.agent/Lib.gmk +++ b/make/modules/jdk.hotspot.agent/Lib.gmk @@ -74,6 +74,4 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBSA, \ @@ -33,5 +33,5 @@ index 59b24d0e4523..7bbd5e73ec2e 100644 - ################################################################################ -- -2.44.0 +2.50.1 diff --git a/packages/openjdk-17/0006-Link-against-system-libiconv.patch b/packages/openjdk-17/0006-Link-against-system-libiconv.patch index bccb86ea069683b..8cd696da9a8a2dc 100644 --- a/packages/openjdk-17/0006-Link-against-system-libiconv.patch +++ b/packages/openjdk-17/0006-Link-against-system-libiconv.patch @@ -1,7 +1,7 @@ -From 0e8ecf28408a9efae19ae58b63821c8fffb8792f Mon Sep 17 00:00:00 2001 +From b4cac09fd3cf9817479893bcc0eabeb69a7968cb Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Fri, 3 Feb 2023 11:09:10 +0100 -Subject: [PATCH] Link against system libiconv +Subject: [PATCH 06/42] Link against system libiconv --- make/modules/java.instrument/Lib.gmk | 2 +- @@ -9,7 +9,7 @@ Subject: [PATCH] Link against system libiconv 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/make/modules/java.instrument/Lib.gmk b/make/modules/java.instrument/Lib.gmk -index 3996ad213864..727f312da92a 100644 +index 3996ad21386..727f312da92 100644 --- a/make/modules/java.instrument/Lib.gmk +++ b/make/modules/java.instrument/Lib.gmk @@ -49,7 +49,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBINSTRUMENT, \ @@ -22,7 +22,7 @@ index 3996ad213864..727f312da92a 100644 LIBS_macosx := -ljli -liconv -framework Cocoa -framework Security \ -framework ApplicationServices, \ diff --git a/make/modules/jdk.jdwp.agent/Lib.gmk b/make/modules/jdk.jdwp.agent/Lib.gmk -index aef358c14bd5..fbc1750bc58a 100644 +index aef358c14bd..fbc1750bc58 100644 --- a/make/modules/jdk.jdwp.agent/Lib.gmk +++ b/make/modules/jdk.jdwp.agent/Lib.gmk @@ -61,7 +61,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJDWP, \ @@ -35,5 +35,5 @@ index aef358c14bd5..fbc1750bc58a 100644 LIBS_aix := -liconv, \ )) -- -2.44.0 +2.50.1 diff --git a/packages/openjdk-17/0007-aarch64_get_thread_helper-Thread-current.patch b/packages/openjdk-17/0007-aarch64_get_thread_helper-Thread-current.patch index ea07059fc0d5d5a..79451099f297518 100644 --- a/packages/openjdk-17/0007-aarch64_get_thread_helper-Thread-current.patch +++ b/packages/openjdk-17/0007-aarch64_get_thread_helper-Thread-current.patch @@ -1,7 +1,7 @@ -From ccce9502c1a3460f02d1edd101097fa54582f83d Mon Sep 17 00:00:00 2001 +From adffb650e6ac7df4baf71fa62e14d242aec3c6bd Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Thu, 10 Jun 2021 08:45:16 +0700 -Subject: [PATCH] aarch64_get_thread_helper() -> Thread::current() +Subject: [PATCH 07/42] aarch64_get_thread_helper() -> Thread::current() Can't build for Android: @@ -13,7 +13,7 @@ clang90++: error: linker command failed with exit code 1 (use -v to see invocati 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/hotspot/os_cpu/linux_aarch64/thread_linux_aarch64.hpp b/src/hotspot/os_cpu/linux_aarch64/thread_linux_aarch64.hpp -index 5a1f273c5486..88b6750dbff2 100644 +index 5a1f273c548..88b6750dbff 100644 --- a/src/hotspot/os_cpu/linux_aarch64/thread_linux_aarch64.hpp +++ b/src/hotspot/os_cpu/linux_aarch64/thread_linux_aarch64.hpp @@ -47,6 +47,13 @@ private: @@ -32,5 +32,5 @@ index 5a1f273c5486..88b6750dbff2 100644 #endif // OS_CPU_LINUX_AARCH64_THREAD_LINUX_AARCH64_HPP -- -2.44.0 +2.50.1 diff --git a/packages/openjdk-17/0008-Remove-aarch64_get_thread_helper.patch b/packages/openjdk-17/0008-Remove-aarch64_get_thread_helper.patch index 314a4bfe2ab0362..48f332f0b97c0a3 100644 --- a/packages/openjdk-17/0008-Remove-aarch64_get_thread_helper.patch +++ b/packages/openjdk-17/0008-Remove-aarch64_get_thread_helper.patch @@ -1,7 +1,7 @@ -From 572fd2a295de4237374166ee10773fcb412802c9 Mon Sep 17 00:00:00 2001 +From 7ac68d1b831e50e0245ccd27110336b6a894941c Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Thu, 10 Jun 2021 08:46:35 +0700 -Subject: [PATCH] Remove aarch64_get_thread_helper() +Subject: [PATCH 08/42] Remove aarch64_get_thread_helper() See commit 6f407090fda1 ("aarch64_get_thread_helper() -> Thread::current()") for more details. @@ -10,7 +10,7 @@ Thread::current()") for more details. 1 file changed, 2 insertions(+) diff --git a/src/hotspot/os_cpu/linux_aarch64/threadLS_linux_aarch64.S b/src/hotspot/os_cpu/linux_aarch64/threadLS_linux_aarch64.S -index f541844b9d6d..dd83b3723304 100644 +index f541844b9d6..dd83b372330 100644 --- a/src/hotspot/os_cpu/linux_aarch64/threadLS_linux_aarch64.S +++ b/src/hotspot/os_cpu/linux_aarch64/threadLS_linux_aarch64.S @@ -19,6 +19,7 @@ @@ -27,5 +27,5 @@ index f541844b9d6d..dd83b3723304 100644 .size _ZN10JavaThread25aarch64_get_thread_helperEv, .-_ZN10JavaThread25aarch64_get_thread_helperEv +#endif -- -2.44.0 +2.50.1 diff --git a/packages/openjdk-17/0009-Use-Android-s-strerror_r.patch b/packages/openjdk-17/0009-Use-Android-s-strerror_r.patch index 0f158ee4d6bc227..dc2f78d26ef6cf7 100644 --- a/packages/openjdk-17/0009-Use-Android-s-strerror_r.patch +++ b/packages/openjdk-17/0009-Use-Android-s-strerror_r.patch @@ -1,14 +1,14 @@ -From 335a23c80620e0f885ea4760dd8335d03a734c74 Mon Sep 17 00:00:00 2001 +From fdc66ed11e918370b34e91f499b0cba07052923a Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Thu, 10 Jun 2021 09:36:26 +0700 -Subject: [PATCH] Use Android's strerror_r() +Subject: [PATCH 09/42] Use Android's strerror_r() --- src/java.base/unix/native/libjava/jni_util_md.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/java.base/unix/native/libjava/jni_util_md.c b/src/java.base/unix/native/libjava/jni_util_md.c -index 460503cd794c..335637b0a115 100644 +index 460503cd794..335637b0a11 100644 --- a/src/java.base/unix/native/libjava/jni_util_md.c +++ b/src/java.base/unix/native/libjava/jni_util_md.c @@ -31,13 +31,6 @@ @@ -26,5 +26,5 @@ index 460503cd794c..335637b0a115 100644 static void *procHandle = NULL; if (procHandle != NULL) { -- -2.44.0 +2.50.1 diff --git a/packages/openjdk-17/0010-Use-utimensat-on-android.patch b/packages/openjdk-17/0010-Use-utimensat-on-android.patch index b44671ab4ffd751..3445441b54d1977 100644 --- a/packages/openjdk-17/0010-Use-utimensat-on-android.patch +++ b/packages/openjdk-17/0010-Use-utimensat-on-android.patch @@ -1,17 +1,17 @@ -From abb21f4753cbfb0a1639180eab2c0f48b93d06ee Mon Sep 17 00:00:00 2001 +From 58fca0e0f89d7aa62c1fa7c80927dd60750c9391 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Thu, 10 Jun 2021 16:42:56 +0700 -Subject: [PATCH] Use utimensat on android +Subject: [PATCH 10/42] Use utimensat on android --- .../native/libnio/fs/UnixNativeDispatcher.c | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c b/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c -index 9df8be1e62c2..3b886283778b 100644 +index 7bc14a0da97..f9c1b5516ee 100644 --- a/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c +++ b/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c -@@ -140,6 +140,7 @@ typedef int fstatat64_func(int, const char *, struct stat64 *, int); +@@ -245,6 +245,7 @@ typedef int fstatat64_func(int, const char *, struct stat64 *, int); typedef int unlinkat_func(int, const char*, int); typedef int renameat_func(int, const char*, int, const char*); typedef int futimesat_func(int, const char *, const struct timeval *); @@ -19,7 +19,7 @@ index 9df8be1e62c2..3b886283778b 100644 typedef int futimens_func(int, const struct timespec *); typedef int lutimes_func(const char *, const struct timeval *); typedef DIR* fdopendir_func(int); -@@ -149,6 +150,7 @@ static fstatat64_func* my_fstatat64_func = NULL; +@@ -258,6 +259,7 @@ static fstatat64_func* my_fstatat64_func = NULL; static unlinkat_func* my_unlinkat_func = NULL; static renameat_func* my_renameat_func = NULL; static futimesat_func* my_futimesat_func = NULL; @@ -27,7 +27,7 @@ index 9df8be1e62c2..3b886283778b 100644 static futimens_func* my_futimens_func = NULL; static lutimes_func* my_lutimes_func = NULL; static fdopendir_func* my_fdopendir_func = NULL; -@@ -272,6 +274,9 @@ Java_sun_nio_fs_UnixNativeDispatcher_init(JNIEnv* env, jclass this) +@@ -395,6 +397,9 @@ Java_sun_nio_fs_UnixNativeDispatcher_init(JNIEnv* env, jclass this) #ifndef _ALLBSD_SOURCE my_futimesat_func = (futimesat_func*) dlsym(RTLD_DEFAULT, "futimesat"); my_lutimes_func = (lutimes_func*) dlsym(RTLD_DEFAULT, "lutimes"); @@ -37,7 +37,7 @@ index 9df8be1e62c2..3b886283778b 100644 #endif my_futimens_func = (futimens_func*) dlsym(RTLD_DEFAULT, "futimens"); #if defined(_AIX) -@@ -292,7 +297,7 @@ Java_sun_nio_fs_UnixNativeDispatcher_init(JNIEnv* env, jclass this) +@@ -415,7 +420,7 @@ Java_sun_nio_fs_UnixNativeDispatcher_init(JNIEnv* env, jclass this) capabilities |= sun_nio_fs_UnixNativeDispatcher_SUPPORTS_FUTIMES; capabilities |= sun_nio_fs_UnixNativeDispatcher_SUPPORTS_LUTIMES; #else @@ -46,7 +46,7 @@ index 9df8be1e62c2..3b886283778b 100644 capabilities |= sun_nio_fs_UnixNativeDispatcher_SUPPORTS_FUTIMES; if (my_lutimes_func != NULL) capabilities |= sun_nio_fs_UnixNativeDispatcher_SUPPORTS_LUTIMES; -@@ -304,7 +309,7 @@ Java_sun_nio_fs_UnixNativeDispatcher_init(JNIEnv* env, jclass this) +@@ -427,7 +432,7 @@ Java_sun_nio_fs_UnixNativeDispatcher_init(JNIEnv* env, jclass this) if (my_openat64_func != NULL && my_fstatat64_func != NULL && my_unlinkat_func != NULL && my_renameat_func != NULL && @@ -55,7 +55,7 @@ index 9df8be1e62c2..3b886283778b 100644 { capabilities |= sun_nio_fs_UnixNativeDispatcher_SUPPORTS_OPENAT; } -@@ -697,14 +702,21 @@ Java_sun_nio_fs_UnixNativeDispatcher_futimes(JNIEnv* env, jclass this, jint file +@@ -959,14 +964,21 @@ Java_sun_nio_fs_UnixNativeDispatcher_futimes(JNIEnv* env, jclass this, jint file times[1].tv_sec = modificationTime / 1000000; times[1].tv_usec = modificationTime % 1000000; @@ -81,5 +81,5 @@ index 9df8be1e62c2..3b886283778b 100644 if (err == -1) { throwUnixException(env, errno); -- -2.44.0 +2.50.1 diff --git a/packages/openjdk-17/0011-Fixed-Java_sun_nio_fs_UnixNativeDispatcher_futimes.patch b/packages/openjdk-17/0011-Fixed-Java_sun_nio_fs_UnixNativeDispatcher_futimes.patch index 5781456024ec030..a29f15e8a1939ef 100644 --- a/packages/openjdk-17/0011-Fixed-Java_sun_nio_fs_UnixNativeDispatcher_futimes.patch +++ b/packages/openjdk-17/0011-Fixed-Java_sun_nio_fs_UnixNativeDispatcher_futimes.patch @@ -1,17 +1,17 @@ -From acda1bc8b7e6c37db76575a43e5b08db5f118378 Mon Sep 17 00:00:00 2001 +From 9b37ddeaa8e6e77df1ec59c8310a12dfe4ab9add Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Thu, 10 Jun 2021 18:36:56 +0700 -Subject: [PATCH] Fixed Java_sun_nio_fs_UnixNativeDispatcher_futimes +Subject: [PATCH 11/42] Fixed Java_sun_nio_fs_UnixNativeDispatcher_futimes --- .../unix/native/libnio/fs/UnixNativeDispatcher.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c b/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c -index 3b886283778b..a53b64bb81f0 100644 +index f9c1b5516ee..51b18326c18 100644 --- a/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c +++ b/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c -@@ -694,16 +694,17 @@ Java_sun_nio_fs_UnixNativeDispatcher_futimes(JNIEnv* env, jclass this, jint file +@@ -956,16 +956,17 @@ Java_sun_nio_fs_UnixNativeDispatcher_futimes(JNIEnv* env, jclass this, jint file jlong accessTime, jlong modificationTime) { struct timeval times[2]; @@ -33,7 +33,7 @@ index 3b886283778b..a53b64bb81f0 100644 #ifdef _ALLBSD_SOURCE RESTARTABLE(futimes(filedes, ×[0]), err); -@@ -715,7 +716,7 @@ Java_sun_nio_fs_UnixNativeDispatcher_futimes(JNIEnv* env, jclass this, jint file +@@ -977,7 +978,7 @@ Java_sun_nio_fs_UnixNativeDispatcher_futimes(JNIEnv* env, jclass this, jint file if (my_futimesat_func != NULL) { RESTARTABLE((*my_futimesat_func)(filedes, NULL, ×[0]), err); } else { @@ -43,5 +43,5 @@ index 3b886283778b..a53b64bb81f0 100644 #endif if (err == -1) { -- -2.44.0 +2.50.1 diff --git a/packages/openjdk-17/0012-Add-CXXFLAGS_JDKLIB-to-CXXFLAGS.patch b/packages/openjdk-17/0012-Add-CXXFLAGS_JDKLIB-to-CXXFLAGS.patch index 9c88b845a35b424..6eca185c10114a6 100644 --- a/packages/openjdk-17/0012-Add-CXXFLAGS_JDKLIB-to-CXXFLAGS.patch +++ b/packages/openjdk-17/0012-Add-CXXFLAGS_JDKLIB-to-CXXFLAGS.patch @@ -1,7 +1,7 @@ -From 9408807ff72c61687625ac7e5d06618df29c4c39 Mon Sep 17 00:00:00 2001 +From 19d8921fbc440f4d1203553afc6981f46758b128 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Thu, 10 Jun 2021 19:23:03 +0700 -Subject: [PATCH] Add CXXFLAGS_JDKLIB to CXXFLAGS +Subject: [PATCH 12/42] Add CXXFLAGS_JDKLIB to CXXFLAGS For modules jdk.jdwp.agent and java.instrument. --- @@ -10,7 +10,7 @@ For modules jdk.jdwp.agent and java.instrument. 2 files changed, 2 insertions(+) diff --git a/make/modules/java.instrument/Lib.gmk b/make/modules/java.instrument/Lib.gmk -index 727f312da92a..dd9bebe2e04b 100644 +index 727f312da92..dd9bebe2e04 100644 --- a/make/modules/java.instrument/Lib.gmk +++ b/make/modules/java.instrument/Lib.gmk @@ -39,6 +39,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBINSTRUMENT, \ @@ -22,7 +22,7 @@ index 727f312da92a..dd9bebe2e04b 100644 EXTRA_HEADER_DIRS := java.base:libjli, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ diff --git a/make/modules/jdk.jdwp.agent/Lib.gmk b/make/modules/jdk.jdwp.agent/Lib.gmk -index fbc1750bc58a..7ba77268ae1e 100644 +index fbc1750bc58..7ba77268ae1 100644 --- a/make/modules/jdk.jdwp.agent/Lib.gmk +++ b/make/modules/jdk.jdwp.agent/Lib.gmk @@ -52,6 +52,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJDWP, \ @@ -34,5 +34,5 @@ index fbc1750bc58a..7ba77268ae1e 100644 DISABLED_WARNINGS_clang := sometimes-uninitialized format-nonliteral \ self-assign, \ -- -2.44.0 +2.50.1 diff --git a/packages/openjdk-17/0013-Use-ASCII-codeset-on-android.patch b/packages/openjdk-17/0013-Use-ASCII-codeset-on-android.patch index bda0ce8680a73c4..33827ad1580f809 100644 --- a/packages/openjdk-17/0013-Use-ASCII-codeset-on-android.patch +++ b/packages/openjdk-17/0013-Use-ASCII-codeset-on-android.patch @@ -1,7 +1,7 @@ -From ef526392bf6695d34e7c381ab723b6517427a7c3 Mon Sep 17 00:00:00 2001 +From ebd05e9603e34102bb0e9384896cd9dec9b693a6 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Thu, 10 Jun 2021 20:42:40 +0700 -Subject: [PATCH] Use ASCII codeset on android +Subject: [PATCH 13/42] Use ASCII codeset on android Since android's locale support is very rudimentary. --- @@ -10,7 +10,7 @@ Since android's locale support is very rudimentary. 2 files changed, 8 insertions(+) diff --git a/src/java.instrument/unix/native/libinstrument/EncodingSupport_md.c b/src/java.instrument/unix/native/libinstrument/EncodingSupport_md.c -index 13cca6453fee..796666173d0b 100644 +index 13cca6453fe..796666173d0 100644 --- a/src/java.instrument/unix/native/libinstrument/EncodingSupport_md.c +++ b/src/java.instrument/unix/native/libinstrument/EncodingSupport_md.c @@ -64,7 +64,11 @@ utfInitialize(void) @@ -26,7 +26,7 @@ index 13cca6453fee..796666173d0b 100644 UTF_DEBUG(("NO codeset returned by nl_langinfo(CODESET)\n")); return; diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/utf_util.c b/src/jdk.jdwp.agent/share/native/libjdwp/utf_util.c -index 3fb38893e7d5..20ac7b27096c 100644 +index 3fb38893e7d..20ac7b27096 100644 --- a/src/jdk.jdwp.agent/share/native/libjdwp/utf_util.c +++ b/src/jdk.jdwp.agent/share/native/libjdwp/utf_util.c @@ -483,7 +483,11 @@ static int iconvConvert(conv_direction drn, char *bytes, size_t len, char *outpu @@ -42,5 +42,5 @@ index 3fb38893e7d5..20ac7b27096c 100644 if (codeset == NULL) { -- -2.44.0 +2.50.1 diff --git a/packages/openjdk-17/0014-Fix-libjvm.so-path-when-run-from-Android-app.patch b/packages/openjdk-17/0014-Fix-libjvm.so-path-when-run-from-Android-app.patch index 610e9cc1fc8c141..50284846ee4f251 100644 --- a/packages/openjdk-17/0014-Fix-libjvm.so-path-when-run-from-Android-app.patch +++ b/packages/openjdk-17/0014-Fix-libjvm.so-path-when-run-from-Android-app.patch @@ -1,14 +1,14 @@ -From 6f58e614fff1dfffbe66974c85be32152f1e18c7 Mon Sep 17 00:00:00 2001 +From a774c397e415836666390f79a14f7f3bd344e08d Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Fri, 11 Jun 2021 07:48:28 +0700 -Subject: [PATCH] Fix libjvm.so path when run from Android app +Subject: [PATCH 14/42] Fix libjvm.so path when run from Android app --- src/java.base/unix/native/libjli/java_md.c | 49 ++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/src/java.base/unix/native/libjli/java_md.c b/src/java.base/unix/native/libjli/java_md.c -index 503a2457b043..1c1bd6798e8e 100644 +index 71c162b1813..ed3151b080c 100644 --- a/src/java.base/unix/native/libjli/java_md.c +++ b/src/java.base/unix/native/libjli/java_md.c @@ -595,6 +595,55 @@ SetExecname(char **argv) @@ -68,5 +68,5 @@ index 503a2457b043..1c1bd6798e8e 100644 { /* Not implemented */ -- -2.44.0 +2.50.1 diff --git a/packages/openjdk-17/0015-arm-cast-address-to-char-when-clearing-cache.patch b/packages/openjdk-17/0015-arm-cast-address-to-char-when-clearing-cache.patch index fdde87eba710b31..4d7fb616b9b96f7 100644 --- a/packages/openjdk-17/0015-arm-cast-address-to-char-when-clearing-cache.patch +++ b/packages/openjdk-17/0015-arm-cast-address-to-char-when-clearing-cache.patch @@ -1,14 +1,14 @@ -From 2f48490b3b355eb35643c5bc6d8e42f2e5aa2c0a Mon Sep 17 00:00:00 2001 +From 30a3b02fe1d041ab5025da87c6e336296900f41b Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Sat, 12 Jun 2021 06:55:18 +0700 -Subject: [PATCH] arm: cast address to char when clearing cache +Subject: [PATCH 15/42] arm: cast address to char when clearing cache --- src/hotspot/cpu/arm/icache_arm.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hotspot/cpu/arm/icache_arm.cpp b/src/hotspot/cpu/arm/icache_arm.cpp -index 61fcb8a35804..93d2ad4f4948 100644 +index 61fcb8a3580..93d2ad4f494 100644 --- a/src/hotspot/cpu/arm/icache_arm.cpp +++ b/src/hotspot/cpu/arm/icache_arm.cpp @@ -31,7 +31,7 @@ @@ -21,5 +21,5 @@ index 61fcb8a35804..93d2ad4f4948 100644 } -- -2.44.0 +2.50.1 diff --git a/packages/openjdk-17/0016-Don-t-run-fpu_control-related-functions-on-Android.patch b/packages/openjdk-17/0016-Don-t-run-fpu_control-related-functions-on-Android.patch index 349c3b4093d754a..52bff8dfd005e2f 100644 --- a/packages/openjdk-17/0016-Don-t-run-fpu_control-related-functions-on-Android.patch +++ b/packages/openjdk-17/0016-Don-t-run-fpu_control-related-functions-on-Android.patch @@ -1,7 +1,7 @@ -From f0a0b72c834c309f71b4b31ade351e14c67c1d59 Mon Sep 17 00:00:00 2001 +From 1bb822a4396d696f6e59e73a243f713d72afa6e0 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Sat, 12 Jun 2021 06:58:20 +0700 -Subject: [PATCH] Don't run fpu_control related functions on Android +Subject: [PATCH 16/42] Don't run fpu_control related functions on Android --- src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp | 2 ++ @@ -9,7 +9,7 @@ Subject: [PATCH] Don't run fpu_control related functions on Android 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp b/src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp -index 6fc0c840642f..a9a3087419bd 100644 +index 785e767ef10..4812edd8314 100644 --- a/src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp +++ b/src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp @@ -70,7 +70,9 @@ @@ -23,7 +23,7 @@ index 6fc0c840642f..a9a3087419bd 100644 #define SPELL_REG_SP "sp" 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 cc71b0d27801..be6ad9c00c37 100644 +index 34a02f74ded..8750b528c4b 100644 --- a/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp +++ b/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp @@ -73,7 +73,7 @@ @@ -35,7 +35,7 @@ index cc71b0d27801..be6ad9c00c37 100644 # include #endif -@@ -418,14 +418,14 @@ bool PosixSignals::pd_hotspot_signal_handler(int sig, siginfo_t* info, +@@ -424,14 +424,14 @@ bool PosixSignals::pd_hotspot_signal_handler(int sig, siginfo_t* info, } void os::Linux::init_thread_fpu_state(void) { @@ -52,7 +52,7 @@ index cc71b0d27801..be6ad9c00c37 100644 return 0; #else int fpu_control; -@@ -435,7 +435,7 @@ int os::Linux::get_fpu_control_word(void) { +@@ -441,7 +441,7 @@ int os::Linux::get_fpu_control_word(void) { } void os::Linux::set_fpu_control_word(int fpu_control) { @@ -61,7 +61,7 @@ index cc71b0d27801..be6ad9c00c37 100644 _FPU_SETCW(fpu_control); #endif // !AMD64 } -@@ -614,7 +614,7 @@ void os::print_register_info(outputStream *st, const void *context) { +@@ -657,7 +657,7 @@ void os::print_register_info(outputStream *st, const void *context) { } void os::setup_fpu() { @@ -71,5 +71,5 @@ index cc71b0d27801..be6ad9c00c37 100644 __asm__ volatile ( "fldcw (%0)" : : "r" (fpu_cntrl) : "memory"); -- -2.44.0 +2.50.1 diff --git a/packages/openjdk-17/0017-Libfontmanager-link-against-libawt-to-fix-link-error.patch b/packages/openjdk-17/0017-Libfontmanager-link-against-libawt-to-fix-link-error.patch index c13a14f5ea1aeb5..ce5bcfaf7ce3efb 100644 --- a/packages/openjdk-17/0017-Libfontmanager-link-against-libawt-to-fix-link-error.patch +++ b/packages/openjdk-17/0017-Libfontmanager-link-against-libawt-to-fix-link-error.patch @@ -1,7 +1,7 @@ -From dc61b83ee07fa59d1f3afa18bba0500011928b5a Mon Sep 17 00:00:00 2001 +From 5d1b7b1c8d7e4e6a70c5c2088dcfb3c460785560 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Sat, 12 Jun 2021 17:03:05 +0700 -Subject: [PATCH] Libfontmanager: link against libawt to fix link error +Subject: [PATCH 17/42] Libfontmanager: link against libawt to fix link error Partly based on commit from androidports: https://github.com/androidports/openjdk/commit/a3e4f0281154537f01c2e59286a6ceed9c827b11 @@ -10,10 +10,10 @@ https://github.com/androidports/openjdk/commit/a3e4f0281154537f01c2e59286a6ceed9 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/make/modules/java.desktop/lib/Awt2dLibraries.gmk b/make/modules/java.desktop/lib/Awt2dLibraries.gmk -index 4d0c0c00dbf0..64aea561a80c 100644 +index bf6a987149a..0b93c50a190 100644 --- a/make/modules/java.desktop/lib/Awt2dLibraries.gmk +++ b/make/modules/java.desktop/lib/Awt2dLibraries.gmk -@@ -527,13 +527,13 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBFONTMANAGER, \ +@@ -554,13 +554,13 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBFONTMANAGER, \ LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \ LDFLAGS_aix := -Wl$(COMMA)-berok, \ LIBS := $(BUILD_LIBFONTMANAGER_FONTLIB), \ @@ -30,5 +30,5 @@ index 4d0c0c00dbf0..64aea561a80c 100644 ifeq ($(call isTargetOs, macosx), true) $(BUILD_LIBFONTMANAGER): $(call FindLib, $(MODULE), awt_lwawt) -- -2.44.0 +2.50.1 diff --git a/packages/openjdk-17/0018-Try-to-get-libjvm.so-path-from-proc-self-maps-on-and.patch b/packages/openjdk-17/0018-Try-to-get-libjvm.so-path-from-proc-self-maps-on-and.patch index 7e619ea5923ff8b..2d135c4231ae23c 100644 --- a/packages/openjdk-17/0018-Try-to-get-libjvm.so-path-from-proc-self-maps-on-and.patch +++ b/packages/openjdk-17/0018-Try-to-get-libjvm.so-path-from-proc-self-maps-on-and.patch @@ -1,17 +1,18 @@ -From ce9b5aeeb5bc30078619cd013ab811c680f5bb2b Mon Sep 17 00:00:00 2001 +From 1db6f3be841ddda5641e99bb80068708dd2e53fc Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Fri, 25 Jun 2021 17:19:24 +0700 -Subject: [PATCH] Try to get libjvm.so path from /proc/self/maps on android +Subject: [PATCH 18/42] Try to get libjvm.so path from /proc/self/maps on + android --- src/hotspot/os/linux/os_linux.cpp | 40 +++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp -index 08b27d2dbe22..ba62344d3263 100644 +index 2c0d3b78eee..9c632112a2e 100644 --- a/src/hotspot/os/linux/os_linux.cpp +++ b/src/hotspot/os/linux/os_linux.cpp -@@ -182,6 +182,8 @@ static int clock_tics_per_sec = 100; +@@ -184,6 +184,8 @@ static int clock_tics_per_sec = 100; // avoid this static bool suppress_primordial_thread_resolution = false; @@ -20,7 +21,7 @@ index 08b27d2dbe22..ba62344d3263 100644 // utility functions julong os::available_memory() { -@@ -1523,6 +1525,30 @@ bool os::dll_address_to_library_name(address addr, char* buf, +@@ -1578,6 +1580,30 @@ bool os::dll_address_to_library_name(address addr, char* buf, return false; } @@ -51,7 +52,7 @@ index 08b27d2dbe22..ba62344d3263 100644 // Loads .dll/.so and // in case of error it checks if .dll/.so was built for the // same architecture as Hotspot is running on -@@ -2544,6 +2570,19 @@ void os::jvm_path(char *buf, jint buflen) { +@@ -2647,6 +2673,19 @@ void os::jvm_path(char *buf, jint buflen) { CAST_FROM_FN_PTR(address, os::jvm_path), dli_fname, sizeof(dli_fname), NULL); assert(ret, "cannot locate libjvm"); @@ -71,7 +72,7 @@ index 08b27d2dbe22..ba62344d3263 100644 char *rp = NULL; if (ret && dli_fname[0] != '\0') { rp = os::Posix::realpath(dli_fname, buf, buflen); -@@ -2609,6 +2648,7 @@ void os::jvm_path(char *buf, jint buflen) { +@@ -2712,6 +2751,7 @@ void os::jvm_path(char *buf, jint buflen) { } } } @@ -80,5 +81,5 @@ index 08b27d2dbe22..ba62344d3263 100644 strncpy(saved_jvm_path, buf, MAXPATHLEN); saved_jvm_path[MAXPATHLEN - 1] = '\0'; -- -2.44.0 +2.50.1 diff --git a/packages/openjdk-17/0019-Warn-instead-of-exiting-if-getcpu-2-is-unsupported.patch b/packages/openjdk-17/0019-Warn-instead-of-exiting-if-getcpu-2-is-unsupported.patch index 043b65867905df8..ab1d14b22bdd266 100644 --- a/packages/openjdk-17/0019-Warn-instead-of-exiting-if-getcpu-2-is-unsupported.patch +++ b/packages/openjdk-17/0019-Warn-instead-of-exiting-if-getcpu-2-is-unsupported.patch @@ -1,17 +1,17 @@ -From 524a68b41998d6657218c1be15c1d64dbd9f4596 Mon Sep 17 00:00:00 2001 +From a817dfffa977df49975451eee4c22e7910db558e Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Mon, 28 Jun 2021 17:47:31 +0700 -Subject: [PATCH] Warn instead of exiting if getcpu(2) is unsupported +Subject: [PATCH 19/42] Warn instead of exiting if getcpu(2) is unsupported --- src/hotspot/os/linux/os_linux.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp -index ba62344d3263..5e9b44598acd 100644 +index 9c632112a2e..1112c8dc3b0 100644 --- a/src/hotspot/os/linux/os_linux.cpp +++ b/src/hotspot/os/linux/os_linux.cpp -@@ -2983,7 +2983,8 @@ void os::Linux::sched_getcpu_init() { +@@ -3088,7 +3088,8 @@ void os::Linux::sched_getcpu_init() { } if (sched_getcpu() == -1) { @@ -22,5 +22,5 @@ index ba62344d3263..5e9b44598acd 100644 } -- -2.44.0 +2.50.1 diff --git a/packages/openjdk-17/0020-Remove-pre-UAL-aliases.patch b/packages/openjdk-17/0020-Remove-pre-UAL-aliases.patch index dc41e4f73316522..e8f7a8a9757a5a7 100644 --- a/packages/openjdk-17/0020-Remove-pre-UAL-aliases.patch +++ b/packages/openjdk-17/0020-Remove-pre-UAL-aliases.patch @@ -1,14 +1,14 @@ -From 6a125e5bdaa15675ebf97e4740de18e6ddf46c5a Mon Sep 17 00:00:00 2001 +From f49ecac3d40288f3ffbccfb9c4ebcbd85f829fc0 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Wed, 30 Jun 2021 14:28:14 +0700 -Subject: [PATCH] Remove pre-UAL aliases +Subject: [PATCH 20/42] Remove pre-UAL aliases --- src/hotspot/os_cpu/linux_arm/linux_arm_32.S | 40 ++++++++++----------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/src/hotspot/os_cpu/linux_arm/linux_arm_32.S b/src/hotspot/os_cpu/linux_arm/linux_arm_32.S -index c1c8fd428154..626982e13db0 100644 +index c1c8fd42815..626982e13db 100644 --- a/src/hotspot/os_cpu/linux_arm/linux_arm_32.S +++ b/src/hotspot/os_cpu/linux_arm/linux_arm_32.S @@ -94,7 +94,7 @@ dw_f2b_loop_32: @@ -132,5 +132,5 @@ index c1c8fd428154..626982e13db0 100644 cmp r2, #16 blt cl_b2f_copy_8 -- -2.44.0 +2.50.1 diff --git a/packages/openjdk-17/0021-arm-fix-assembly-in-os_linux_arm.cpp.patch b/packages/openjdk-17/0021-arm-fix-assembly-in-os_linux_arm.cpp.patch index a0ae35d4833e99b..5c6320cb049ebff 100644 --- a/packages/openjdk-17/0021-arm-fix-assembly-in-os_linux_arm.cpp.patch +++ b/packages/openjdk-17/0021-arm-fix-assembly-in-os_linux_arm.cpp.patch @@ -1,14 +1,14 @@ -From 729d65c3f5268a64c4bb212b6dff920c24afa21b Mon Sep 17 00:00:00 2001 +From bd6352d1091def4018de615fd4732cd33424f4b0 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Wed, 30 Jun 2021 14:30:02 +0700 -Subject: [PATCH] arm: fix assembly in os_linux_arm.cpp +Subject: [PATCH 21/42] arm: fix assembly in os_linux_arm.cpp --- src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp b/src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp -index a9a3087419bd..3296ad867666 100644 +index 4812edd8314..022923dda47 100644 --- a/src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp +++ b/src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp @@ -408,8 +408,8 @@ void os::setup_fpu() { @@ -23,5 +23,5 @@ index a9a3087419bd..3296ad867666 100644 ); #endif -- -2.44.0 +2.50.1 diff --git a/packages/openjdk-17/0022-Add-workaround-for-tagged-pointers-on-Android-12.patch b/packages/openjdk-17/0022-Add-workaround-for-tagged-pointers-on-Android-12.patch index a4fe4ebc189182b..257a8b280afcc9e 100644 --- a/packages/openjdk-17/0022-Add-workaround-for-tagged-pointers-on-Android-12.patch +++ b/packages/openjdk-17/0022-Add-workaround-for-tagged-pointers-on-Android-12.patch @@ -1,7 +1,7 @@ -From e89d39d41e2f7094178aa856d57e5ea1b779d790 Mon Sep 17 00:00:00 2001 +From 3c98d873480cfdb6bdf554140600df0020b318ac Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Fri, 3 Feb 2023 11:32:40 +0100 -Subject: [PATCH] Add workaround for tagged pointers on Android 12 +Subject: [PATCH 22/42] Add workaround for tagged pointers on Android 12 Co-authored-by: dev-bz <32380878+dev-bz@users.noreply.github.com> --- @@ -9,10 +9,10 @@ Co-authored-by: dev-bz <32380878+dev-bz@users.noreply.github.com> 1 file changed, 28 insertions(+) diff --git a/src/java.base/share/native/libjli/java.c b/src/java.base/share/native/libjli/java.c -index e519686cb78b..095afa1159bb 100644 +index 18c515d8678..6919ff865bc 100644 --- a/src/java.base/share/native/libjli/java.c +++ b/src/java.base/share/native/libjli/java.c -@@ -54,6 +54,32 @@ +@@ -56,6 +56,32 @@ #include "java.h" #include "jni.h" @@ -45,7 +45,7 @@ index e519686cb78b..095afa1159bb 100644 /* * A NOTE TO DEVELOPERS: For performance reasons it is important that * the program image remain relatively small until after SelectVersion -@@ -252,6 +278,8 @@ JLI_Launch(int argc, char ** argv, /* main argc, argv */ +@@ -253,6 +279,8 @@ JLI_Launch(int argc, char ** argv, /* main argc, argv */ _is_java_args = javaargs; _wc_enabled = cpwildcard; @@ -55,5 +55,5 @@ index e519686cb78b..095afa1159bb 100644 DumpState(); if (JLI_IsTraceLauncher()) { -- -2.44.0 +2.50.1 diff --git a/packages/openjdk-17/0023-x86-always-compile-with-PIC.patch b/packages/openjdk-17/0023-x86-always-compile-with-PIC.patch index 3117a4f37529827..2ba11829c458e01 100644 --- a/packages/openjdk-17/0023-x86-always-compile-with-PIC.patch +++ b/packages/openjdk-17/0023-x86-always-compile-with-PIC.patch @@ -1,14 +1,14 @@ -From ab98aadd7953c5d41fad994e82e433d07dfb1885 Mon Sep 17 00:00:00 2001 +From 3f25c151b5bf32ce76dbe5d4aa9150d4194bcf2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BA=AF=E6=B4=84?= <1840686745@qq.com> Date: Thu, 26 Aug 2021 14:00:54 +0800 -Subject: [PATCH] x86: always compile with PIC +Subject: [PATCH 23/42] x86: always compile with PIC --- make/hotspot/lib/JvmOverrideFiles.gmk | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/make/hotspot/lib/JvmOverrideFiles.gmk b/make/hotspot/lib/JvmOverrideFiles.gmk -index a9f8a0e54ede..2ba0ec0105e8 100644 +index a9f8a0e54ed..2ba0ec0105e 100644 --- a/make/hotspot/lib/JvmOverrideFiles.gmk +++ b/make/hotspot/lib/JvmOverrideFiles.gmk @@ -65,24 +65,6 @@ ifeq ($(call isTargetOs, linux), true) @@ -37,5 +37,5 @@ index a9f8a0e54ede..2ba0ec0105e8 100644 # The copied fdlibm routines in these files must not be optimized BUILD_LIBJVM_sharedRuntimeTrig.cpp_CXXFLAGS := $(FDLIBM_CFLAGS) $(LIBJVM_FDLIBM_COPY_OPT_FLAG) -- -2.44.0 +2.50.1 diff --git a/packages/openjdk-17/0024-Fix-StackOverflowError-on-ARM.patch b/packages/openjdk-17/0024-Fix-StackOverflowError-on-ARM.patch index 062e0c65edf115d..8c0cd90cfef6053 100644 --- a/packages/openjdk-17/0024-Fix-StackOverflowError-on-ARM.patch +++ b/packages/openjdk-17/0024-Fix-StackOverflowError-on-ARM.patch @@ -1,14 +1,14 @@ -From 6af54e5c11b0d9d24f24a453ea0f3be1ff9eab30 Mon Sep 17 00:00:00 2001 +From 3d1a10c3fd6916e53eaf643c857d6cc360c11929 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BA=AF=E6=B4=84?= <1840686745@qq.com> Date: Thu, 26 Aug 2021 03:53:25 +0800 -Subject: [PATCH] Fix StackOverflowError on ARM +Subject: [PATCH 24/42] Fix StackOverflowError on ARM --- src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp b/src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp -index 3296ad867666..f53b57a4795e 100644 +index 022923dda47..d512280d501 100644 --- a/src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp +++ b/src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp @@ -83,8 +83,14 @@ @@ -27,5 +27,5 @@ index 3296ad867666..f53b57a4795e 100644 char* os::non_memory_address_word() { -- -2.44.0 +2.50.1 diff --git a/packages/openjdk-17/0025-android-dlvsym-is-available-if-ANDROID_API-24.patch b/packages/openjdk-17/0025-android-dlvsym-is-available-if-ANDROID_API-24.patch index 783e4732e401bba..9d88c286ec6c72b 100644 --- a/packages/openjdk-17/0025-android-dlvsym-is-available-if-ANDROID_API-24.patch +++ b/packages/openjdk-17/0025-android-dlvsym-is-available-if-ANDROID_API-24.patch @@ -1,17 +1,17 @@ -From 3e14a49cc9ff3c2a302a8306000fc1de7da3087f Mon Sep 17 00:00:00 2001 +From e606e7ba5f43072968263794a94d89f36a21a82d Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Fri, 3 Feb 2023 11:50:57 +0100 -Subject: [PATCH] android: dlvsym is available if ANDROID_API >= 24 +Subject: [PATCH 25/42] android: dlvsym is available if ANDROID_API >= 24 --- src/hotspot/os/linux/os_linux.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp -index 5e9b44598acd..31fc882b0344 100644 +index 1112c8dc3b0..25016b72c5c 100644 --- a/src/hotspot/os/linux/os_linux.cpp +++ b/src/hotspot/os/linux/os_linux.cpp -@@ -132,7 +132,7 @@ +@@ -135,7 +135,7 @@ // for timer info max values which include all bits #define ALL_64_BITS CONST64(0xFFFFFFFFFFFFFFFF) @@ -21,5 +21,5 @@ index 5e9b44598acd..31fc882b0344 100644 // and musl libc doesn't implement it. static void *dlvsym(void *handle, -- -2.44.0 +2.50.1 diff --git a/packages/openjdk-17/0026-configure-do-not-require-alsa.patch b/packages/openjdk-17/0026-configure-do-not-require-alsa.patch index b5855696fa447d2..8c7a7cdc7338ab9 100644 --- a/packages/openjdk-17/0026-configure-do-not-require-alsa.patch +++ b/packages/openjdk-17/0026-configure-do-not-require-alsa.patch @@ -1,7 +1,7 @@ -From 5ad51e1ed4153e1be3582eea47470ebed51f6b5a Mon Sep 17 00:00:00 2001 +From 9f818c5a35d29fbc168d67b59aeb8ed087e6b056 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Wed, 8 Feb 2023 15:36:25 +0100 -Subject: [PATCH] configure: do not require alsa +Subject: [PATCH 26/42] configure: do not require alsa Android, which counts as linux according to configure check, does not have alsa so we cannot use it. @@ -10,7 +10,7 @@ have alsa so we cannot use it. 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/make/autoconf/libraries.m4 b/make/autoconf/libraries.m4 -index 3c9a466eaf48..c59f500a350a 100644 +index 865feea36d9..57ccd8b8911 100644 --- a/make/autoconf/libraries.m4 +++ b/make/autoconf/libraries.m4 @@ -74,12 +74,7 @@ AC_DEFUN_ONCE([LIB_DETERMINE_DEPENDENCIES], @@ -28,5 +28,5 @@ index 3c9a466eaf48..c59f500a350a 100644 # Check if ffi is needed if HOTSPOT_CHECK_JVM_VARIANT(zero); then -- -2.44.0 +2.50.1 diff --git a/packages/openjdk-17/0027-Update-hardcoded-paths-to-work-in-termux.patch b/packages/openjdk-17/0027-Update-hardcoded-paths-to-work-in-termux.patch index 21c211734a4ebe4..62e29992b059dcc 100644 --- a/packages/openjdk-17/0027-Update-hardcoded-paths-to-work-in-termux.patch +++ b/packages/openjdk-17/0027-Update-hardcoded-paths-to-work-in-termux.patch @@ -1,7 +1,7 @@ -From aa5840c43ce552624fed1b29c76364cb86ded2fe Mon Sep 17 00:00:00 2001 +From 6d264b31f90ce850e4ce58b48867699013a5e772 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Tue, 6 Jul 2021 18:29:24 +0700 -Subject: [PATCH] Update hardcoded paths to work in termux +Subject: [PATCH 27/42] Update hardcoded paths to work in termux --- src/hotspot/os/linux/os_linux.cpp | 10 +++++-- @@ -33,10 +33,10 @@ Subject: [PATCH] Update hardcoded paths to work in termux 26 files changed, 74 insertions(+), 73 deletions(-) diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp -index 31fc882b0344..e815b0afd7c1 100644 +index 25016b72c5c..2637a1075d6 100644 --- a/src/hotspot/os/linux/os_linux.cpp +++ b/src/hotspot/os/linux/os_linux.cpp -@@ -1382,7 +1382,13 @@ const char* os::dll_file_extension() { return ".so"; } +@@ -1445,7 +1445,13 @@ const char* os::dll_file_extension() { return ".so"; } // This must be hard coded because it's the system's temporary // directory not the java application's temp directory, ala java.io.tmpdir. @@ -49,9 +49,9 @@ index 31fc882b0344..e815b0afd7c1 100644 +#endif +} - static bool file_exists(const char* filename) { - struct stat statbuf; -@@ -2238,7 +2244,7 @@ void os::Linux::print_process_memory_info(outputStream* st) { + // check if addr is inside libjvm.so + bool os::address_is_in_vm(address addr) { +@@ -2348,7 +2354,7 @@ void os::Linux::print_process_memory_info(outputStream* st) { } bool os::Linux::print_ld_preload_file(outputStream* st) { @@ -61,7 +61,7 @@ index 31fc882b0344..e815b0afd7c1 100644 void os::Linux::print_uptime_info(outputStream* st) { diff --git a/src/hotspot/share/utilities/virtualizationSupport.cpp b/src/hotspot/share/utilities/virtualizationSupport.cpp -index 5a2e8651efaf..971f74af5605 100644 +index 5a2e8651efa..971f74af560 100644 --- a/src/hotspot/share/utilities/virtualizationSupport.cpp +++ b/src/hotspot/share/utilities/virtualizationSupport.cpp @@ -52,7 +52,7 @@ void VirtualizationSupport::initialize() { @@ -74,7 +74,7 @@ index 5a2e8651efaf..971f74af5605 100644 #endif if (dlHandle == NULL) { diff --git a/src/java.base/linux/classes/sun/nio/fs/LinuxFileSystem.java b/src/java.base/linux/classes/sun/nio/fs/LinuxFileSystem.java -index a3153b31329f..594a26c111ce 100644 +index a3153b31329..594a26c111c 100644 --- a/src/java.base/linux/classes/sun/nio/fs/LinuxFileSystem.java +++ b/src/java.base/linux/classes/sun/nio/fs/LinuxFileSystem.java @@ -118,7 +118,7 @@ class LinuxFileSystem extends UnixFileSystem { @@ -87,7 +87,7 @@ index a3153b31329f..594a26c111ce 100644 diff --git a/src/java.base/linux/classes/sun/nio/fs/LinuxFileSystemProvider.java b/src/java.base/linux/classes/sun/nio/fs/LinuxFileSystemProvider.java -index a1c2aed4bd24..23c7df39c31b 100644 +index a1c2aed4bd2..23c7df39c31 100644 --- a/src/java.base/linux/classes/sun/nio/fs/LinuxFileSystemProvider.java +++ b/src/java.base/linux/classes/sun/nio/fs/LinuxFileSystemProvider.java @@ -104,7 +104,7 @@ class LinuxFileSystemProvider extends UnixFileSystemProvider { @@ -100,7 +100,7 @@ index a1c2aed4bd24..23c7df39c31b 100644 return chain(new MimeTypesFileTypeDetector(userMimeTypes), new MimeTypesFileTypeDetector(etcMimeTypes)); diff --git a/src/java.base/share/classes/sun/net/www/MimeTable.java b/src/java.base/share/classes/sun/net/www/MimeTable.java -index b20566bdc8b9..8c3b8cfcd02c 100644 +index b20566bdc8b..8c3b8cfcd02 100644 --- a/src/java.base/share/classes/sun/net/www/MimeTable.java +++ b/src/java.base/share/classes/sun/net/www/MimeTable.java @@ -57,9 +57,8 @@ public class MimeTable implements FileNameMap { @@ -116,7 +116,7 @@ index b20566bdc8b9..8c3b8cfcd02c 100644 return null; } diff --git a/src/java.base/share/classes/sun/security/jca/ProviderConfig.java b/src/java.base/share/classes/sun/security/jca/ProviderConfig.java -index 7a9022e8769c..9964dd4a6224 100644 +index 7a9022e8769..9964dd4a622 100644 --- a/src/java.base/share/classes/sun/security/jca/ProviderConfig.java +++ b/src/java.base/share/classes/sun/security/jca/ProviderConfig.java @@ -98,7 +98,7 @@ final class ProviderConfig { @@ -129,7 +129,7 @@ index 7a9022e8769c..9964dd4a6224 100644 return Boolean.FALSE; } diff --git a/src/java.base/unix/classes/sun/net/dns/ResolverConfigurationImpl.java b/src/java.base/unix/classes/sun/net/dns/ResolverConfigurationImpl.java -index d46138f23b74..4d626da8f2cc 100644 +index d46138f23b7..4d626da8f2c 100644 --- a/src/java.base/unix/classes/sun/net/dns/ResolverConfigurationImpl.java +++ b/src/java.base/unix/classes/sun/net/dns/ResolverConfigurationImpl.java @@ -64,7 +64,7 @@ public class ResolverConfigurationImpl @@ -142,7 +142,7 @@ index d46138f23b74..4d626da8f2cc 100644 while ((line = in.readLine()) != null) { int maxvalues = maxperkeyword; diff --git a/src/java.base/unix/native/libjava/ProcessImpl_md.c b/src/java.base/unix/native/libjava/ProcessImpl_md.c -index 3854f36daf08..8d9cc64e178b 100644 +index d9a16dad422..532b3d8ffeb 100644 --- a/src/java.base/unix/native/libjava/ProcessImpl_md.c +++ b/src/java.base/unix/native/libjava/ProcessImpl_md.c @@ -230,7 +230,7 @@ xmalloc(JNIEnv *env, size_t size) @@ -155,7 +155,7 @@ index 3854f36daf08..8d9cc64e178b 100644 static const char* diff --git a/src/java.base/unix/native/libjava/TimeZone_md.c b/src/java.base/unix/native/libjava/TimeZone_md.c -index 94dfc207f965..0d0ffdab0ee9 100644 +index 5c40fc8b320..ed2f293f844 100644 --- a/src/java.base/unix/native/libjava/TimeZone_md.c +++ b/src/java.base/unix/native/libjava/TimeZone_md.c @@ -60,9 +60,9 @@ static char *isFileIdentical(char* buf, size_t size, char *pathname); @@ -172,10 +172,10 @@ index 94dfc207f965..0d0ffdab0ee9 100644 static const char *SYS_INIT_FILE = "/etc/default/init"; static const char *ZONEINFO_DIR = "/usr/share/lib/zoneinfo"; diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java -index 042ca1878747..0be96292517a 100644 +index f3c3353180f..e8badd2b46f 100644 --- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java +++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java -@@ -482,13 +482,10 @@ class Metacity implements SynthConstants { +@@ -529,13 +529,10 @@ class Metacity implements SynthConstants { String[] dirs = new String[] { userHome + sep + ".themes", System.getProperty("swing.metacitythemedir"), @@ -194,10 +194,10 @@ index 042ca1878747..0be96292517a 100644 URL themeDir = null; diff --git a/src/java.desktop/share/classes/com/sun/media/sound/SoftSynthesizer.java b/src/java.desktop/share/classes/com/sun/media/sound/SoftSynthesizer.java -index 70b8b622df9c..7dc6d97d452c 100644 +index ee37cb7198b..47a60e9178b 100644 --- a/src/java.desktop/share/classes/com/sun/media/sound/SoftSynthesizer.java +++ b/src/java.desktop/share/classes/com/sun/media/sound/SoftSynthesizer.java -@@ -685,11 +685,11 @@ public final class SoftSynthesizer implements AudioSynthesizer, +@@ -684,11 +684,11 @@ public final class SoftSynthesizer implements AudioSynthesizer, File[] systemSoundFontsDir = new File[] { /* Arch, Fedora, Mageia */ @@ -214,7 +214,7 @@ index 70b8b622df9c..7dc6d97d452c 100644 /* diff --git a/src/java.desktop/share/classes/sun/font/SunFontManager.java b/src/java.desktop/share/classes/sun/font/SunFontManager.java -index 870009612f77..824a07db37c4 100644 +index 870009612f7..824a07db37c 100644 --- a/src/java.desktop/share/classes/sun/font/SunFontManager.java +++ b/src/java.desktop/share/classes/sun/font/SunFontManager.java @@ -3448,7 +3448,7 @@ public abstract class SunFontManager implements FontSupport, FontManagerForSGE { @@ -227,10 +227,10 @@ index 870009612f77..824a07db37c4 100644 false, false); return null; diff --git a/src/java.desktop/share/classes/sun/print/PSPrinterJob.java b/src/java.desktop/share/classes/sun/print/PSPrinterJob.java -index 4645aabd8615..2d3d6bfccc00 100644 +index 71c642a4b71..1073b52fa18 100644 --- a/src/java.desktop/share/classes/sun/print/PSPrinterJob.java +++ b/src/java.desktop/share/classes/sun/print/PSPrinterJob.java -@@ -1630,7 +1630,7 @@ public class PSPrinterJob extends RasterPrinterJob { +@@ -1631,7 +1631,7 @@ public class PSPrinterJob extends RasterPrinterJob { String osname = System.getProperty("os.name"); if (osname.equals("Linux") || osname.contains("OS X")) { execCmd = new String[ncomps]; @@ -239,7 +239,7 @@ index 4645aabd8615..2d3d6bfccc00 100644 if ((pFlags & PRINTER) != 0) { execCmd[n++] = "-P" + printer; } -@@ -1652,7 +1652,7 @@ public class PSPrinterJob extends RasterPrinterJob { +@@ -1653,7 +1653,7 @@ public class PSPrinterJob extends RasterPrinterJob { } else { ncomps+=1; //add 1 arg for lp execCmd = new String[ncomps]; @@ -249,7 +249,7 @@ index 4645aabd8615..2d3d6bfccc00 100644 if ((pFlags & PRINTER) != 0) { execCmd[n++] = "-d" + printer; diff --git a/src/java.desktop/unix/classes/sun/awt/X11/MotifColorUtilities.java b/src/java.desktop/unix/classes/sun/awt/X11/MotifColorUtilities.java -index f42a180532e3..9acecdb14c4a 100644 +index f42a180532e..9acecdb14c4 100644 --- a/src/java.desktop/unix/classes/sun/awt/X11/MotifColorUtilities.java +++ b/src/java.desktop/unix/classes/sun/awt/X11/MotifColorUtilities.java @@ -412,7 +412,7 @@ class MotifColorUtilities { @@ -262,7 +262,7 @@ index f42a180532e3..9acecdb14c4a 100644 if (!pFile.exists()) { diff --git a/src/java.desktop/unix/classes/sun/print/PrintServiceLookupProvider.java b/src/java.desktop/unix/classes/sun/print/PrintServiceLookupProvider.java -index 79fc2fd15eef..7fb0c803ccd1 100644 +index 876913553af..bfd2ff36f49 100644 --- a/src/java.desktop/unix/classes/sun/print/PrintServiceLookupProvider.java +++ b/src/java.desktop/unix/classes/sun/print/PrintServiceLookupProvider.java @@ -81,10 +81,10 @@ public class PrintServiceLookupProvider extends PrintServiceLookup @@ -307,7 +307,7 @@ index 79fc2fd15eef..7fb0c803ccd1 100644 String[] names = execCmd(command); if ((names == null) || (names.length == 0)) { -@@ -757,7 +757,7 @@ public class PrintServiceLookupProvider extends PrintServiceLookup +@@ -765,7 +765,7 @@ public class PrintServiceLookupProvider extends PrintServiceLookup if (cmdIndex == UNINITIALIZED) { cmdIndex = getBSDCommandIndex(); } @@ -316,7 +316,7 @@ index 79fc2fd15eef..7fb0c803ccd1 100644 String[] result = execCmd(command); if (result == null || !(result[0].equals(name))) { -@@ -779,7 +779,7 @@ public class PrintServiceLookupProvider extends PrintServiceLookup +@@ -787,7 +787,7 @@ public class PrintServiceLookupProvider extends PrintServiceLookup static String getDefaultPrinterNameSysV() { String defaultPrinter = "lp"; @@ -325,7 +325,7 @@ index 79fc2fd15eef..7fb0c803ccd1 100644 String [] names = execCmd(command); if (names == null || names.length == 0) { -@@ -801,7 +801,7 @@ public class PrintServiceLookupProvider extends PrintServiceLookup +@@ -809,7 +809,7 @@ public class PrintServiceLookupProvider extends PrintServiceLookup private PrintService getNamedPrinterNameSysV(String name) { @@ -334,7 +334,7 @@ index 79fc2fd15eef..7fb0c803ccd1 100644 String []result = execCmd(command); if (result == null || result[0].indexOf("unknown printer") > 0) { -@@ -813,7 +813,7 @@ public class PrintServiceLookupProvider extends PrintServiceLookup +@@ -821,7 +821,7 @@ public class PrintServiceLookupProvider extends PrintServiceLookup private String[] getAllPrinterNamesSysV() { String defaultPrinter = "lp"; @@ -343,7 +343,7 @@ index 79fc2fd15eef..7fb0c803ccd1 100644 String [] names = execCmd(command); ArrayList printerNames = new ArrayList<>(); -@@ -870,7 +870,7 @@ public class PrintServiceLookupProvider extends PrintServiceLookup +@@ -879,7 +879,7 @@ public class PrintServiceLookupProvider extends PrintServiceLookup try { final String[] cmd = new String[3]; if (isAIX()) { @@ -353,10 +353,10 @@ index 79fc2fd15eef..7fb0c803ccd1 100644 cmd[2] = "env LC_ALL=C " + command; } else { diff --git a/src/java.desktop/unix/classes/sun/print/UnixPrintJob.java b/src/java.desktop/unix/classes/sun/print/UnixPrintJob.java -index 4f810d947d49..41ae71fb589d 100644 +index 89e76d20c57..f655014b79d 100644 --- a/src/java.desktop/unix/classes/sun/print/UnixPrintJob.java +++ b/src/java.desktop/unix/classes/sun/print/UnixPrintJob.java -@@ -882,7 +882,7 @@ public class UnixPrintJob implements CancelablePrintJob { +@@ -883,7 +883,7 @@ public class UnixPrintJob implements CancelablePrintJob { ncomps+=1; } execCmd = new String[ncomps]; @@ -366,10 +366,10 @@ index 4f810d947d49..41ae71fb589d 100644 execCmd[n++] = "-P" + printer; } diff --git a/src/java.desktop/unix/classes/sun/print/UnixPrintService.java b/src/java.desktop/unix/classes/sun/print/UnixPrintService.java -index 2a11a6e2d058..d07da584dc7b 100644 +index bbd8c6c9c78..afc1c572f95 100644 --- a/src/java.desktop/unix/classes/sun/print/UnixPrintService.java +++ b/src/java.desktop/unix/classes/sun/print/UnixPrintService.java -@@ -231,7 +231,7 @@ public class UnixPrintService implements PrintService, AttributeUpdater, +@@ -228,7 +228,7 @@ public class UnixPrintService implements PrintService, AttributeUpdater, PrintServiceLookupProvider.getBSDCommandIndex(); } @@ -378,7 +378,7 @@ index 2a11a6e2d058..d07da584dc7b 100644 + lpcStatusCom[PrintServiceLookupProvider.cmdIndex]; String[] results= PrintServiceLookupProvider.execCmd(command); -@@ -280,7 +280,7 @@ public class UnixPrintService implements PrintService, AttributeUpdater, +@@ -277,7 +277,7 @@ public class UnixPrintService implements PrintService, AttributeUpdater, private PrinterIsAcceptingJobs getPrinterIsAcceptingJobsAIX() { // On AIX there should not be a blank after '-a'. @@ -387,7 +387,7 @@ index 2a11a6e2d058..d07da584dc7b 100644 String[] results= PrintServiceLookupProvider.execCmd(command); // Remove headers and bogus entries added by remote printers. -@@ -336,7 +336,7 @@ public class UnixPrintService implements PrintService, AttributeUpdater, +@@ -333,7 +333,7 @@ public class UnixPrintService implements PrintService, AttributeUpdater, } int qlen = 0; @@ -396,7 +396,7 @@ index 2a11a6e2d058..d07da584dc7b 100644 + lpcQueueCom[PrintServiceLookupProvider.cmdIndex]; String[] results = PrintServiceLookupProvider.execCmd(command); -@@ -365,7 +365,7 @@ public class UnixPrintService implements PrintService, AttributeUpdater, +@@ -362,7 +362,7 @@ public class UnixPrintService implements PrintService, AttributeUpdater, private QueuedJobCount getQueuedJobCountAIX() { // On AIX there should not be a blank after '-a'. @@ -406,7 +406,7 @@ index 2a11a6e2d058..d07da584dc7b 100644 // Remove headers and bogus entries added by remote printers. diff --git a/src/java.desktop/unix/native/common/awt/fontpath.c b/src/java.desktop/unix/native/common/awt/fontpath.c -index fa5fc982327e..222af29cef33 100644 +index df35e78e6e1..aeaab71d6a6 100644 --- a/src/java.desktop/unix/native/common/awt/fontpath.c +++ b/src/java.desktop/unix/native/common/awt/fontpath.c @@ -66,19 +66,18 @@ extern Display *awt_display; @@ -442,7 +442,7 @@ index fa5fc982327e..222af29cef33 100644 }; #elif defined(_AIX) diff --git a/src/java.prefs/unix/classes/java/util/prefs/FileSystemPreferences.java b/src/java.prefs/unix/classes/java/util/prefs/FileSystemPreferences.java -index b30a23465c52..f92872239dfd 100644 +index b30a23465c5..f92872239df 100644 --- a/src/java.prefs/unix/classes/java/util/prefs/FileSystemPreferences.java +++ b/src/java.prefs/unix/classes/java/util/prefs/FileSystemPreferences.java @@ -182,7 +182,7 @@ class FileSystemPreferences extends AbstractPreferences { @@ -455,10 +455,10 @@ index b30a23465c52..f92872239dfd 100644 new File(systemPrefsDirName, ".systemPrefs"); // Attempt to create root dir if it does not yet exist. diff --git a/src/java.security.jgss/share/classes/sun/security/krb5/Config.java b/src/java.security.jgss/share/classes/sun/security/krb5/Config.java -index fadb115245f5..b7c4b392d705 100644 +index 8219874b112..8c5624b6026 100644 --- a/src/java.security.jgss/share/classes/sun/security/krb5/Config.java +++ b/src/java.security.jgss/share/classes/sun/security/krb5/Config.java -@@ -930,7 +930,7 @@ public class Config { +@@ -936,7 +936,7 @@ public class Config { } else if (osname.contains("OS X")) { name = findMacosConfigFile(); } else { @@ -468,7 +468,7 @@ index fadb115245f5..b7c4b392d705 100644 if (DEBUG) { System.out.println("Native config name: " + name); diff --git a/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java -index f0379c04e915..6b37c25f3250 100644 +index f0379c04e91..6b37c25f325 100644 --- a/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java +++ b/src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java @@ -600,7 +600,7 @@ public class FileCredentialsCache extends CredentialsCache @@ -481,7 +481,7 @@ index f0379c04e915..6b37c25f3250 100644 if (s1.length() >= 11) { if ((s1.substring(0, 11)).equalsIgnoreCase diff --git a/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java b/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java -index 38fa3da9ea76..f7dc33afb91a 100644 +index 38fa3da9ea7..f7dc33afb91 100644 --- a/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java +++ b/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java @@ -46,8 +46,8 @@ class PlatformPCSC { @@ -496,7 +496,7 @@ index 38fa3da9ea76..f7dc33afb91a 100644 PlatformPCSC() { diff --git a/src/jdk.hotspot.agent/linux/native/libsaproc/symtab.c b/src/jdk.hotspot.agent/linux/native/libsaproc/symtab.c -index e147cdecaf9b..7a9b9d2706f7 100644 +index 753f5b5e087..f48737bdee7 100644 --- a/src/jdk.hotspot.agent/linux/native/libsaproc/symtab.c +++ b/src/jdk.hotspot.agent/linux/native/libsaproc/symtab.c @@ -53,7 +53,7 @@ typedef struct symtab { @@ -509,10 +509,10 @@ index e147cdecaf9b..7a9b9d2706f7 100644 /* The CRC used in gnu_debuglink, retrieved from http://sourceware.org/gdb/current/onlinedocs/gdb/Separate-Debug-Files.html#Separate-Debug-Files. */ diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxDebBundler.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxDebBundler.java -index a4533b101c93..4aefbd7888c2 100644 +index 71e98a4b2ac..bbc424a033c 100644 --- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxDebBundler.java +++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxDebBundler.java -@@ -414,7 +414,7 @@ public class LinuxDebBundler extends LinuxPackageBundler { +@@ -432,7 +432,7 @@ public class LinuxDebBundler extends LinuxPackageBundler { final String installDir = LINUX_INSTALL_DIR.fetchFrom(params); if (!StandardBundlerParam.isRuntimeInstaller(params) @@ -521,7 +521,7 @@ index a4533b101c93..4aefbd7888c2 100644 debianFiles.add(new DebianFile( getConfig_CopyrightFile(params), "resource.copyright-file")); -@@ -446,8 +446,8 @@ public class LinuxDebBundler extends LinuxPackageBundler { +@@ -467,8 +467,8 @@ public class LinuxDebBundler extends LinuxPackageBundler { final String packageName = PACKAGE_NAME.fetchFrom(params); final Path installPath; @@ -533,7 +533,7 @@ index a4533b101c93..4aefbd7888c2 100644 installPath = Path.of(installDir, packageName, "share/doc/copyright"); } diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackageBundler.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackageBundler.java -index ce327cd2743c..624452b526e9 100644 +index ce327cd2743..624452b526e 100644 --- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackageBundler.java +++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackageBundler.java @@ -340,7 +340,7 @@ abstract class LinuxPackageBundler extends AbstractBundler { @@ -555,7 +555,7 @@ index ce327cd2743c..624452b526e9 100644 (s, p) -> s ); diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/utils.sh b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/utils.sh -index 1ed96076282c..7673dc0e9b48 100644 +index 1ed96076282..7673dc0e9b4 100644 --- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/utils.sh +++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/utils.sh @@ -92,7 +92,7 @@ _uninstall_default_mime_handler () @@ -568,5 +568,5 @@ index 1ed96076282c..7673dc0e9b48 100644 done } -- -2.44.0 +2.50.1 diff --git a/packages/openjdk-17/0028-elfFile.hpp-no-need-to-define-ELF-32-64-_ST_TYPE-on-.patch b/packages/openjdk-17/0028-elfFile.hpp-no-need-to-define-ELF-32-64-_ST_TYPE-on-.patch index fed0945b62fdb55..c7eba5020d83b2d 100644 --- a/packages/openjdk-17/0028-elfFile.hpp-no-need-to-define-ELF-32-64-_ST_TYPE-on-.patch +++ b/packages/openjdk-17/0028-elfFile.hpp-no-need-to-define-ELF-32-64-_ST_TYPE-on-.patch @@ -1,7 +1,8 @@ -From 01b6f110577b2fff0b8d9649abd1f49fdac26e6a Mon Sep 17 00:00:00 2001 +From eac1c2fb7e924888988f331d904a5a6717e75e41 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sat, 4 Feb 2023 22:45:13 +0100 -Subject: [PATCH] elfFile.hpp: no need to define ELF{32,64}_ST_TYPE on android +Subject: [PATCH 28/42] elfFile.hpp: no need to define ELF{32,64}_ST_TYPE on + android As the elf.h header already provides defintions. --- @@ -9,7 +10,7 @@ As the elf.h header already provides defintions. 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/hotspot/share/utilities/elfFile.hpp b/src/hotspot/share/utilities/elfFile.hpp -index 0db847238456..96307e112dd8 100644 +index 0db84723845..96307e112dd 100644 --- a/src/hotspot/share/utilities/elfFile.hpp +++ b/src/hotspot/share/utilities/elfFile.hpp @@ -46,7 +46,7 @@ typedef Elf64_Shdr Elf_Shdr; @@ -31,5 +32,5 @@ index 0db847238456..96307e112dd8 100644 #endif #endif -- -2.44.0 +2.50.1 diff --git a/packages/openjdk-17/0029-os-linux-add-getloadavg-implementation-for-android.patch b/packages/openjdk-17/0029-os-linux-add-getloadavg-implementation-for-android.patch index 7055a4143f5ec1d..7b23138abfeabb3 100644 --- a/packages/openjdk-17/0029-os-linux-add-getloadavg-implementation-for-android.patch +++ b/packages/openjdk-17/0029-os-linux-add-getloadavg-implementation-for-android.patch @@ -1,17 +1,17 @@ -From 5ac1dc92c8abd3289bd40da1b4e4793019e8a64b Mon Sep 17 00:00:00 2001 +From 84adbdb247279d5a4abf50c9cac4dc64dbc63b94 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 5 Feb 2023 09:14:50 +0100 -Subject: [PATCH] os: linux: add getloadavg implementation for android +Subject: [PATCH 29/42] os: linux: add getloadavg implementation for android --- src/hotspot/os/linux/os_linux.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp -index e815b0afd7c1..06a5d0bf8245 100644 +index 2637a1075d6..81b108c6169 100644 --- a/src/hotspot/os/linux/os_linux.cpp +++ b/src/hotspot/os/linux/os_linux.cpp -@@ -5234,7 +5234,20 @@ bool os::is_thread_cpu_time_supported() { +@@ -5300,7 +5300,20 @@ bool os::is_thread_cpu_time_supported() { // Linux doesn't yet have a (official) notion of processor sets, // so just return the system wide load average. int os::loadavg(double loadavg[], int nelem) { @@ -33,5 +33,5 @@ index e815b0afd7c1..06a5d0bf8245 100644 void os::pause() { -- -2.44.0 +2.50.1 diff --git a/packages/openjdk-17/0030-os-linux-use-getpagesize-instad-of-SHMLBA.patch b/packages/openjdk-17/0030-os-linux-use-getpagesize-instad-of-SHMLBA.patch index 622a7939d7ae87f..4eea8b69cb505f6 100644 --- a/packages/openjdk-17/0030-os-linux-use-getpagesize-instad-of-SHMLBA.patch +++ b/packages/openjdk-17/0030-os-linux-use-getpagesize-instad-of-SHMLBA.patch @@ -1,7 +1,7 @@ -From d8ac751229b8d4795a04f1d8ec08d03d8916b5f9 Mon Sep 17 00:00:00 2001 +From 66f69428855dfcc7481f5ac0f87b81a2a0d81342 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 5 Feb 2023 09:21:57 +0100 -Subject: [PATCH] os: linux: use getpagesize() instad of SHMLBA +Subject: [PATCH 30/42] os: linux: use getpagesize() instad of SHMLBA Since the latter is not defined on android. --- @@ -9,10 +9,10 @@ Since the latter is not defined on android. 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp -index 06a5d0bf8245..4a48a8a69f76 100644 +index 81b108c6169..115d5345218 100644 --- a/src/hotspot/os/linux/os_linux.cpp +++ b/src/hotspot/os/linux/os_linux.cpp -@@ -3912,7 +3912,7 @@ void os::large_page_init() { +@@ -4013,7 +4013,7 @@ void os::large_page_init() { static char* shmat_with_alignment(int shmid, size_t bytes, size_t alignment) { assert(is_aligned(bytes, alignment), "Must be divisible by the alignment"); @@ -21,7 +21,7 @@ index 06a5d0bf8245..4a48a8a69f76 100644 assert(false, "Code below assumes that alignment is at least SHMLBA aligned"); return NULL; } -@@ -3948,7 +3948,7 @@ static char* shmat_with_alignment(int shmid, size_t bytes, size_t alignment) { +@@ -4049,7 +4049,7 @@ static char* shmat_with_alignment(int shmid, size_t bytes, size_t alignment) { } static char* shmat_at_address(int shmid, char* req_addr) { @@ -31,5 +31,5 @@ index 06a5d0bf8245..4a48a8a69f76 100644 return NULL; } -- -2.44.0 +2.50.1 diff --git a/packages/openjdk-17/0031-libjava-change-return-type-of-strerror_r.patch b/packages/openjdk-17/0031-libjava-change-return-type-of-strerror_r.patch index fe047e982a76725..3414613dad39ab6 100644 --- a/packages/openjdk-17/0031-libjava-change-return-type-of-strerror_r.patch +++ b/packages/openjdk-17/0031-libjava-change-return-type-of-strerror_r.patch @@ -1,7 +1,7 @@ -From 5e5592026e96de8dfcab9ffad09bdf571343fe62 Mon Sep 17 00:00:00 2001 +From 09fb20452e4a7c8fc37a9f350b4716248de8968d Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 5 Feb 2023 11:47:24 +0100 -Subject: [PATCH] libjava: change return type of strerror_r +Subject: [PATCH 31/42] libjava: change return type of strerror_r Later versions of android uses the GNU style and returns a char pointer. Adjust jni function to match this. @@ -12,10 +12,10 @@ pointer. Adjust jni function to match this. 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/java.base/share/native/libjava/jni_util.h b/src/java.base/share/native/libjava/jni_util.h -index bd815e6f1b90..86c542f4cc1d 100644 +index 4e4d687b71e..0d2c6e835dc 100644 --- a/src/java.base/share/native/libjava/jni_util.h +++ b/src/java.base/share/native/libjava/jni_util.h -@@ -339,7 +339,7 @@ void buildJniFunctionName(const char *sym, const char *cname, +@@ -342,7 +342,7 @@ void buildJniFunctionName(const char *sym, const char *cname, JNIEXPORT size_t JNICALL getLastErrorString(char *buf, size_t len); @@ -25,10 +25,10 @@ index bd815e6f1b90..86c542f4cc1d 100644 #ifdef STATIC_BUILD diff --git a/src/java.base/unix/native/libjava/ProcessImpl_md.c b/src/java.base/unix/native/libjava/ProcessImpl_md.c -index 8d9cc64e178b..949b3f2aef09 100644 +index 532b3d8ffeb..61523bc599e 100644 --- a/src/java.base/unix/native/libjava/ProcessImpl_md.c +++ b/src/java.base/unix/native/libjava/ProcessImpl_md.c -@@ -325,10 +325,9 @@ throwIOException(JNIEnv *env, int errnum, const char *defaultDetail) +@@ -329,10 +329,9 @@ throwIOException(JNIEnv *env, int errnum, const char *defaultDetail) char tmpbuf[1024]; jstring s; @@ -43,7 +43,7 @@ index 8d9cc64e178b..949b3f2aef09 100644 /* ASCII Decimal representation uses 2.4 times as many bits as binary. */ fmtsize = sizeof(IOE_FORMAT) + strlen(detail) + 3 * sizeof(errnum); diff --git a/src/java.base/unix/native/libjava/jni_util_md.c b/src/java.base/unix/native/libjava/jni_util_md.c -index 335637b0a115..8f4a76d3b975 100644 +index 335637b0a11..8f4a76d3b97 100644 --- a/src/java.base/unix/native/libjava/jni_util_md.c +++ b/src/java.base/unix/native/libjava/jni_util_md.c @@ -61,7 +61,7 @@ getLastErrorString(char *buf, size_t len) @@ -56,5 +56,5 @@ index 335637b0a115..8f4a76d3b975 100644 { if (err == 0 || len < 1) return 0; -- -2.44.0 +2.50.1 diff --git a/packages/openjdk-17/0032-make-cflags-handle-arm-like-other-arches.patch b/packages/openjdk-17/0032-make-cflags-handle-arm-like-other-arches.patch index 3e5945ec43c6545..7f05957505fea72 100644 --- a/packages/openjdk-17/0032-make-cflags-handle-arm-like-other-arches.patch +++ b/packages/openjdk-17/0032-make-cflags-handle-arm-like-other-arches.patch @@ -1,17 +1,17 @@ -From 2230460cbf0015f7d37b627aad0841e9b17b30ce Mon Sep 17 00:00:00 2001 +From 3c4fb616d110a09523dbc6f216799fe83d7ba4b1 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Mon, 13 Feb 2023 13:49:47 +0100 -Subject: [PATCH] make: cflags: handle arm like other arches +Subject: [PATCH 32/42] make: cflags: handle arm like other arches --- make/autoconf/flags-cflags.m4 | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/make/autoconf/flags-cflags.m4 b/make/autoconf/flags-cflags.m4 -index c0626e8f9a45..3cd0550eb314 100644 +index f7f2ad53000..c170ce13b9b 100644 --- a/make/autoconf/flags-cflags.m4 +++ b/make/autoconf/flags-cflags.m4 -@@ -58,13 +58,7 @@ AC_DEFUN([FLAGS_SETUP_SHARED_LIBS], +@@ -64,13 +64,7 @@ AC_DEFUN([FLAGS_SETUP_SHARED_LIBS], SET_SHARED_LIBRARY_NAME='-Wl,-soname=[$]1' SET_SHARED_LIBRARY_MAPFILE='-Wl,-version-script=[$]1' @@ -27,5 +27,5 @@ index c0626e8f9a45..3cd0550eb314 100644 elif test "x$TOOLCHAIN_TYPE" = xxlc; then -- -2.44.0 +2.50.1 diff --git a/packages/openjdk-17/0033-Fix-bugs-in-File.getCanonicalPath.patch b/packages/openjdk-17/0033-Fix-bugs-in-File.getCanonicalPath.patch index d2a86c3d4fd3c32..4cf39998e598371 100644 --- a/packages/openjdk-17/0033-Fix-bugs-in-File.getCanonicalPath.patch +++ b/packages/openjdk-17/0033-Fix-bugs-in-File.getCanonicalPath.patch @@ -1,7 +1,7 @@ -From d7ca77f10800afc2485fe162869cf23b4d0c90f7 Mon Sep 17 00:00:00 2001 +From b50ae5a43a17f743538828d933edfb592e035d7d Mon Sep 17 00:00:00 2001 From: agnostic-apollo Date: Thu, 28 Mar 2024 18:46:02 +0100 -Subject: [PATCH] Fix bugs in File.getCanonicalPath() +Subject: [PATCH 33/42] Fix bugs in File.getCanonicalPath() 1. If path length is `>= PATH_MAX` (4096) characters, return error. 2. If any path component length is `> NAME_MAX` (255) characters, return @@ -15,7 +15,7 @@ Subject: [PATCH] Fix bugs in File.getCanonicalPath() 1 file changed, 87 insertions(+), 15 deletions(-) diff --git a/src/java.base/unix/native/libjava/canonicalize_md.c b/src/java.base/unix/native/libjava/canonicalize_md.c -index 2bb896bf32d7..7210f305282f 100644 +index 2bb896bf32d..7210f305282 100644 --- a/src/java.base/unix/native/libjava/canonicalize_md.c +++ b/src/java.base/unix/native/libjava/canonicalize_md.c @@ -33,6 +33,7 @@ @@ -221,5 +221,5 @@ index 2bb896bf32d7..7210f305282f 100644 } } -- -2.44.0 +2.50.1 diff --git a/packages/openjdk-17/0034-JvmMapfile.gmk-filter-same-symbols-for-linux-and-and.patch b/packages/openjdk-17/0034-JvmMapfile.gmk-filter-same-symbols-for-linux-and-and.patch index 2d725a8cc900a48..518fe7d9e94cf09 100644 --- a/packages/openjdk-17/0034-JvmMapfile.gmk-filter-same-symbols-for-linux-and-and.patch +++ b/packages/openjdk-17/0034-JvmMapfile.gmk-filter-same-symbols-for-linux-and-and.patch @@ -1,14 +1,15 @@ -From ac7ca9573e061e5a3d89e8f502c86dd350125919 Mon Sep 17 00:00:00 2001 +From d62811ef0e6e4c89fb12f83451a0f7fe7dc2a5d6 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Sat, 5 Jun 2021 17:25:37 +0700 -Subject: [PATCH] JvmMapfile.gmk: filter same symbols for linux and android +Subject: [PATCH 34/42] JvmMapfile.gmk: filter same symbols for linux and + android --- make/hotspot/lib/JvmMapfile.gmk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make/hotspot/lib/JvmMapfile.gmk b/make/hotspot/lib/JvmMapfile.gmk -index 5cba93178c74..181e0db5c0eb 100644 +index 5cba93178c7..181e0db5c0e 100644 --- a/make/hotspot/lib/JvmMapfile.gmk +++ b/make/hotspot/lib/JvmMapfile.gmk @@ -52,7 +52,7 @@ endif @@ -21,5 +22,5 @@ index 5cba93178c74..181e0db5c0eb 100644 ifneq ($(FILTER_SYMBOLS_PATTERN), ) FILTER_SYMBOLS_PATTERN := $(FILTER_SYMBOLS_PATTERN)| -- -2.44.0 +2.50.1 diff --git a/packages/openjdk-17/0035-Fix-build-with-lld-17.patch b/packages/openjdk-17/0035-Fix-build-with-lld-17.patch index 35a846d114fa76c..fb8206f9cbb317b 100644 --- a/packages/openjdk-17/0035-Fix-build-with-lld-17.patch +++ b/packages/openjdk-17/0035-Fix-build-with-lld-17.patch @@ -1,7 +1,7 @@ -From 9a2f49340af3294be5bee5ad786aef5275182e75 Mon Sep 17 00:00:00 2001 +From d79cb2fa52e6509cd72aec430e0050d2a5a85648 Mon Sep 17 00:00:00 2001 From: agnostic-apollo Date: Thu, 28 Mar 2024 18:52:49 +0100 -Subject: [PATCH] Fix build with lld 17 +Subject: [PATCH 35/42] Fix build with lld 17 Original Author: Dimitry Andric @@ -11,7 +11,7 @@ https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=274109 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make/hotspot/lib/JvmMapfile.gmk b/make/hotspot/lib/JvmMapfile.gmk -index 181e0db5c0eb..c3936c74c748 100644 +index 181e0db5c0e..c3936c74c74 100644 --- a/make/hotspot/lib/JvmMapfile.gmk +++ b/make/hotspot/lib/JvmMapfile.gmk @@ -53,7 +53,7 @@ endif @@ -24,5 +24,5 @@ index 181e0db5c0eb..c3936c74c748 100644 FILTER_SYMBOLS_PATTERN := $(FILTER_SYMBOLS_PATTERN)| endif -- -2.44.0 +2.50.1 diff --git a/packages/openjdk-17/0036-Remove-sysThreadAvailableStackWithSlack-from-hotspot.patch b/packages/openjdk-17/0036-Remove-sysThreadAvailableStackWithSlack-from-hotspot.patch index 1abf4fce2be66a1..174addf947ee24c 100644 --- a/packages/openjdk-17/0036-Remove-sysThreadAvailableStackWithSlack-from-hotspot.patch +++ b/packages/openjdk-17/0036-Remove-sysThreadAvailableStackWithSlack-from-hotspot.patch @@ -1,7 +1,8 @@ -From 9ad02b3db690bbde48ae03b26184192094f1a161 Mon Sep 17 00:00:00 2001 +From 87fe84e17ef36d35c49e10cc496d0324b57ef292 Mon Sep 17 00:00:00 2001 From: agnostic-apollo Date: Thu, 28 Mar 2024 18:52:49 +0100 -Subject: [PATCH] Remove sysThreadAvailableStackWithSlack from hotspot-symbols +Subject: [PATCH 36/42] Remove sysThreadAvailableStackWithSlack from + hotspot-symbols https://bugs.openjdk.org/browse/JDK-8296970 @@ -14,7 +15,7 @@ https://github.com/openjdk/jdk/commit/f662a060463c2982da40307a53d59e514390f60c 2 files changed, 2 deletions(-) diff --git a/make/data/hotspot-symbols/symbols-aix b/make/data/hotspot-symbols/symbols-aix -index 92703573a5f5..11dad0fece50 100644 +index 92703573a5f..11dad0fece5 100644 --- a/make/data/hotspot-symbols/symbols-aix +++ b/make/data/hotspot-symbols/symbols-aix @@ -24,4 +24,3 @@ @@ -23,7 +24,7 @@ index 92703573a5f5..11dad0fece50 100644 numa_warn -sysThreadAvailableStackWithSlack diff --git a/make/data/hotspot-symbols/symbols-linux b/make/data/hotspot-symbols/symbols-linux -index bbb0d35115fc..b0d802f1773f 100644 +index bbb0d35115f..b0d802f1773 100644 --- a/make/data/hotspot-symbols/symbols-linux +++ b/make/data/hotspot-symbols/symbols-linux @@ -25,4 +25,3 @@ JVM_handle_linux_signal @@ -32,5 +33,5 @@ index bbb0d35115fc..b0d802f1773f 100644 numa_warn -sysThreadAvailableStackWithSlack -- -2.44.0 +2.50.1 diff --git a/packages/openjdk-17/0037-hotspot-os_linux-do-not-use-dlinfo-and-RTLD_DI_LINKM.patch b/packages/openjdk-17/0037-hotspot-os_linux-do-not-use-dlinfo-and-RTLD_DI_LINKM.patch index c816f2970ce1dcb..3f0daaea0a2701f 100644 --- a/packages/openjdk-17/0037-hotspot-os_linux-do-not-use-dlinfo-and-RTLD_DI_LINKM.patch +++ b/packages/openjdk-17/0037-hotspot-os_linux-do-not-use-dlinfo-and-RTLD_DI_LINKM.patch @@ -1,16 +1,16 @@ -From ac9a6de051aa1ffea5ea1ce843954cc2fbd67e69 Mon Sep 17 00:00:00 2001 +From dad91b67469d788f632a4138ee79c9e551121ff4 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 31 Mar 2024 20:20:05 +0200 -Subject: [PATCH 37/37] hotspot: os_linux: do not use dlinfo and +Subject: [PATCH 37/42] hotspot: os_linux: do not use dlinfo and RTLD_DI_LINKMAP on android As they are not available. --- - src/hotspot/os/linux/os_linux.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) + src/hotspot/os/linux/os_linux.cpp | 2 ++ + 1 file changed, 2 insertions(+) diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp -index 5b429470b..5a6468053 100644 +index 115d5345218..bf5330e4331 100644 --- a/src/hotspot/os/linux/os_linux.cpp +++ b/src/hotspot/os/linux/os_linux.cpp @@ -1948,10 +1948,12 @@ const char* os::Linux::dll_path(void* lib) { @@ -27,4 +27,5 @@ index 5b429470b..5a6468053 100644 } -- -2.45.2 +2.50.1 + diff --git a/packages/openjdk-17/0038-OUTTREE-bionic-type-redef-fix.patch b/packages/openjdk-17/0038-OUTTREE-bionic-type-redef-fix.patch index 63ddcb2d1f27cfd..c6e5f60dadfaea9 100644 --- a/packages/openjdk-17/0038-OUTTREE-bionic-type-redef-fix.patch +++ b/packages/openjdk-17/0038-OUTTREE-bionic-type-redef-fix.patch @@ -1,11 +1,26 @@ ---- a/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c -+++ b/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c -@@ -79,7 +79,7 @@ - // by defining binary compatible statx structs in this file and - // not relying on included headers. - --#ifndef __GLIBC__ -+#if !defined(__BIONIC__) && !defined(__GLIBC__) - // Alpine doesn't know these types, define them - typedef unsigned int __uint32_t; - typedef unsigned short __uint16_t; +From c2e1c4da1a73363b655362e6b45837c749e36588 Mon Sep 17 00:00:00 2001 +From: Robert Kirkman <31490854+robertkirkman@users.noreply.github.com> +Date: Mon, 5 May 2025 21:07:27 -0500 +Subject: [PATCH 38/42] OUTTREE bionic type redef fix + +Co-authored-by: eval Nya <11857526-nexplorer-3e@users.noreply.gitlab.com> +--- + src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c b/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c +index 51b18326c18..83ed08e85aa 100644 +--- a/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c ++++ b/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c +@@ -79,7 +79,7 @@ + // by defining binary compatible statx structs in this file and + // not relying on included headers. + +-#ifndef __GLIBC__ ++#if !defined(__BIONIC__) && !defined(__GLIBC__) + // Alpine doesn't know these types, define them + typedef unsigned int __uint32_t; + typedef unsigned short __uint16_t; +-- +2.50.1 + diff --git a/packages/openjdk-17/0039-Fix-hardcoded-paths-in-jdk.attach.patch b/packages/openjdk-17/0039-Fix-hardcoded-paths-in-jdk.attach.patch index d96f00f2895ebe4..932fe375f3bae86 100644 --- a/packages/openjdk-17/0039-Fix-hardcoded-paths-in-jdk.attach.patch +++ b/packages/openjdk-17/0039-Fix-hardcoded-paths-in-jdk.attach.patch @@ -1,14 +1,14 @@ -From e7570675c4db70ea7314ae342def2445b0eea3c8 Mon Sep 17 00:00:00 2001 +From 37c9b217d2faca78083023b66e306aa008e07c7c Mon Sep 17 00:00:00 2001 From: Chongyun Lee <45286352+licy183@users.noreply.github.com> Date: Tue, 3 Sep 2024 12:34:31 +0800 -Subject: [PATCH] Fix: hardcoded paths in jdk.attach +Subject: [PATCH 39/42] Fix: hardcoded paths in jdk.attach --- .../linux/classes/sun/tools/attach/VirtualMachineImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/jdk.attach/linux/classes/sun/tools/attach/VirtualMachineImpl.java b/src/jdk.attach/linux/classes/sun/tools/attach/VirtualMachineImpl.java -index a5d743a2635..3d32c514f54 100644 +index 77ac7c85d60..1dd80b002ae 100644 --- a/src/jdk.attach/linux/classes/sun/tools/attach/VirtualMachineImpl.java +++ b/src/jdk.attach/linux/classes/sun/tools/attach/VirtualMachineImpl.java @@ -46,7 +46,7 @@ public class VirtualMachineImpl extends HotSpotVirtualMachine { @@ -20,3 +20,6 @@ index a5d743a2635..3d32c514f54 100644 String socket_path; /** * Attaches to the target VM +-- +2.50.1 + diff --git a/packages/openjdk-17/0040-Do-not-disable-new-dtags.patch b/packages/openjdk-17/0040-Do-not-disable-new-dtags.patch index 2178ab3694e724e..41654daf5205ed7 100644 --- a/packages/openjdk-17/0040-Do-not-disable-new-dtags.patch +++ b/packages/openjdk-17/0040-Do-not-disable-new-dtags.patch @@ -1,7 +1,17 @@ -diff -u -r ../src/make/autoconf/flags-cflags.m4 ./make/autoconf/flags-cflags.m4 ---- ../src/make/autoconf/flags-cflags.m4 2024-09-01 20:09:35.611261408 +0000 -+++ ./make/autoconf/flags-cflags.m4 2024-09-01 20:10:49.387795908 +0000 -@@ -66,9 +66,6 @@ +From 7b4056f187d3b6c00edbea564ccd97da279dab75 Mon Sep 17 00:00:00 2001 +From: Robert Kirkman <31490854+robertkirkman@users.noreply.github.com> +Date: Mon, 5 May 2025 21:07:27 -0500 +Subject: [PATCH 40/42] Do not disable new dtags + +--- + make/autoconf/flags-cflags.m4 | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/make/autoconf/flags-cflags.m4 b/make/autoconf/flags-cflags.m4 +index c170ce13b9b..a6419552a4e 100644 +--- a/make/autoconf/flags-cflags.m4 ++++ b/make/autoconf/flags-cflags.m4 +@@ -58,9 +58,6 @@ AC_DEFUN([FLAGS_SETUP_SHARED_LIBS], # Default works for linux, might work on other platforms as well. SHARED_LIBRARY_FLAGS='-shared' SET_EXECUTABLE_ORIGIN='-Wl,-rpath,\$$ORIGIN[$]1' @@ -11,3 +21,6 @@ diff -u -r ../src/make/autoconf/flags-cflags.m4 ./make/autoconf/flags-cflags.m4 SET_SHARED_LIBRARY_NAME='-Wl,-soname=[$]1' SET_SHARED_LIBRARY_MAPFILE='-Wl,-version-script=[$]1' +-- +2.50.1 + diff --git a/packages/openjdk-17/0041-disable-statx-syscall.patch b/packages/openjdk-17/0041-disable-statx-syscall.patch index 4e04d3175084fa9..8a972f4f25ded9c 100644 --- a/packages/openjdk-17/0041-disable-statx-syscall.patch +++ b/packages/openjdk-17/0041-disable-statx-syscall.patch @@ -1,13 +1,26 @@ -This turns off dynamically loading the statx() symbol, which has the same effect as reverting -https://github.com/openjdk/jdk17u/commit/184fac8af61633ccf833eda53183a27da8efb0f7 , +From 007931c1fd75b57456c99bd6b7a6e7008a195f39 Mon Sep 17 00:00:00 2001 +From: Robert Kirkman <31490854+robertkirkman@users.noreply.github.com> +Date: Thu, 8 May 2025 01:47:00 -0500 +Subject: [PATCH 41/42] disable statx syscall + +This turns off dynamically loading the statx() symbol, which has the +same effect as reverting +https://github.com/openjdk/jdk17u/commit/184fac8af61633ccf833eda53183a27da8efb0f7 +, which was fixing https://bugs.openjdk.org/browse/JDK-8316304 , -because on some devices, for some reason it causes launching any JAR to crash the Java runtime. +because on some devices, for some reason it causes launching any JAR to +crash the Java runtime. Fixes https://github.com/termux/termux-packages/issues/24651 +--- + src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +diff --git a/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c b/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c +index 83ed08e85aa..2c4d34da0b3 100644 --- a/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c +++ b/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c -@@ -434,7 +438,7 @@ Java_sun_nio_fs_UnixNativeDispatcher_init(JNIEnv* env, jclass this) +@@ -442,7 +442,7 @@ Java_sun_nio_fs_UnixNativeDispatcher_init(JNIEnv* env, jclass this) #ifdef _DARWIN_FEATURE_64_BIT_INODE capabilities |= sun_nio_fs_UnixNativeDispatcher_SUPPORTS_BIRTHTIME; #endif @@ -16,3 +29,6 @@ Fixes https://github.com/termux/termux-packages/issues/24651 my_statx_func = (statx_func*) dlsym(RTLD_DEFAULT, "statx"); if (my_statx_func != NULL) { capabilities |= sun_nio_fs_UnixNativeDispatcher_SUPPORTS_BIRTHTIME; +-- +2.50.1 + diff --git a/packages/openjdk-17/0042-make-autoconf-define-ARM-for-arm-build-with-clang.patch b/packages/openjdk-17/0042-make-autoconf-define-ARM-for-arm-build-with-clang.patch index 6d16dbfac2a8336..6ab691f904432d7 100644 --- a/packages/openjdk-17/0042-make-autoconf-define-ARM-for-arm-build-with-clang.patch +++ b/packages/openjdk-17/0042-make-autoconf-define-ARM-for-arm-build-with-clang.patch @@ -1,7 +1,7 @@ -From 58a290a32c05355aa4698188b5cbd4113fb8644f Mon Sep 17 00:00:00 2001 +From 06d574a9f4d9783950dea232aa326ce290f5440b Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 31 Mar 2024 12:02:51 +0200 -Subject: [PATCH] make: autoconf: define ARM for arm build with clang +Subject: [PATCH 42/42] make: autoconf: define ARM for arm build with clang Fixes error like @@ -15,10 +15,10 @@ gmake[2]: *** [make/Main.gmk:252: hotspot-server-libs] Error 2 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/make/autoconf/flags-cflags.m4 b/make/autoconf/flags-cflags.m4 -index 3cd0550eb314..1b2d520690ed 100644 +index a6419552a4e..9f90ea3f635 100644 --- a/make/autoconf/flags-cflags.m4 +++ b/make/autoconf/flags-cflags.m4 -@@ -715,7 +715,12 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP], +@@ -753,7 +753,12 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP], $1_CFLAGS_CPU_JDK="${$1_CFLAGS_CPU_JDK} -fno-omit-frame-pointer" fi fi @@ -33,5 +33,5 @@ index 3cd0550eb314..1b2d520690ed 100644 if test "x$FLAGS_CPU" = xppc64; then $1_CFLAGS_CPU_JVM="-qarch=ppc64" -- -2.44.0 +2.50.1 From 496863d3c7d1317dfe13c87383d9a9031a7592e1 Mon Sep 17 00:00:00 2001 From: alexytomi <60690056+alexytomi@users.noreply.github.com> Date: Mon, 21 Jul 2025 15:01:00 +0800 Subject: [PATCH 5/9] fix(main/openjdk-17): Build ALSA This was disabled before someone made the `alsa-utils`, `alsa-lib` and `alsa-plugins` packages and added a pulseaudio backend to ALSA --- ...lude-netinet-in.h-for-android-builds.patch | 4 +-- ...s_linux-add-android-checks-and-fixes.patch | 4 +-- ...Define-sys-gettid-on-arm-and-aarch64.patch | 4 +-- ...six-print-uptime-overridden-by-linux.patch | 4 +-- ...prevent-build-of-libjsound-and-libsa.patch | 4 +-- .../0006-Link-against-system-libiconv.patch | 4 +-- ...h64_get_thread_helper-Thread-current.patch | 4 +-- ...008-Remove-aarch64_get_thread_helper.patch | 4 +-- .../0009-Use-Android-s-strerror_r.patch | 4 +-- .../0010-Use-utimensat-on-android.patch | 4 +-- ..._nio_fs_UnixNativeDispatcher_futimes.patch | 4 +-- ...0012-Add-CXXFLAGS_JDKLIB-to-CXXFLAGS.patch | 4 +-- .../0013-Use-ASCII-codeset-on-android.patch | 4 +-- ...vm.so-path-when-run-from-Android-app.patch | 4 +-- ...-address-to-char-when-clearing-cache.patch | 4 +-- ...control-related-functions-on-Android.patch | 4 +-- ...ink-against-libawt-to-fix-link-error.patch | 4 +-- ...m.so-path-from-proc-self-maps-on-and.patch | 4 +-- ...f-exiting-if-getcpu-2-is-unsupported.patch | 4 +-- .../0020-Remove-pre-UAL-aliases.patch | 4 +-- ...arm-fix-assembly-in-os_linux_arm.cpp.patch | 4 +-- ...nd-for-tagged-pointers-on-Android-12.patch | 4 +-- .../0023-x86-always-compile-with-PIC.patch | 4 +-- .../0024-Fix-StackOverflowError-on-ARM.patch | 4 +-- ...lvsym-is-available-if-ANDROID_API-24.patch | 4 +-- ...e-hardcoded-paths-to-work-in-termux.patch} | 4 +-- .../0026-configure-do-not-require-alsa.patch | 32 ------------------- ...ed-to-define-ELF-32-64-_ST_TYPE-on-.patch} | 4 +-- ...tloadavg-implementation-for-android.patch} | 4 +-- ...ux-use-getpagesize-instad-of-SHMLBA.patch} | 4 +-- ...va-change-return-type-of-strerror_r.patch} | 4 +-- ...cflags-handle-arm-like-other-arches.patch} | 4 +-- ...2-Fix-bugs-in-File.getCanonicalPath.patch} | 4 +-- ...lter-same-symbols-for-linux-and-and.patch} | 4 +-- ...patch => 0034-Fix-build-with-lld-17.patch} | 4 +-- ...vailableStackWithSlack-from-hotspot.patch} | 4 +-- ...do-not-use-dlinfo-and-RTLD_DI_LINKM.patch} | 4 +-- ... 0037-OUTTREE-bionic-type-redef-fix.patch} | 4 +-- ...8-Fix-hardcoded-paths-in-jdk.attach.patch} | 4 +-- ...ch => 0039-Do-not-disable-new-dtags.patch} | 4 +-- ...patch => 0040-disable-statx-syscall.patch} | 4 +-- ...define-ARM-for-arm-build-with-clang.patch} | 4 +-- 42 files changed, 82 insertions(+), 114 deletions(-) rename packages/openjdk-17/{0027-Update-hardcoded-paths-to-work-in-termux.patch => 0026-Update-hardcoded-paths-to-work-in-termux.patch} (99%) delete mode 100644 packages/openjdk-17/0026-configure-do-not-require-alsa.patch rename packages/openjdk-17/{0028-elfFile.hpp-no-need-to-define-ELF-32-64-_ST_TYPE-on-.patch => 0027-elfFile.hpp-no-need-to-define-ELF-32-64-_ST_TYPE-on-.patch} (89%) rename packages/openjdk-17/{0029-os-linux-add-getloadavg-implementation-for-android.patch => 0028-os-linux-add-getloadavg-implementation-for-android.patch} (88%) rename packages/openjdk-17/{0030-os-linux-use-getpagesize-instad-of-SHMLBA.patch => 0029-os-linux-use-getpagesize-instad-of-SHMLBA.patch} (90%) rename packages/openjdk-17/{0031-libjava-change-return-type-of-strerror_r.patch => 0030-libjava-change-return-type-of-strerror_r.patch} (94%) rename packages/openjdk-17/{0032-make-cflags-handle-arm-like-other-arches.patch => 0031-make-cflags-handle-arm-like-other-arches.patch} (88%) rename packages/openjdk-17/{0033-Fix-bugs-in-File.getCanonicalPath.patch => 0032-Fix-bugs-in-File.getCanonicalPath.patch} (98%) rename packages/openjdk-17/{0034-JvmMapfile.gmk-filter-same-symbols-for-linux-and-and.patch => 0033-JvmMapfile.gmk-filter-same-symbols-for-linux-and-and.patch} (86%) rename packages/openjdk-17/{0035-Fix-build-with-lld-17.patch => 0034-Fix-build-with-lld-17.patch} (88%) rename packages/openjdk-17/{0036-Remove-sysThreadAvailableStackWithSlack-from-hotspot.patch => 0035-Remove-sysThreadAvailableStackWithSlack-from-hotspot.patch} (89%) rename packages/openjdk-17/{0037-hotspot-os_linux-do-not-use-dlinfo-and-RTLD_DI_LINKM.patch => 0036-hotspot-os_linux-do-not-use-dlinfo-and-RTLD_DI_LINKM.patch} (85%) rename packages/openjdk-17/{0038-OUTTREE-bionic-type-redef-fix.patch => 0037-OUTTREE-bionic-type-redef-fix.patch} (88%) rename packages/openjdk-17/{0039-Fix-hardcoded-paths-in-jdk.attach.patch => 0038-Fix-hardcoded-paths-in-jdk.attach.patch} (89%) rename packages/openjdk-17/{0040-Do-not-disable-new-dtags.patch => 0039-Do-not-disable-new-dtags.patch} (88%) rename packages/openjdk-17/{0041-disable-statx-syscall.patch => 0040-disable-statx-syscall.patch} (92%) rename packages/openjdk-17/{0042-make-autoconf-define-ARM-for-arm-build-with-clang.patch => 0041-make-autoconf-define-ARM-for-arm-build-with-clang.patch} (90%) diff --git a/packages/openjdk-17/0001-libinet-include-netinet-in.h-for-android-builds.patch b/packages/openjdk-17/0001-libinet-include-netinet-in.h-for-android-builds.patch index b1909709debc238..687e3ee5be3a40a 100644 --- a/packages/openjdk-17/0001-libinet-include-netinet-in.h-for-android-builds.patch +++ b/packages/openjdk-17/0001-libinet-include-netinet-in.h-for-android-builds.patch @@ -1,7 +1,7 @@ -From 30d319bb0a70bc55267d75dd8fa0ba597675ea13 Mon Sep 17 00:00:00 2001 +From 629b96388286148842165a382a1a36c3ccc573bb Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 31 Mar 2024 16:31:48 +0200 -Subject: [PATCH 01/42] libinet: include netinet/in.h for android builds +Subject: [PATCH 01/41] libinet: include netinet/in.h for android builds --- src/java.base/unix/native/libnet/net_util_md.h | 3 +++ diff --git a/packages/openjdk-17/0002-os_linux-add-android-checks-and-fixes.patch b/packages/openjdk-17/0002-os_linux-add-android-checks-and-fixes.patch index 790634c08eb74a0..a21b579ce377383 100644 --- a/packages/openjdk-17/0002-os_linux-add-android-checks-and-fixes.patch +++ b/packages/openjdk-17/0002-os_linux-add-android-checks-and-fixes.patch @@ -1,7 +1,7 @@ -From 3e61f8a4d1860dd91cffc4fa79c0faf1f392e4e6 Mon Sep 17 00:00:00 2001 +From bb00232fb384c7d478942c117817435bad86cab1 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Sun, 6 Jun 2021 20:11:11 +0700 -Subject: [PATCH 02/42] os_linux: add android checks and fixes +Subject: [PATCH 02/41] os_linux: add android checks and fixes --- src/hotspot/os/linux/os_linux.cpp | 6 +++++- diff --git a/packages/openjdk-17/0003-Define-sys-gettid-on-arm-and-aarch64.patch b/packages/openjdk-17/0003-Define-sys-gettid-on-arm-and-aarch64.patch index 1b70bc229f83789..78a127f95adddd7 100644 --- a/packages/openjdk-17/0003-Define-sys-gettid-on-arm-and-aarch64.patch +++ b/packages/openjdk-17/0003-Define-sys-gettid-on-arm-and-aarch64.patch @@ -1,7 +1,7 @@ -From f253413671f4f2bb39b7909297ab7edae69fbd0c Mon Sep 17 00:00:00 2001 +From efd25fb9df4f65d7755a2c5c462680954f17b08d Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Mon, 7 Jun 2021 06:27:26 +0700 -Subject: [PATCH 03/42] Define sys gettid on arm and aarch64 +Subject: [PATCH 03/41] Define sys gettid on arm and aarch64 --- src/hotspot/os/linux/os_linux.cpp | 6 ++++-- diff --git a/packages/openjdk-17/0004-Disable-posix-print-uptime-overridden-by-linux.patch b/packages/openjdk-17/0004-Disable-posix-print-uptime-overridden-by-linux.patch index 09f0894bad139bc..245603e77b88a73 100644 --- a/packages/openjdk-17/0004-Disable-posix-print-uptime-overridden-by-linux.patch +++ b/packages/openjdk-17/0004-Disable-posix-print-uptime-overridden-by-linux.patch @@ -1,7 +1,7 @@ -From a81dfe6609873342a44fd4e268e1810d01da974b Mon Sep 17 00:00:00 2001 +From 7cf2ed3622a48303b302b2b21d68a835aedb97cb Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Mon, 7 Jun 2021 08:05:09 +0700 -Subject: [PATCH 04/42] Disable posix print uptime (overridden by linux!) +Subject: [PATCH 04/41] Disable posix print uptime (overridden by linux!) --- src/hotspot/os/posix/os_posix.cpp | 4 ++++ diff --git a/packages/openjdk-17/0005-android-prevent-build-of-libjsound-and-libsa.patch b/packages/openjdk-17/0005-android-prevent-build-of-libjsound-and-libsa.patch index d873a204ca94c47..2215d346c26fffa 100644 --- a/packages/openjdk-17/0005-android-prevent-build-of-libjsound-and-libsa.patch +++ b/packages/openjdk-17/0005-android-prevent-build-of-libjsound-and-libsa.patch @@ -1,7 +1,7 @@ -From de7625e18c25aed495c306f4b5302c32bb1aff81 Mon Sep 17 00:00:00 2001 +From 7da5794712dc653b199601bbde923718d0b4a66f Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Fri, 3 Feb 2023 11:06:24 +0100 -Subject: [PATCH 05/42] android: prevent build of libjsound and libsa +Subject: [PATCH 05/41] android: prevent build of libjsound and libsa --- make/modules/java.desktop/Lib.gmk | 2 -- diff --git a/packages/openjdk-17/0006-Link-against-system-libiconv.patch b/packages/openjdk-17/0006-Link-against-system-libiconv.patch index 8cd696da9a8a2dc..384d5d8a76208cf 100644 --- a/packages/openjdk-17/0006-Link-against-system-libiconv.patch +++ b/packages/openjdk-17/0006-Link-against-system-libiconv.patch @@ -1,7 +1,7 @@ -From b4cac09fd3cf9817479893bcc0eabeb69a7968cb Mon Sep 17 00:00:00 2001 +From fc44aeb811df4739e7e2ee4a0704cf70c27e9690 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Fri, 3 Feb 2023 11:09:10 +0100 -Subject: [PATCH 06/42] Link against system libiconv +Subject: [PATCH 06/41] Link against system libiconv --- make/modules/java.instrument/Lib.gmk | 2 +- diff --git a/packages/openjdk-17/0007-aarch64_get_thread_helper-Thread-current.patch b/packages/openjdk-17/0007-aarch64_get_thread_helper-Thread-current.patch index 79451099f297518..7d905ded8758a7f 100644 --- a/packages/openjdk-17/0007-aarch64_get_thread_helper-Thread-current.patch +++ b/packages/openjdk-17/0007-aarch64_get_thread_helper-Thread-current.patch @@ -1,7 +1,7 @@ -From adffb650e6ac7df4baf71fa62e14d242aec3c6bd Mon Sep 17 00:00:00 2001 +From a581175b5ef5f3ef03d2f068b5fbd285b3b144ba Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Thu, 10 Jun 2021 08:45:16 +0700 -Subject: [PATCH 07/42] aarch64_get_thread_helper() -> Thread::current() +Subject: [PATCH 07/41] aarch64_get_thread_helper() -> Thread::current() Can't build for Android: diff --git a/packages/openjdk-17/0008-Remove-aarch64_get_thread_helper.patch b/packages/openjdk-17/0008-Remove-aarch64_get_thread_helper.patch index 48f332f0b97c0a3..540ff443386ee43 100644 --- a/packages/openjdk-17/0008-Remove-aarch64_get_thread_helper.patch +++ b/packages/openjdk-17/0008-Remove-aarch64_get_thread_helper.patch @@ -1,7 +1,7 @@ -From 7ac68d1b831e50e0245ccd27110336b6a894941c Mon Sep 17 00:00:00 2001 +From 5f1ab5358c05b8bdfa647fcae4fb98a7e1e6725d Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Thu, 10 Jun 2021 08:46:35 +0700 -Subject: [PATCH 08/42] Remove aarch64_get_thread_helper() +Subject: [PATCH 08/41] Remove aarch64_get_thread_helper() See commit 6f407090fda1 ("aarch64_get_thread_helper() -> Thread::current()") for more details. diff --git a/packages/openjdk-17/0009-Use-Android-s-strerror_r.patch b/packages/openjdk-17/0009-Use-Android-s-strerror_r.patch index dc2f78d26ef6cf7..fd0a9da8bf2ac74 100644 --- a/packages/openjdk-17/0009-Use-Android-s-strerror_r.patch +++ b/packages/openjdk-17/0009-Use-Android-s-strerror_r.patch @@ -1,7 +1,7 @@ -From fdc66ed11e918370b34e91f499b0cba07052923a Mon Sep 17 00:00:00 2001 +From ee0fd6b8058597f74874bec8186d6d636ea28039 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Thu, 10 Jun 2021 09:36:26 +0700 -Subject: [PATCH 09/42] Use Android's strerror_r() +Subject: [PATCH 09/41] Use Android's strerror_r() --- src/java.base/unix/native/libjava/jni_util_md.c | 7 ------- diff --git a/packages/openjdk-17/0010-Use-utimensat-on-android.patch b/packages/openjdk-17/0010-Use-utimensat-on-android.patch index 3445441b54d1977..c16f926419b8995 100644 --- a/packages/openjdk-17/0010-Use-utimensat-on-android.patch +++ b/packages/openjdk-17/0010-Use-utimensat-on-android.patch @@ -1,7 +1,7 @@ -From 58fca0e0f89d7aa62c1fa7c80927dd60750c9391 Mon Sep 17 00:00:00 2001 +From b6de6cfa7804b7bce75455561467f9b70a381114 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Thu, 10 Jun 2021 16:42:56 +0700 -Subject: [PATCH 10/42] Use utimensat on android +Subject: [PATCH 10/41] Use utimensat on android --- .../native/libnio/fs/UnixNativeDispatcher.c | 22 ++++++++++++++----- diff --git a/packages/openjdk-17/0011-Fixed-Java_sun_nio_fs_UnixNativeDispatcher_futimes.patch b/packages/openjdk-17/0011-Fixed-Java_sun_nio_fs_UnixNativeDispatcher_futimes.patch index a29f15e8a1939ef..dc13ffd45771916 100644 --- a/packages/openjdk-17/0011-Fixed-Java_sun_nio_fs_UnixNativeDispatcher_futimes.patch +++ b/packages/openjdk-17/0011-Fixed-Java_sun_nio_fs_UnixNativeDispatcher_futimes.patch @@ -1,7 +1,7 @@ -From 9b37ddeaa8e6e77df1ec59c8310a12dfe4ab9add Mon Sep 17 00:00:00 2001 +From fa5a211b5ec8c864cb7a8018c1185528915b5c8d Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Thu, 10 Jun 2021 18:36:56 +0700 -Subject: [PATCH 11/42] Fixed Java_sun_nio_fs_UnixNativeDispatcher_futimes +Subject: [PATCH 11/41] Fixed Java_sun_nio_fs_UnixNativeDispatcher_futimes --- .../unix/native/libnio/fs/UnixNativeDispatcher.c | 11 ++++++----- diff --git a/packages/openjdk-17/0012-Add-CXXFLAGS_JDKLIB-to-CXXFLAGS.patch b/packages/openjdk-17/0012-Add-CXXFLAGS_JDKLIB-to-CXXFLAGS.patch index 6eca185c10114a6..6483caa98d08edc 100644 --- a/packages/openjdk-17/0012-Add-CXXFLAGS_JDKLIB-to-CXXFLAGS.patch +++ b/packages/openjdk-17/0012-Add-CXXFLAGS_JDKLIB-to-CXXFLAGS.patch @@ -1,7 +1,7 @@ -From 19d8921fbc440f4d1203553afc6981f46758b128 Mon Sep 17 00:00:00 2001 +From e2024967cef3b6fd3cd79e35eb2e0692febb30ab Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Thu, 10 Jun 2021 19:23:03 +0700 -Subject: [PATCH 12/42] Add CXXFLAGS_JDKLIB to CXXFLAGS +Subject: [PATCH 12/41] Add CXXFLAGS_JDKLIB to CXXFLAGS For modules jdk.jdwp.agent and java.instrument. --- diff --git a/packages/openjdk-17/0013-Use-ASCII-codeset-on-android.patch b/packages/openjdk-17/0013-Use-ASCII-codeset-on-android.patch index 33827ad1580f809..b76396fb771eb54 100644 --- a/packages/openjdk-17/0013-Use-ASCII-codeset-on-android.patch +++ b/packages/openjdk-17/0013-Use-ASCII-codeset-on-android.patch @@ -1,7 +1,7 @@ -From ebd05e9603e34102bb0e9384896cd9dec9b693a6 Mon Sep 17 00:00:00 2001 +From 90fdab0ad177db3ad07be0a389f406d86f760f34 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Thu, 10 Jun 2021 20:42:40 +0700 -Subject: [PATCH 13/42] Use ASCII codeset on android +Subject: [PATCH 13/41] Use ASCII codeset on android Since android's locale support is very rudimentary. --- diff --git a/packages/openjdk-17/0014-Fix-libjvm.so-path-when-run-from-Android-app.patch b/packages/openjdk-17/0014-Fix-libjvm.so-path-when-run-from-Android-app.patch index 50284846ee4f251..91e599e9352dfb4 100644 --- a/packages/openjdk-17/0014-Fix-libjvm.so-path-when-run-from-Android-app.patch +++ b/packages/openjdk-17/0014-Fix-libjvm.so-path-when-run-from-Android-app.patch @@ -1,7 +1,7 @@ -From a774c397e415836666390f79a14f7f3bd344e08d Mon Sep 17 00:00:00 2001 +From 152a7038bca492f46fad100096d061193aec28a7 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Fri, 11 Jun 2021 07:48:28 +0700 -Subject: [PATCH 14/42] Fix libjvm.so path when run from Android app +Subject: [PATCH 14/41] Fix libjvm.so path when run from Android app --- src/java.base/unix/native/libjli/java_md.c | 49 ++++++++++++++++++++++ diff --git a/packages/openjdk-17/0015-arm-cast-address-to-char-when-clearing-cache.patch b/packages/openjdk-17/0015-arm-cast-address-to-char-when-clearing-cache.patch index 4d7fb616b9b96f7..410a9fcc6852bb7 100644 --- a/packages/openjdk-17/0015-arm-cast-address-to-char-when-clearing-cache.patch +++ b/packages/openjdk-17/0015-arm-cast-address-to-char-when-clearing-cache.patch @@ -1,7 +1,7 @@ -From 30a3b02fe1d041ab5025da87c6e336296900f41b Mon Sep 17 00:00:00 2001 +From 975d959caf0afeceb115c9f2c4f98e6358d51b0c Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Sat, 12 Jun 2021 06:55:18 +0700 -Subject: [PATCH 15/42] arm: cast address to char when clearing cache +Subject: [PATCH 15/41] arm: cast address to char when clearing cache --- src/hotspot/cpu/arm/icache_arm.cpp | 2 +- diff --git a/packages/openjdk-17/0016-Don-t-run-fpu_control-related-functions-on-Android.patch b/packages/openjdk-17/0016-Don-t-run-fpu_control-related-functions-on-Android.patch index 52bff8dfd005e2f..3c8192349777c25 100644 --- a/packages/openjdk-17/0016-Don-t-run-fpu_control-related-functions-on-Android.patch +++ b/packages/openjdk-17/0016-Don-t-run-fpu_control-related-functions-on-Android.patch @@ -1,7 +1,7 @@ -From 1bb822a4396d696f6e59e73a243f713d72afa6e0 Mon Sep 17 00:00:00 2001 +From 5c3824eaf51781644e7df2579d71ea94dfa10eac Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Sat, 12 Jun 2021 06:58:20 +0700 -Subject: [PATCH 16/42] Don't run fpu_control related functions on Android +Subject: [PATCH 16/41] Don't run fpu_control related functions on Android --- src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp | 2 ++ diff --git a/packages/openjdk-17/0017-Libfontmanager-link-against-libawt-to-fix-link-error.patch b/packages/openjdk-17/0017-Libfontmanager-link-against-libawt-to-fix-link-error.patch index ce5bcfaf7ce3efb..6444784799d249b 100644 --- a/packages/openjdk-17/0017-Libfontmanager-link-against-libawt-to-fix-link-error.patch +++ b/packages/openjdk-17/0017-Libfontmanager-link-against-libawt-to-fix-link-error.patch @@ -1,7 +1,7 @@ -From 5d1b7b1c8d7e4e6a70c5c2088dcfb3c460785560 Mon Sep 17 00:00:00 2001 +From 975865b8044614204a3801df1159c7f3e9936ae8 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Sat, 12 Jun 2021 17:03:05 +0700 -Subject: [PATCH 17/42] Libfontmanager: link against libawt to fix link error +Subject: [PATCH 17/41] Libfontmanager: link against libawt to fix link error Partly based on commit from androidports: https://github.com/androidports/openjdk/commit/a3e4f0281154537f01c2e59286a6ceed9c827b11 diff --git a/packages/openjdk-17/0018-Try-to-get-libjvm.so-path-from-proc-self-maps-on-and.patch b/packages/openjdk-17/0018-Try-to-get-libjvm.so-path-from-proc-self-maps-on-and.patch index 2d135c4231ae23c..b39f2d45947d46b 100644 --- a/packages/openjdk-17/0018-Try-to-get-libjvm.so-path-from-proc-self-maps-on-and.patch +++ b/packages/openjdk-17/0018-Try-to-get-libjvm.so-path-from-proc-self-maps-on-and.patch @@ -1,7 +1,7 @@ -From 1db6f3be841ddda5641e99bb80068708dd2e53fc Mon Sep 17 00:00:00 2001 +From dcf3338ea44c1daa9e9c762f4e95c5e52694ee64 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Fri, 25 Jun 2021 17:19:24 +0700 -Subject: [PATCH 18/42] Try to get libjvm.so path from /proc/self/maps on +Subject: [PATCH 18/41] Try to get libjvm.so path from /proc/self/maps on android --- diff --git a/packages/openjdk-17/0019-Warn-instead-of-exiting-if-getcpu-2-is-unsupported.patch b/packages/openjdk-17/0019-Warn-instead-of-exiting-if-getcpu-2-is-unsupported.patch index ab1d14b22bdd266..cfbaa5574cb2ec1 100644 --- a/packages/openjdk-17/0019-Warn-instead-of-exiting-if-getcpu-2-is-unsupported.patch +++ b/packages/openjdk-17/0019-Warn-instead-of-exiting-if-getcpu-2-is-unsupported.patch @@ -1,7 +1,7 @@ -From a817dfffa977df49975451eee4c22e7910db558e Mon Sep 17 00:00:00 2001 +From 01dd18f24d09aac2aaf808fd39527278c13886c4 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Mon, 28 Jun 2021 17:47:31 +0700 -Subject: [PATCH 19/42] Warn instead of exiting if getcpu(2) is unsupported +Subject: [PATCH 19/41] Warn instead of exiting if getcpu(2) is unsupported --- src/hotspot/os/linux/os_linux.cpp | 3 ++- diff --git a/packages/openjdk-17/0020-Remove-pre-UAL-aliases.patch b/packages/openjdk-17/0020-Remove-pre-UAL-aliases.patch index e8f7a8a9757a5a7..374ac3d28f37e79 100644 --- a/packages/openjdk-17/0020-Remove-pre-UAL-aliases.patch +++ b/packages/openjdk-17/0020-Remove-pre-UAL-aliases.patch @@ -1,7 +1,7 @@ -From f49ecac3d40288f3ffbccfb9c4ebcbd85f829fc0 Mon Sep 17 00:00:00 2001 +From 4862e7a5a7ba840bb269be77bef5890254997090 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Wed, 30 Jun 2021 14:28:14 +0700 -Subject: [PATCH 20/42] Remove pre-UAL aliases +Subject: [PATCH 20/41] Remove pre-UAL aliases --- src/hotspot/os_cpu/linux_arm/linux_arm_32.S | 40 ++++++++++----------- diff --git a/packages/openjdk-17/0021-arm-fix-assembly-in-os_linux_arm.cpp.patch b/packages/openjdk-17/0021-arm-fix-assembly-in-os_linux_arm.cpp.patch index 5c6320cb049ebff..0731f512ac9d593 100644 --- a/packages/openjdk-17/0021-arm-fix-assembly-in-os_linux_arm.cpp.patch +++ b/packages/openjdk-17/0021-arm-fix-assembly-in-os_linux_arm.cpp.patch @@ -1,7 +1,7 @@ -From bd6352d1091def4018de615fd4732cd33424f4b0 Mon Sep 17 00:00:00 2001 +From ccbb5a8342951e23fe6c113fbecf8a200dd159cc Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Wed, 30 Jun 2021 14:30:02 +0700 -Subject: [PATCH 21/42] arm: fix assembly in os_linux_arm.cpp +Subject: [PATCH 21/41] arm: fix assembly in os_linux_arm.cpp --- src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp | 4 ++-- diff --git a/packages/openjdk-17/0022-Add-workaround-for-tagged-pointers-on-Android-12.patch b/packages/openjdk-17/0022-Add-workaround-for-tagged-pointers-on-Android-12.patch index 257a8b280afcc9e..8b21f6b830fa6fd 100644 --- a/packages/openjdk-17/0022-Add-workaround-for-tagged-pointers-on-Android-12.patch +++ b/packages/openjdk-17/0022-Add-workaround-for-tagged-pointers-on-Android-12.patch @@ -1,7 +1,7 @@ -From 3c98d873480cfdb6bdf554140600df0020b318ac Mon Sep 17 00:00:00 2001 +From 104f57aeb8785a5c9003c73fb3a26425d056fafa Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Fri, 3 Feb 2023 11:32:40 +0100 -Subject: [PATCH 22/42] Add workaround for tagged pointers on Android 12 +Subject: [PATCH 22/41] Add workaround for tagged pointers on Android 12 Co-authored-by: dev-bz <32380878+dev-bz@users.noreply.github.com> --- diff --git a/packages/openjdk-17/0023-x86-always-compile-with-PIC.patch b/packages/openjdk-17/0023-x86-always-compile-with-PIC.patch index 2ba11829c458e01..af3267767445a46 100644 --- a/packages/openjdk-17/0023-x86-always-compile-with-PIC.patch +++ b/packages/openjdk-17/0023-x86-always-compile-with-PIC.patch @@ -1,7 +1,7 @@ -From 3f25c151b5bf32ce76dbe5d4aa9150d4194bcf2c Mon Sep 17 00:00:00 2001 +From c21940c9a64ad6286f70cbcf48fe29427dfa6b1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BA=AF=E6=B4=84?= <1840686745@qq.com> Date: Thu, 26 Aug 2021 14:00:54 +0800 -Subject: [PATCH 23/42] x86: always compile with PIC +Subject: [PATCH 23/41] x86: always compile with PIC --- make/hotspot/lib/JvmOverrideFiles.gmk | 18 ------------------ diff --git a/packages/openjdk-17/0024-Fix-StackOverflowError-on-ARM.patch b/packages/openjdk-17/0024-Fix-StackOverflowError-on-ARM.patch index 8c0cd90cfef6053..4d319192edef6a6 100644 --- a/packages/openjdk-17/0024-Fix-StackOverflowError-on-ARM.patch +++ b/packages/openjdk-17/0024-Fix-StackOverflowError-on-ARM.patch @@ -1,7 +1,7 @@ -From 3d1a10c3fd6916e53eaf643c857d6cc360c11929 Mon Sep 17 00:00:00 2001 +From 27e919e849e7c45133174d19319f4defe4e323bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BA=AF=E6=B4=84?= <1840686745@qq.com> Date: Thu, 26 Aug 2021 03:53:25 +0800 -Subject: [PATCH 24/42] Fix StackOverflowError on ARM +Subject: [PATCH 24/41] Fix StackOverflowError on ARM --- src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp | 6 ++++++ diff --git a/packages/openjdk-17/0025-android-dlvsym-is-available-if-ANDROID_API-24.patch b/packages/openjdk-17/0025-android-dlvsym-is-available-if-ANDROID_API-24.patch index 9d88c286ec6c72b..f3df0fbc6031e95 100644 --- a/packages/openjdk-17/0025-android-dlvsym-is-available-if-ANDROID_API-24.patch +++ b/packages/openjdk-17/0025-android-dlvsym-is-available-if-ANDROID_API-24.patch @@ -1,7 +1,7 @@ -From e606e7ba5f43072968263794a94d89f36a21a82d Mon Sep 17 00:00:00 2001 +From f0376df484311fa35e2003d88ce20e9d525e6c0c Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Fri, 3 Feb 2023 11:50:57 +0100 -Subject: [PATCH 25/42] android: dlvsym is available if ANDROID_API >= 24 +Subject: [PATCH 25/41] android: dlvsym is available if ANDROID_API >= 24 --- src/hotspot/os/linux/os_linux.cpp | 2 +- diff --git a/packages/openjdk-17/0027-Update-hardcoded-paths-to-work-in-termux.patch b/packages/openjdk-17/0026-Update-hardcoded-paths-to-work-in-termux.patch similarity index 99% rename from packages/openjdk-17/0027-Update-hardcoded-paths-to-work-in-termux.patch rename to packages/openjdk-17/0026-Update-hardcoded-paths-to-work-in-termux.patch index 62e29992b059dcc..b1a42d2c65e6da7 100644 --- a/packages/openjdk-17/0027-Update-hardcoded-paths-to-work-in-termux.patch +++ b/packages/openjdk-17/0026-Update-hardcoded-paths-to-work-in-termux.patch @@ -1,7 +1,7 @@ -From 6d264b31f90ce850e4ce58b48867699013a5e772 Mon Sep 17 00:00:00 2001 +From f3dd6b0c513707cabb38ab6a33e243980a1e47ac Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Tue, 6 Jul 2021 18:29:24 +0700 -Subject: [PATCH 27/42] Update hardcoded paths to work in termux +Subject: [PATCH 26/41] Update hardcoded paths to work in termux --- src/hotspot/os/linux/os_linux.cpp | 10 +++++-- diff --git a/packages/openjdk-17/0026-configure-do-not-require-alsa.patch b/packages/openjdk-17/0026-configure-do-not-require-alsa.patch deleted file mode 100644 index 8c7a7cdc7338ab9..000000000000000 --- a/packages/openjdk-17/0026-configure-do-not-require-alsa.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 9f818c5a35d29fbc168d67b59aeb8ed087e6b056 Mon Sep 17 00:00:00 2001 -From: Henrik Grimler -Date: Wed, 8 Feb 2023 15:36:25 +0100 -Subject: [PATCH 26/42] configure: do not require alsa - -Android, which counts as linux according to configure check, does not -have alsa so we cannot use it. ---- - make/autoconf/libraries.m4 | 7 +------ - 1 file changed, 1 insertion(+), 6 deletions(-) - -diff --git a/make/autoconf/libraries.m4 b/make/autoconf/libraries.m4 -index 865feea36d9..57ccd8b8911 100644 ---- a/make/autoconf/libraries.m4 -+++ b/make/autoconf/libraries.m4 -@@ -74,12 +74,7 @@ AC_DEFUN_ONCE([LIB_DETERMINE_DEPENDENCIES], - NEEDS_LIB_FREETYPE=true - fi - -- # Check if alsa is needed -- if test "x$OPENJDK_TARGET_OS" = xlinux; then -- NEEDS_LIB_ALSA=true -- else -- NEEDS_LIB_ALSA=false -- fi -+ NEEDS_LIB_ALSA=false - - # Check if ffi is needed - if HOTSPOT_CHECK_JVM_VARIANT(zero); then --- -2.50.1 - diff --git a/packages/openjdk-17/0028-elfFile.hpp-no-need-to-define-ELF-32-64-_ST_TYPE-on-.patch b/packages/openjdk-17/0027-elfFile.hpp-no-need-to-define-ELF-32-64-_ST_TYPE-on-.patch similarity index 89% rename from packages/openjdk-17/0028-elfFile.hpp-no-need-to-define-ELF-32-64-_ST_TYPE-on-.patch rename to packages/openjdk-17/0027-elfFile.hpp-no-need-to-define-ELF-32-64-_ST_TYPE-on-.patch index c7eba5020d83b2d..7c67885bfbb17ab 100644 --- a/packages/openjdk-17/0028-elfFile.hpp-no-need-to-define-ELF-32-64-_ST_TYPE-on-.patch +++ b/packages/openjdk-17/0027-elfFile.hpp-no-need-to-define-ELF-32-64-_ST_TYPE-on-.patch @@ -1,7 +1,7 @@ -From eac1c2fb7e924888988f331d904a5a6717e75e41 Mon Sep 17 00:00:00 2001 +From 42543b772275a58357d35275f75dbbbd57a40709 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sat, 4 Feb 2023 22:45:13 +0100 -Subject: [PATCH 28/42] elfFile.hpp: no need to define ELF{32,64}_ST_TYPE on +Subject: [PATCH 27/41] elfFile.hpp: no need to define ELF{32,64}_ST_TYPE on android As the elf.h header already provides defintions. diff --git a/packages/openjdk-17/0029-os-linux-add-getloadavg-implementation-for-android.patch b/packages/openjdk-17/0028-os-linux-add-getloadavg-implementation-for-android.patch similarity index 88% rename from packages/openjdk-17/0029-os-linux-add-getloadavg-implementation-for-android.patch rename to packages/openjdk-17/0028-os-linux-add-getloadavg-implementation-for-android.patch index 7b23138abfeabb3..815fcb7eac554a2 100644 --- a/packages/openjdk-17/0029-os-linux-add-getloadavg-implementation-for-android.patch +++ b/packages/openjdk-17/0028-os-linux-add-getloadavg-implementation-for-android.patch @@ -1,7 +1,7 @@ -From 84adbdb247279d5a4abf50c9cac4dc64dbc63b94 Mon Sep 17 00:00:00 2001 +From 107bac76e05fad8159e128c80d5d836c556e3469 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 5 Feb 2023 09:14:50 +0100 -Subject: [PATCH 29/42] os: linux: add getloadavg implementation for android +Subject: [PATCH 28/41] os: linux: add getloadavg implementation for android --- src/hotspot/os/linux/os_linux.cpp | 13 +++++++++++++ diff --git a/packages/openjdk-17/0030-os-linux-use-getpagesize-instad-of-SHMLBA.patch b/packages/openjdk-17/0029-os-linux-use-getpagesize-instad-of-SHMLBA.patch similarity index 90% rename from packages/openjdk-17/0030-os-linux-use-getpagesize-instad-of-SHMLBA.patch rename to packages/openjdk-17/0029-os-linux-use-getpagesize-instad-of-SHMLBA.patch index 4eea8b69cb505f6..b67508cd2fa39d6 100644 --- a/packages/openjdk-17/0030-os-linux-use-getpagesize-instad-of-SHMLBA.patch +++ b/packages/openjdk-17/0029-os-linux-use-getpagesize-instad-of-SHMLBA.patch @@ -1,7 +1,7 @@ -From 66f69428855dfcc7481f5ac0f87b81a2a0d81342 Mon Sep 17 00:00:00 2001 +From 5fe01f64c52f9dd75269bd286b398dc0f3220031 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 5 Feb 2023 09:21:57 +0100 -Subject: [PATCH 30/42] os: linux: use getpagesize() instad of SHMLBA +Subject: [PATCH 29/41] os: linux: use getpagesize() instad of SHMLBA Since the latter is not defined on android. --- diff --git a/packages/openjdk-17/0031-libjava-change-return-type-of-strerror_r.patch b/packages/openjdk-17/0030-libjava-change-return-type-of-strerror_r.patch similarity index 94% rename from packages/openjdk-17/0031-libjava-change-return-type-of-strerror_r.patch rename to packages/openjdk-17/0030-libjava-change-return-type-of-strerror_r.patch index 3414613dad39ab6..9db68a2564ca8f2 100644 --- a/packages/openjdk-17/0031-libjava-change-return-type-of-strerror_r.patch +++ b/packages/openjdk-17/0030-libjava-change-return-type-of-strerror_r.patch @@ -1,7 +1,7 @@ -From 09fb20452e4a7c8fc37a9f350b4716248de8968d Mon Sep 17 00:00:00 2001 +From 04200c0a455b8f77463fe643d1dc73b1b8c0cc0f Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 5 Feb 2023 11:47:24 +0100 -Subject: [PATCH 31/42] libjava: change return type of strerror_r +Subject: [PATCH 30/41] libjava: change return type of strerror_r Later versions of android uses the GNU style and returns a char pointer. Adjust jni function to match this. diff --git a/packages/openjdk-17/0032-make-cflags-handle-arm-like-other-arches.patch b/packages/openjdk-17/0031-make-cflags-handle-arm-like-other-arches.patch similarity index 88% rename from packages/openjdk-17/0032-make-cflags-handle-arm-like-other-arches.patch rename to packages/openjdk-17/0031-make-cflags-handle-arm-like-other-arches.patch index 7f05957505fea72..8df9efdb70d340c 100644 --- a/packages/openjdk-17/0032-make-cflags-handle-arm-like-other-arches.patch +++ b/packages/openjdk-17/0031-make-cflags-handle-arm-like-other-arches.patch @@ -1,7 +1,7 @@ -From 3c4fb616d110a09523dbc6f216799fe83d7ba4b1 Mon Sep 17 00:00:00 2001 +From 0930c2f37404c2a0516925edc8ecf998a4651eff Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Mon, 13 Feb 2023 13:49:47 +0100 -Subject: [PATCH 32/42] make: cflags: handle arm like other arches +Subject: [PATCH 31/41] make: cflags: handle arm like other arches --- make/autoconf/flags-cflags.m4 | 8 +------- diff --git a/packages/openjdk-17/0033-Fix-bugs-in-File.getCanonicalPath.patch b/packages/openjdk-17/0032-Fix-bugs-in-File.getCanonicalPath.patch similarity index 98% rename from packages/openjdk-17/0033-Fix-bugs-in-File.getCanonicalPath.patch rename to packages/openjdk-17/0032-Fix-bugs-in-File.getCanonicalPath.patch index 4cf39998e598371..4f0f163e0c4d22b 100644 --- a/packages/openjdk-17/0033-Fix-bugs-in-File.getCanonicalPath.patch +++ b/packages/openjdk-17/0032-Fix-bugs-in-File.getCanonicalPath.patch @@ -1,7 +1,7 @@ -From b50ae5a43a17f743538828d933edfb592e035d7d Mon Sep 17 00:00:00 2001 +From 5a91987277d7c9dfba1cfc05f27fa149e4d07714 Mon Sep 17 00:00:00 2001 From: agnostic-apollo Date: Thu, 28 Mar 2024 18:46:02 +0100 -Subject: [PATCH 33/42] Fix bugs in File.getCanonicalPath() +Subject: [PATCH 32/41] Fix bugs in File.getCanonicalPath() 1. If path length is `>= PATH_MAX` (4096) characters, return error. 2. If any path component length is `> NAME_MAX` (255) characters, return diff --git a/packages/openjdk-17/0034-JvmMapfile.gmk-filter-same-symbols-for-linux-and-and.patch b/packages/openjdk-17/0033-JvmMapfile.gmk-filter-same-symbols-for-linux-and-and.patch similarity index 86% rename from packages/openjdk-17/0034-JvmMapfile.gmk-filter-same-symbols-for-linux-and-and.patch rename to packages/openjdk-17/0033-JvmMapfile.gmk-filter-same-symbols-for-linux-and-and.patch index 518fe7d9e94cf09..6327aea36c83f3b 100644 --- a/packages/openjdk-17/0034-JvmMapfile.gmk-filter-same-symbols-for-linux-and-and.patch +++ b/packages/openjdk-17/0033-JvmMapfile.gmk-filter-same-symbols-for-linux-and-and.patch @@ -1,7 +1,7 @@ -From d62811ef0e6e4c89fb12f83451a0f7fe7dc2a5d6 Mon Sep 17 00:00:00 2001 +From e10320f9446836280d2731ac35c8c32750d1d00e Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Sat, 5 Jun 2021 17:25:37 +0700 -Subject: [PATCH 34/42] JvmMapfile.gmk: filter same symbols for linux and +Subject: [PATCH 33/41] JvmMapfile.gmk: filter same symbols for linux and android --- diff --git a/packages/openjdk-17/0035-Fix-build-with-lld-17.patch b/packages/openjdk-17/0034-Fix-build-with-lld-17.patch similarity index 88% rename from packages/openjdk-17/0035-Fix-build-with-lld-17.patch rename to packages/openjdk-17/0034-Fix-build-with-lld-17.patch index fb8206f9cbb317b..73b03766897730c 100644 --- a/packages/openjdk-17/0035-Fix-build-with-lld-17.patch +++ b/packages/openjdk-17/0034-Fix-build-with-lld-17.patch @@ -1,7 +1,7 @@ -From d79cb2fa52e6509cd72aec430e0050d2a5a85648 Mon Sep 17 00:00:00 2001 +From b72c4f3f41a6ea7fd3b96eba469fd6f63cc36992 Mon Sep 17 00:00:00 2001 From: agnostic-apollo Date: Thu, 28 Mar 2024 18:52:49 +0100 -Subject: [PATCH 35/42] Fix build with lld 17 +Subject: [PATCH 34/41] Fix build with lld 17 Original Author: Dimitry Andric diff --git a/packages/openjdk-17/0036-Remove-sysThreadAvailableStackWithSlack-from-hotspot.patch b/packages/openjdk-17/0035-Remove-sysThreadAvailableStackWithSlack-from-hotspot.patch similarity index 89% rename from packages/openjdk-17/0036-Remove-sysThreadAvailableStackWithSlack-from-hotspot.patch rename to packages/openjdk-17/0035-Remove-sysThreadAvailableStackWithSlack-from-hotspot.patch index 174addf947ee24c..22caa11e6c0825e 100644 --- a/packages/openjdk-17/0036-Remove-sysThreadAvailableStackWithSlack-from-hotspot.patch +++ b/packages/openjdk-17/0035-Remove-sysThreadAvailableStackWithSlack-from-hotspot.patch @@ -1,7 +1,7 @@ -From 87fe84e17ef36d35c49e10cc496d0324b57ef292 Mon Sep 17 00:00:00 2001 +From 09cbec17ad98e9130700c1650144afd748f39c97 Mon Sep 17 00:00:00 2001 From: agnostic-apollo Date: Thu, 28 Mar 2024 18:52:49 +0100 -Subject: [PATCH 36/42] Remove sysThreadAvailableStackWithSlack from +Subject: [PATCH 35/41] Remove sysThreadAvailableStackWithSlack from hotspot-symbols https://bugs.openjdk.org/browse/JDK-8296970 diff --git a/packages/openjdk-17/0037-hotspot-os_linux-do-not-use-dlinfo-and-RTLD_DI_LINKM.patch b/packages/openjdk-17/0036-hotspot-os_linux-do-not-use-dlinfo-and-RTLD_DI_LINKM.patch similarity index 85% rename from packages/openjdk-17/0037-hotspot-os_linux-do-not-use-dlinfo-and-RTLD_DI_LINKM.patch rename to packages/openjdk-17/0036-hotspot-os_linux-do-not-use-dlinfo-and-RTLD_DI_LINKM.patch index 3f0daaea0a2701f..7c0eaaeec8dc473 100644 --- a/packages/openjdk-17/0037-hotspot-os_linux-do-not-use-dlinfo-and-RTLD_DI_LINKM.patch +++ b/packages/openjdk-17/0036-hotspot-os_linux-do-not-use-dlinfo-and-RTLD_DI_LINKM.patch @@ -1,7 +1,7 @@ -From dad91b67469d788f632a4138ee79c9e551121ff4 Mon Sep 17 00:00:00 2001 +From bf5cc18b50c5cb078d2951f01ddd75330b2e2d26 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 31 Mar 2024 20:20:05 +0200 -Subject: [PATCH 37/42] hotspot: os_linux: do not use dlinfo and +Subject: [PATCH 36/41] hotspot: os_linux: do not use dlinfo and RTLD_DI_LINKMAP on android As they are not available. diff --git a/packages/openjdk-17/0038-OUTTREE-bionic-type-redef-fix.patch b/packages/openjdk-17/0037-OUTTREE-bionic-type-redef-fix.patch similarity index 88% rename from packages/openjdk-17/0038-OUTTREE-bionic-type-redef-fix.patch rename to packages/openjdk-17/0037-OUTTREE-bionic-type-redef-fix.patch index c6e5f60dadfaea9..c4c2c87eb05630e 100644 --- a/packages/openjdk-17/0038-OUTTREE-bionic-type-redef-fix.patch +++ b/packages/openjdk-17/0037-OUTTREE-bionic-type-redef-fix.patch @@ -1,7 +1,7 @@ -From c2e1c4da1a73363b655362e6b45837c749e36588 Mon Sep 17 00:00:00 2001 +From 4a2f623088833bc5cd4765800952b277bcc086c3 Mon Sep 17 00:00:00 2001 From: Robert Kirkman <31490854+robertkirkman@users.noreply.github.com> Date: Mon, 5 May 2025 21:07:27 -0500 -Subject: [PATCH 38/42] OUTTREE bionic type redef fix +Subject: [PATCH 37/41] OUTTREE bionic type redef fix Co-authored-by: eval Nya <11857526-nexplorer-3e@users.noreply.gitlab.com> --- diff --git a/packages/openjdk-17/0039-Fix-hardcoded-paths-in-jdk.attach.patch b/packages/openjdk-17/0038-Fix-hardcoded-paths-in-jdk.attach.patch similarity index 89% rename from packages/openjdk-17/0039-Fix-hardcoded-paths-in-jdk.attach.patch rename to packages/openjdk-17/0038-Fix-hardcoded-paths-in-jdk.attach.patch index 932fe375f3bae86..c1e57c39cb2c401 100644 --- a/packages/openjdk-17/0039-Fix-hardcoded-paths-in-jdk.attach.patch +++ b/packages/openjdk-17/0038-Fix-hardcoded-paths-in-jdk.attach.patch @@ -1,7 +1,7 @@ -From 37c9b217d2faca78083023b66e306aa008e07c7c Mon Sep 17 00:00:00 2001 +From a9a0c230df7ed7a08adb6154f9381fe2acf701a3 Mon Sep 17 00:00:00 2001 From: Chongyun Lee <45286352+licy183@users.noreply.github.com> Date: Tue, 3 Sep 2024 12:34:31 +0800 -Subject: [PATCH 39/42] Fix: hardcoded paths in jdk.attach +Subject: [PATCH 38/41] Fix: hardcoded paths in jdk.attach --- .../linux/classes/sun/tools/attach/VirtualMachineImpl.java | 2 +- diff --git a/packages/openjdk-17/0040-Do-not-disable-new-dtags.patch b/packages/openjdk-17/0039-Do-not-disable-new-dtags.patch similarity index 88% rename from packages/openjdk-17/0040-Do-not-disable-new-dtags.patch rename to packages/openjdk-17/0039-Do-not-disable-new-dtags.patch index 41654daf5205ed7..3e0cca47b1984a8 100644 --- a/packages/openjdk-17/0040-Do-not-disable-new-dtags.patch +++ b/packages/openjdk-17/0039-Do-not-disable-new-dtags.patch @@ -1,7 +1,7 @@ -From 7b4056f187d3b6c00edbea564ccd97da279dab75 Mon Sep 17 00:00:00 2001 +From e5be57bdabd83dd98173b584c2e38c21bc38b939 Mon Sep 17 00:00:00 2001 From: Robert Kirkman <31490854+robertkirkman@users.noreply.github.com> Date: Mon, 5 May 2025 21:07:27 -0500 -Subject: [PATCH 40/42] Do not disable new dtags +Subject: [PATCH 39/41] Do not disable new dtags --- make/autoconf/flags-cflags.m4 | 3 --- diff --git a/packages/openjdk-17/0041-disable-statx-syscall.patch b/packages/openjdk-17/0040-disable-statx-syscall.patch similarity index 92% rename from packages/openjdk-17/0041-disable-statx-syscall.patch rename to packages/openjdk-17/0040-disable-statx-syscall.patch index 8a972f4f25ded9c..17a90addde7935d 100644 --- a/packages/openjdk-17/0041-disable-statx-syscall.patch +++ b/packages/openjdk-17/0040-disable-statx-syscall.patch @@ -1,7 +1,7 @@ -From 007931c1fd75b57456c99bd6b7a6e7008a195f39 Mon Sep 17 00:00:00 2001 +From 06c3922cd68b6e64409d23bc0c418eb4bdc5c9ce Mon Sep 17 00:00:00 2001 From: Robert Kirkman <31490854+robertkirkman@users.noreply.github.com> Date: Thu, 8 May 2025 01:47:00 -0500 -Subject: [PATCH 41/42] disable statx syscall +Subject: [PATCH 40/41] disable statx syscall This turns off dynamically loading the statx() symbol, which has the same effect as reverting diff --git a/packages/openjdk-17/0042-make-autoconf-define-ARM-for-arm-build-with-clang.patch b/packages/openjdk-17/0041-make-autoconf-define-ARM-for-arm-build-with-clang.patch similarity index 90% rename from packages/openjdk-17/0042-make-autoconf-define-ARM-for-arm-build-with-clang.patch rename to packages/openjdk-17/0041-make-autoconf-define-ARM-for-arm-build-with-clang.patch index 6ab691f904432d7..c316251412f933d 100644 --- a/packages/openjdk-17/0042-make-autoconf-define-ARM-for-arm-build-with-clang.patch +++ b/packages/openjdk-17/0041-make-autoconf-define-ARM-for-arm-build-with-clang.patch @@ -1,7 +1,7 @@ -From 06d574a9f4d9783950dea232aa326ce290f5440b Mon Sep 17 00:00:00 2001 +From c231dc3e463a538af1c16f921f2e3533d56c58d0 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 31 Mar 2024 12:02:51 +0200 -Subject: [PATCH 42/42] make: autoconf: define ARM for arm build with clang +Subject: [PATCH 41/41] make: autoconf: define ARM for arm build with clang Fixes error like From 1965112ced274c0c41c71cd2567644fb124c76ff Mon Sep 17 00:00:00 2001 From: alexytomi <60690056+alexytomi@users.noreply.github.com> Date: Mon, 21 Jul 2025 15:04:09 +0800 Subject: [PATCH 6/9] fix(main/openjdk-17): Build jsound Since we have ALSA, we can now use jsound, as it uses ALSA as the backend for linux --- ...lude-netinet-in.h-for-android-builds.patch | 2 +- ...s_linux-add-android-checks-and-fixes.patch | 2 +- ...Define-sys-gettid-on-arm-and-aarch64.patch | 2 +- ...six-print-uptime-overridden-by-linux.patch | 2 +- ...> 0005-Link-against-system-libiconv.patch} | 4 +- ...prevent-build-of-libjsound-and-libsa.patch | 37 ------------------- ...64_get_thread_helper-Thread-current.patch} | 4 +- ...07-Remove-aarch64_get_thread_helper.patch} | 4 +- ...ch => 0008-Use-Android-s-strerror_r.patch} | 4 +- ...ch => 0009-Use-utimensat-on-android.patch} | 4 +- ...nio_fs_UnixNativeDispatcher_futimes.patch} | 4 +- ...011-Add-CXXFLAGS_JDKLIB-to-CXXFLAGS.patch} | 4 +- ...> 0012-Use-ASCII-codeset-on-android.patch} | 4 +- ...m.so-path-when-run-from-Android-app.patch} | 4 +- ...address-to-char-when-clearing-cache.patch} | 4 +- ...ontrol-related-functions-on-Android.patch} | 4 +- ...nk-against-libawt-to-fix-link-error.patch} | 4 +- ....so-path-from-proc-self-maps-on-and.patch} | 4 +- ...-exiting-if-getcpu-2-is-unsupported.patch} | 4 +- ...atch => 0019-Remove-pre-UAL-aliases.patch} | 4 +- ...rm-fix-assembly-in-os_linux_arm.cpp.patch} | 4 +- ...d-for-tagged-pointers-on-Android-12.patch} | 4 +- ...=> 0022-x86-always-compile-with-PIC.patch} | 4 +- ... 0023-Fix-StackOverflowError-on-ARM.patch} | 4 +- ...vsym-is-available-if-ANDROID_API-24.patch} | 4 +- ...e-hardcoded-paths-to-work-in-termux.patch} | 4 +- ...ed-to-define-ELF-32-64-_ST_TYPE-on-.patch} | 4 +- ...tloadavg-implementation-for-android.patch} | 4 +- ...ux-use-getpagesize-instad-of-SHMLBA.patch} | 4 +- ...va-change-return-type-of-strerror_r.patch} | 4 +- ...cflags-handle-arm-like-other-arches.patch} | 4 +- ...1-Fix-bugs-in-File.getCanonicalPath.patch} | 4 +- ...lter-same-symbols-for-linux-and-and.patch} | 4 +- ...patch => 0033-Fix-build-with-lld-17.patch} | 4 +- ...vailableStackWithSlack-from-hotspot.patch} | 4 +- ...do-not-use-dlinfo-and-RTLD_DI_LINKM.patch} | 4 +- ... 0036-OUTTREE-bionic-type-redef-fix.patch} | 4 +- ...7-Fix-hardcoded-paths-in-jdk.attach.patch} | 4 +- ...ch => 0038-Do-not-disable-new-dtags.patch} | 4 +- ...patch => 0039-disable-statx-syscall.patch} | 4 +- ...define-ARM-for-arm-build-with-clang.patch} | 4 +- ...1-android-Prevent-build-of-libsaproc.patch | 29 +++++++++++++++ 42 files changed, 105 insertions(+), 113 deletions(-) rename packages/openjdk-17/{0006-Link-against-system-libiconv.patch => 0005-Link-against-system-libiconv.patch} (92%) delete mode 100644 packages/openjdk-17/0005-android-prevent-build-of-libjsound-and-libsa.patch rename packages/openjdk-17/{0007-aarch64_get_thread_helper-Thread-current.patch => 0006-aarch64_get_thread_helper-Thread-current.patch} (89%) rename packages/openjdk-17/{0008-Remove-aarch64_get_thread_helper.patch => 0007-Remove-aarch64_get_thread_helper.patch} (89%) rename packages/openjdk-17/{0009-Use-Android-s-strerror_r.patch => 0008-Use-Android-s-strerror_r.patch} (89%) rename packages/openjdk-17/{0010-Use-utimensat-on-android.patch => 0009-Use-utimensat-on-android.patch} (97%) rename packages/openjdk-17/{0011-Fixed-Java_sun_nio_fs_UnixNativeDispatcher_futimes.patch => 0010-Fixed-Java_sun_nio_fs_UnixNativeDispatcher_futimes.patch} (93%) rename packages/openjdk-17/{0012-Add-CXXFLAGS_JDKLIB-to-CXXFLAGS.patch => 0011-Add-CXXFLAGS_JDKLIB-to-CXXFLAGS.patch} (92%) rename packages/openjdk-17/{0013-Use-ASCII-codeset-on-android.patch => 0012-Use-ASCII-codeset-on-android.patch} (93%) rename packages/openjdk-17/{0014-Fix-libjvm.so-path-when-run-from-Android-app.patch => 0013-Fix-libjvm.so-path-when-run-from-Android-app.patch} (95%) rename packages/openjdk-17/{0015-arm-cast-address-to-char-when-clearing-cache.patch => 0014-arm-cast-address-to-char-when-clearing-cache.patch} (84%) rename packages/openjdk-17/{0016-Don-t-run-fpu_control-related-functions-on-Android.patch => 0015-Don-t-run-fpu_control-related-functions-on-Android.patch} (94%) rename packages/openjdk-17/{0017-Libfontmanager-link-against-libawt-to-fix-link-error.patch => 0016-Libfontmanager-link-against-libawt-to-fix-link-error.patch} (91%) rename packages/openjdk-17/{0018-Try-to-get-libjvm.so-path-from-proc-self-maps-on-and.patch => 0017-Try-to-get-libjvm.so-path-from-proc-self-maps-on-and.patch} (95%) rename packages/openjdk-17/{0019-Warn-instead-of-exiting-if-getcpu-2-is-unsupported.patch => 0018-Warn-instead-of-exiting-if-getcpu-2-is-unsupported.patch} (85%) rename packages/openjdk-17/{0020-Remove-pre-UAL-aliases.patch => 0019-Remove-pre-UAL-aliases.patch} (97%) rename packages/openjdk-17/{0021-arm-fix-assembly-in-os_linux_arm.cpp.patch => 0020-arm-fix-assembly-in-os_linux_arm.cpp.patch} (86%) rename packages/openjdk-17/{0022-Add-workaround-for-tagged-pointers-on-Android-12.patch => 0021-Add-workaround-for-tagged-pointers-on-Android-12.patch} (93%) rename packages/openjdk-17/{0023-x86-always-compile-with-PIC.patch => 0022-x86-always-compile-with-PIC.patch} (93%) rename packages/openjdk-17/{0024-Fix-StackOverflowError-on-ARM.patch => 0023-Fix-StackOverflowError-on-ARM.patch} (86%) rename packages/openjdk-17/{0025-android-dlvsym-is-available-if-ANDROID_API-24.patch => 0024-android-dlvsym-is-available-if-ANDROID_API-24.patch} (85%) rename packages/openjdk-17/{0026-Update-hardcoded-paths-to-work-in-termux.patch => 0025-Update-hardcoded-paths-to-work-in-termux.patch} (99%) rename packages/openjdk-17/{0027-elfFile.hpp-no-need-to-define-ELF-32-64-_ST_TYPE-on-.patch => 0026-elfFile.hpp-no-need-to-define-ELF-32-64-_ST_TYPE-on-.patch} (89%) rename packages/openjdk-17/{0028-os-linux-add-getloadavg-implementation-for-android.patch => 0027-os-linux-add-getloadavg-implementation-for-android.patch} (88%) rename packages/openjdk-17/{0029-os-linux-use-getpagesize-instad-of-SHMLBA.patch => 0028-os-linux-use-getpagesize-instad-of-SHMLBA.patch} (90%) rename packages/openjdk-17/{0030-libjava-change-return-type-of-strerror_r.patch => 0029-libjava-change-return-type-of-strerror_r.patch} (94%) rename packages/openjdk-17/{0031-make-cflags-handle-arm-like-other-arches.patch => 0030-make-cflags-handle-arm-like-other-arches.patch} (88%) rename packages/openjdk-17/{0032-Fix-bugs-in-File.getCanonicalPath.patch => 0031-Fix-bugs-in-File.getCanonicalPath.patch} (98%) rename packages/openjdk-17/{0033-JvmMapfile.gmk-filter-same-symbols-for-linux-and-and.patch => 0032-JvmMapfile.gmk-filter-same-symbols-for-linux-and-and.patch} (86%) rename packages/openjdk-17/{0034-Fix-build-with-lld-17.patch => 0033-Fix-build-with-lld-17.patch} (88%) rename packages/openjdk-17/{0035-Remove-sysThreadAvailableStackWithSlack-from-hotspot.patch => 0034-Remove-sysThreadAvailableStackWithSlack-from-hotspot.patch} (89%) rename packages/openjdk-17/{0036-hotspot-os_linux-do-not-use-dlinfo-and-RTLD_DI_LINKM.patch => 0035-hotspot-os_linux-do-not-use-dlinfo-and-RTLD_DI_LINKM.patch} (85%) rename packages/openjdk-17/{0037-OUTTREE-bionic-type-redef-fix.patch => 0036-OUTTREE-bionic-type-redef-fix.patch} (88%) rename packages/openjdk-17/{0038-Fix-hardcoded-paths-in-jdk.attach.patch => 0037-Fix-hardcoded-paths-in-jdk.attach.patch} (89%) rename packages/openjdk-17/{0039-Do-not-disable-new-dtags.patch => 0038-Do-not-disable-new-dtags.patch} (88%) rename packages/openjdk-17/{0040-disable-statx-syscall.patch => 0039-disable-statx-syscall.patch} (92%) rename packages/openjdk-17/{0041-make-autoconf-define-ARM-for-arm-build-with-clang.patch => 0040-make-autoconf-define-ARM-for-arm-build-with-clang.patch} (90%) create mode 100644 packages/openjdk-17/0041-android-Prevent-build-of-libsaproc.patch diff --git a/packages/openjdk-17/0001-libinet-include-netinet-in.h-for-android-builds.patch b/packages/openjdk-17/0001-libinet-include-netinet-in.h-for-android-builds.patch index 687e3ee5be3a40a..5fb65a53759de25 100644 --- a/packages/openjdk-17/0001-libinet-include-netinet-in.h-for-android-builds.patch +++ b/packages/openjdk-17/0001-libinet-include-netinet-in.h-for-android-builds.patch @@ -1,4 +1,4 @@ -From 629b96388286148842165a382a1a36c3ccc573bb Mon Sep 17 00:00:00 2001 +From e159d599b5b615e91f87d1f5a603166fbf700e70 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 31 Mar 2024 16:31:48 +0200 Subject: [PATCH 01/41] libinet: include netinet/in.h for android builds diff --git a/packages/openjdk-17/0002-os_linux-add-android-checks-and-fixes.patch b/packages/openjdk-17/0002-os_linux-add-android-checks-and-fixes.patch index a21b579ce377383..52815179c252054 100644 --- a/packages/openjdk-17/0002-os_linux-add-android-checks-and-fixes.patch +++ b/packages/openjdk-17/0002-os_linux-add-android-checks-and-fixes.patch @@ -1,4 +1,4 @@ -From bb00232fb384c7d478942c117817435bad86cab1 Mon Sep 17 00:00:00 2001 +From c4e6f2727bcfa54e53a5363a882005d2cc6e13ac Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Sun, 6 Jun 2021 20:11:11 +0700 Subject: [PATCH 02/41] os_linux: add android checks and fixes diff --git a/packages/openjdk-17/0003-Define-sys-gettid-on-arm-and-aarch64.patch b/packages/openjdk-17/0003-Define-sys-gettid-on-arm-and-aarch64.patch index 78a127f95adddd7..12ee9e013e6020b 100644 --- a/packages/openjdk-17/0003-Define-sys-gettid-on-arm-and-aarch64.patch +++ b/packages/openjdk-17/0003-Define-sys-gettid-on-arm-and-aarch64.patch @@ -1,4 +1,4 @@ -From efd25fb9df4f65d7755a2c5c462680954f17b08d Mon Sep 17 00:00:00 2001 +From fa6e4295cba4a221b54eb3e5081959fae1385b21 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Mon, 7 Jun 2021 06:27:26 +0700 Subject: [PATCH 03/41] Define sys gettid on arm and aarch64 diff --git a/packages/openjdk-17/0004-Disable-posix-print-uptime-overridden-by-linux.patch b/packages/openjdk-17/0004-Disable-posix-print-uptime-overridden-by-linux.patch index 245603e77b88a73..cac8ad92c205d87 100644 --- a/packages/openjdk-17/0004-Disable-posix-print-uptime-overridden-by-linux.patch +++ b/packages/openjdk-17/0004-Disable-posix-print-uptime-overridden-by-linux.patch @@ -1,4 +1,4 @@ -From 7cf2ed3622a48303b302b2b21d68a835aedb97cb Mon Sep 17 00:00:00 2001 +From bc3d635d272b42d2828ad466eb265239b812efb4 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Mon, 7 Jun 2021 08:05:09 +0700 Subject: [PATCH 04/41] Disable posix print uptime (overridden by linux!) diff --git a/packages/openjdk-17/0006-Link-against-system-libiconv.patch b/packages/openjdk-17/0005-Link-against-system-libiconv.patch similarity index 92% rename from packages/openjdk-17/0006-Link-against-system-libiconv.patch rename to packages/openjdk-17/0005-Link-against-system-libiconv.patch index 384d5d8a76208cf..b2cda8091c563ed 100644 --- a/packages/openjdk-17/0006-Link-against-system-libiconv.patch +++ b/packages/openjdk-17/0005-Link-against-system-libiconv.patch @@ -1,7 +1,7 @@ -From fc44aeb811df4739e7e2ee4a0704cf70c27e9690 Mon Sep 17 00:00:00 2001 +From 7ed4e2516cef61dcdba85d76473aadc2319e2b4e Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Fri, 3 Feb 2023 11:09:10 +0100 -Subject: [PATCH 06/41] Link against system libiconv +Subject: [PATCH 05/41] Link against system libiconv --- make/modules/java.instrument/Lib.gmk | 2 +- diff --git a/packages/openjdk-17/0005-android-prevent-build-of-libjsound-and-libsa.patch b/packages/openjdk-17/0005-android-prevent-build-of-libjsound-and-libsa.patch deleted file mode 100644 index 2215d346c26fffa..000000000000000 --- a/packages/openjdk-17/0005-android-prevent-build-of-libjsound-and-libsa.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 7da5794712dc653b199601bbde923718d0b4a66f Mon Sep 17 00:00:00 2001 -From: Henrik Grimler -Date: Fri, 3 Feb 2023 11:06:24 +0100 -Subject: [PATCH 05/41] android: prevent build of libjsound and libsa - ---- - make/modules/java.desktop/Lib.gmk | 2 -- - make/modules/jdk.hotspot.agent/Lib.gmk | 2 -- - 2 files changed, 4 deletions(-) - -diff --git a/make/modules/java.desktop/Lib.gmk b/make/modules/java.desktop/Lib.gmk -index 22b07289adf..4f1c8c73502 100644 ---- a/make/modules/java.desktop/Lib.gmk -+++ b/make/modules/java.desktop/Lib.gmk -@@ -76,8 +76,6 @@ ifeq ($(call isTargetOs, aix), false) - - $(BUILD_LIBJSOUND): $(call FindLib, java.base, java) - -- TARGETS += $(BUILD_LIBJSOUND) -- - endif - - ################################################################################ -diff --git a/make/modules/jdk.hotspot.agent/Lib.gmk b/make/modules/jdk.hotspot.agent/Lib.gmk -index 59b24d0e452..7bbd5e73ec2 100644 ---- a/make/modules/jdk.hotspot.agent/Lib.gmk -+++ b/make/modules/jdk.hotspot.agent/Lib.gmk -@@ -74,6 +74,4 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBSA, \ - LIBS_windows := dbgeng.lib $(WIN_JAVA_LIB), \ - )) - --TARGETS += $(BUILD_LIBSA) -- - ################################################################################ --- -2.50.1 - diff --git a/packages/openjdk-17/0007-aarch64_get_thread_helper-Thread-current.patch b/packages/openjdk-17/0006-aarch64_get_thread_helper-Thread-current.patch similarity index 89% rename from packages/openjdk-17/0007-aarch64_get_thread_helper-Thread-current.patch rename to packages/openjdk-17/0006-aarch64_get_thread_helper-Thread-current.patch index 7d905ded8758a7f..c16fa66b5b774e2 100644 --- a/packages/openjdk-17/0007-aarch64_get_thread_helper-Thread-current.patch +++ b/packages/openjdk-17/0006-aarch64_get_thread_helper-Thread-current.patch @@ -1,7 +1,7 @@ -From a581175b5ef5f3ef03d2f068b5fbd285b3b144ba Mon Sep 17 00:00:00 2001 +From 95061a1046ab1e8b475207e5d5170fe4308a2952 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Thu, 10 Jun 2021 08:45:16 +0700 -Subject: [PATCH 07/41] aarch64_get_thread_helper() -> Thread::current() +Subject: [PATCH 06/41] aarch64_get_thread_helper() -> Thread::current() Can't build for Android: diff --git a/packages/openjdk-17/0008-Remove-aarch64_get_thread_helper.patch b/packages/openjdk-17/0007-Remove-aarch64_get_thread_helper.patch similarity index 89% rename from packages/openjdk-17/0008-Remove-aarch64_get_thread_helper.patch rename to packages/openjdk-17/0007-Remove-aarch64_get_thread_helper.patch index 540ff443386ee43..1b5d5af037796fe 100644 --- a/packages/openjdk-17/0008-Remove-aarch64_get_thread_helper.patch +++ b/packages/openjdk-17/0007-Remove-aarch64_get_thread_helper.patch @@ -1,7 +1,7 @@ -From 5f1ab5358c05b8bdfa647fcae4fb98a7e1e6725d Mon Sep 17 00:00:00 2001 +From 95f6e35422483d68a1ee4755f477be4fd0f70f03 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Thu, 10 Jun 2021 08:46:35 +0700 -Subject: [PATCH 08/41] Remove aarch64_get_thread_helper() +Subject: [PATCH 07/41] Remove aarch64_get_thread_helper() See commit 6f407090fda1 ("aarch64_get_thread_helper() -> Thread::current()") for more details. diff --git a/packages/openjdk-17/0009-Use-Android-s-strerror_r.patch b/packages/openjdk-17/0008-Use-Android-s-strerror_r.patch similarity index 89% rename from packages/openjdk-17/0009-Use-Android-s-strerror_r.patch rename to packages/openjdk-17/0008-Use-Android-s-strerror_r.patch index fd0a9da8bf2ac74..652adb081153349 100644 --- a/packages/openjdk-17/0009-Use-Android-s-strerror_r.patch +++ b/packages/openjdk-17/0008-Use-Android-s-strerror_r.patch @@ -1,7 +1,7 @@ -From ee0fd6b8058597f74874bec8186d6d636ea28039 Mon Sep 17 00:00:00 2001 +From b26089a1468383af956dac35c8385dae405d0c3b Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Thu, 10 Jun 2021 09:36:26 +0700 -Subject: [PATCH 09/41] Use Android's strerror_r() +Subject: [PATCH 08/41] Use Android's strerror_r() --- src/java.base/unix/native/libjava/jni_util_md.c | 7 ------- diff --git a/packages/openjdk-17/0010-Use-utimensat-on-android.patch b/packages/openjdk-17/0009-Use-utimensat-on-android.patch similarity index 97% rename from packages/openjdk-17/0010-Use-utimensat-on-android.patch rename to packages/openjdk-17/0009-Use-utimensat-on-android.patch index c16f926419b8995..391a48876821c90 100644 --- a/packages/openjdk-17/0010-Use-utimensat-on-android.patch +++ b/packages/openjdk-17/0009-Use-utimensat-on-android.patch @@ -1,7 +1,7 @@ -From b6de6cfa7804b7bce75455561467f9b70a381114 Mon Sep 17 00:00:00 2001 +From 5b950bcf5af029ef6c272c33f8f28114306a05cf Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Thu, 10 Jun 2021 16:42:56 +0700 -Subject: [PATCH 10/41] Use utimensat on android +Subject: [PATCH 09/41] Use utimensat on android --- .../native/libnio/fs/UnixNativeDispatcher.c | 22 ++++++++++++++----- diff --git a/packages/openjdk-17/0011-Fixed-Java_sun_nio_fs_UnixNativeDispatcher_futimes.patch b/packages/openjdk-17/0010-Fixed-Java_sun_nio_fs_UnixNativeDispatcher_futimes.patch similarity index 93% rename from packages/openjdk-17/0011-Fixed-Java_sun_nio_fs_UnixNativeDispatcher_futimes.patch rename to packages/openjdk-17/0010-Fixed-Java_sun_nio_fs_UnixNativeDispatcher_futimes.patch index dc13ffd45771916..3efb77ce5af4673 100644 --- a/packages/openjdk-17/0011-Fixed-Java_sun_nio_fs_UnixNativeDispatcher_futimes.patch +++ b/packages/openjdk-17/0010-Fixed-Java_sun_nio_fs_UnixNativeDispatcher_futimes.patch @@ -1,7 +1,7 @@ -From fa5a211b5ec8c864cb7a8018c1185528915b5c8d Mon Sep 17 00:00:00 2001 +From dd22bff9df3fa0e5c7742fe55a7444206eb3230f Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Thu, 10 Jun 2021 18:36:56 +0700 -Subject: [PATCH 11/41] Fixed Java_sun_nio_fs_UnixNativeDispatcher_futimes +Subject: [PATCH 10/41] Fixed Java_sun_nio_fs_UnixNativeDispatcher_futimes --- .../unix/native/libnio/fs/UnixNativeDispatcher.c | 11 ++++++----- diff --git a/packages/openjdk-17/0012-Add-CXXFLAGS_JDKLIB-to-CXXFLAGS.patch b/packages/openjdk-17/0011-Add-CXXFLAGS_JDKLIB-to-CXXFLAGS.patch similarity index 92% rename from packages/openjdk-17/0012-Add-CXXFLAGS_JDKLIB-to-CXXFLAGS.patch rename to packages/openjdk-17/0011-Add-CXXFLAGS_JDKLIB-to-CXXFLAGS.patch index 6483caa98d08edc..a8082dac1f5d5d8 100644 --- a/packages/openjdk-17/0012-Add-CXXFLAGS_JDKLIB-to-CXXFLAGS.patch +++ b/packages/openjdk-17/0011-Add-CXXFLAGS_JDKLIB-to-CXXFLAGS.patch @@ -1,7 +1,7 @@ -From e2024967cef3b6fd3cd79e35eb2e0692febb30ab Mon Sep 17 00:00:00 2001 +From 5d8b5a25ee9d786b8a8829ded18a2efa98a558f3 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Thu, 10 Jun 2021 19:23:03 +0700 -Subject: [PATCH 12/41] Add CXXFLAGS_JDKLIB to CXXFLAGS +Subject: [PATCH 11/41] Add CXXFLAGS_JDKLIB to CXXFLAGS For modules jdk.jdwp.agent and java.instrument. --- diff --git a/packages/openjdk-17/0013-Use-ASCII-codeset-on-android.patch b/packages/openjdk-17/0012-Use-ASCII-codeset-on-android.patch similarity index 93% rename from packages/openjdk-17/0013-Use-ASCII-codeset-on-android.patch rename to packages/openjdk-17/0012-Use-ASCII-codeset-on-android.patch index b76396fb771eb54..40647b9cb9dd3f0 100644 --- a/packages/openjdk-17/0013-Use-ASCII-codeset-on-android.patch +++ b/packages/openjdk-17/0012-Use-ASCII-codeset-on-android.patch @@ -1,7 +1,7 @@ -From 90fdab0ad177db3ad07be0a389f406d86f760f34 Mon Sep 17 00:00:00 2001 +From 0efc724f95719cb1f00511195946aeb9b1d5445a Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Thu, 10 Jun 2021 20:42:40 +0700 -Subject: [PATCH 13/41] Use ASCII codeset on android +Subject: [PATCH 12/41] Use ASCII codeset on android Since android's locale support is very rudimentary. --- diff --git a/packages/openjdk-17/0014-Fix-libjvm.so-path-when-run-from-Android-app.patch b/packages/openjdk-17/0013-Fix-libjvm.so-path-when-run-from-Android-app.patch similarity index 95% rename from packages/openjdk-17/0014-Fix-libjvm.so-path-when-run-from-Android-app.patch rename to packages/openjdk-17/0013-Fix-libjvm.so-path-when-run-from-Android-app.patch index 91e599e9352dfb4..050fa2e368e6c88 100644 --- a/packages/openjdk-17/0014-Fix-libjvm.so-path-when-run-from-Android-app.patch +++ b/packages/openjdk-17/0013-Fix-libjvm.so-path-when-run-from-Android-app.patch @@ -1,7 +1,7 @@ -From 152a7038bca492f46fad100096d061193aec28a7 Mon Sep 17 00:00:00 2001 +From 7576c333056a336be9a348fa58be76338994c582 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Fri, 11 Jun 2021 07:48:28 +0700 -Subject: [PATCH 14/41] Fix libjvm.so path when run from Android app +Subject: [PATCH 13/41] Fix libjvm.so path when run from Android app --- src/java.base/unix/native/libjli/java_md.c | 49 ++++++++++++++++++++++ diff --git a/packages/openjdk-17/0015-arm-cast-address-to-char-when-clearing-cache.patch b/packages/openjdk-17/0014-arm-cast-address-to-char-when-clearing-cache.patch similarity index 84% rename from packages/openjdk-17/0015-arm-cast-address-to-char-when-clearing-cache.patch rename to packages/openjdk-17/0014-arm-cast-address-to-char-when-clearing-cache.patch index 410a9fcc6852bb7..dabae3bdc2cbd2b 100644 --- a/packages/openjdk-17/0015-arm-cast-address-to-char-when-clearing-cache.patch +++ b/packages/openjdk-17/0014-arm-cast-address-to-char-when-clearing-cache.patch @@ -1,7 +1,7 @@ -From 975d959caf0afeceb115c9f2c4f98e6358d51b0c Mon Sep 17 00:00:00 2001 +From f35176d756d2690abda9c06d66048363b79a5fd7 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Sat, 12 Jun 2021 06:55:18 +0700 -Subject: [PATCH 15/41] arm: cast address to char when clearing cache +Subject: [PATCH 14/41] arm: cast address to char when clearing cache --- src/hotspot/cpu/arm/icache_arm.cpp | 2 +- diff --git a/packages/openjdk-17/0016-Don-t-run-fpu_control-related-functions-on-Android.patch b/packages/openjdk-17/0015-Don-t-run-fpu_control-related-functions-on-Android.patch similarity index 94% rename from packages/openjdk-17/0016-Don-t-run-fpu_control-related-functions-on-Android.patch rename to packages/openjdk-17/0015-Don-t-run-fpu_control-related-functions-on-Android.patch index 3c8192349777c25..1a97db34168cf47 100644 --- a/packages/openjdk-17/0016-Don-t-run-fpu_control-related-functions-on-Android.patch +++ b/packages/openjdk-17/0015-Don-t-run-fpu_control-related-functions-on-Android.patch @@ -1,7 +1,7 @@ -From 5c3824eaf51781644e7df2579d71ea94dfa10eac Mon Sep 17 00:00:00 2001 +From 3fa6ceb5bb225002dc443c21cac2113653a6e2f3 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Sat, 12 Jun 2021 06:58:20 +0700 -Subject: [PATCH 16/41] Don't run fpu_control related functions on Android +Subject: [PATCH 15/41] Don't run fpu_control related functions on Android --- src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp | 2 ++ diff --git a/packages/openjdk-17/0017-Libfontmanager-link-against-libawt-to-fix-link-error.patch b/packages/openjdk-17/0016-Libfontmanager-link-against-libawt-to-fix-link-error.patch similarity index 91% rename from packages/openjdk-17/0017-Libfontmanager-link-against-libawt-to-fix-link-error.patch rename to packages/openjdk-17/0016-Libfontmanager-link-against-libawt-to-fix-link-error.patch index 6444784799d249b..05c40b45828818d 100644 --- a/packages/openjdk-17/0017-Libfontmanager-link-against-libawt-to-fix-link-error.patch +++ b/packages/openjdk-17/0016-Libfontmanager-link-against-libawt-to-fix-link-error.patch @@ -1,7 +1,7 @@ -From 975865b8044614204a3801df1159c7f3e9936ae8 Mon Sep 17 00:00:00 2001 +From a71a157259c0871a800a5e2dd907e069641bc6c6 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Sat, 12 Jun 2021 17:03:05 +0700 -Subject: [PATCH 17/41] Libfontmanager: link against libawt to fix link error +Subject: [PATCH 16/41] Libfontmanager: link against libawt to fix link error Partly based on commit from androidports: https://github.com/androidports/openjdk/commit/a3e4f0281154537f01c2e59286a6ceed9c827b11 diff --git a/packages/openjdk-17/0018-Try-to-get-libjvm.so-path-from-proc-self-maps-on-and.patch b/packages/openjdk-17/0017-Try-to-get-libjvm.so-path-from-proc-self-maps-on-and.patch similarity index 95% rename from packages/openjdk-17/0018-Try-to-get-libjvm.so-path-from-proc-self-maps-on-and.patch rename to packages/openjdk-17/0017-Try-to-get-libjvm.so-path-from-proc-self-maps-on-and.patch index b39f2d45947d46b..3185af45b76f305 100644 --- a/packages/openjdk-17/0018-Try-to-get-libjvm.so-path-from-proc-self-maps-on-and.patch +++ b/packages/openjdk-17/0017-Try-to-get-libjvm.so-path-from-proc-self-maps-on-and.patch @@ -1,7 +1,7 @@ -From dcf3338ea44c1daa9e9c762f4e95c5e52694ee64 Mon Sep 17 00:00:00 2001 +From 3227444a86a8a0b5cb41a4ab1cd2f10da803f89f Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Fri, 25 Jun 2021 17:19:24 +0700 -Subject: [PATCH 18/41] Try to get libjvm.so path from /proc/self/maps on +Subject: [PATCH 17/41] Try to get libjvm.so path from /proc/self/maps on android --- diff --git a/packages/openjdk-17/0019-Warn-instead-of-exiting-if-getcpu-2-is-unsupported.patch b/packages/openjdk-17/0018-Warn-instead-of-exiting-if-getcpu-2-is-unsupported.patch similarity index 85% rename from packages/openjdk-17/0019-Warn-instead-of-exiting-if-getcpu-2-is-unsupported.patch rename to packages/openjdk-17/0018-Warn-instead-of-exiting-if-getcpu-2-is-unsupported.patch index cfbaa5574cb2ec1..169e11ad385b6ff 100644 --- a/packages/openjdk-17/0019-Warn-instead-of-exiting-if-getcpu-2-is-unsupported.patch +++ b/packages/openjdk-17/0018-Warn-instead-of-exiting-if-getcpu-2-is-unsupported.patch @@ -1,7 +1,7 @@ -From 01dd18f24d09aac2aaf808fd39527278c13886c4 Mon Sep 17 00:00:00 2001 +From c5f533ed4d2752a86b68e8e180b8bd9d807c55d4 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Mon, 28 Jun 2021 17:47:31 +0700 -Subject: [PATCH 19/41] Warn instead of exiting if getcpu(2) is unsupported +Subject: [PATCH 18/41] Warn instead of exiting if getcpu(2) is unsupported --- src/hotspot/os/linux/os_linux.cpp | 3 ++- diff --git a/packages/openjdk-17/0020-Remove-pre-UAL-aliases.patch b/packages/openjdk-17/0019-Remove-pre-UAL-aliases.patch similarity index 97% rename from packages/openjdk-17/0020-Remove-pre-UAL-aliases.patch rename to packages/openjdk-17/0019-Remove-pre-UAL-aliases.patch index 374ac3d28f37e79..affb31237432f27 100644 --- a/packages/openjdk-17/0020-Remove-pre-UAL-aliases.patch +++ b/packages/openjdk-17/0019-Remove-pre-UAL-aliases.patch @@ -1,7 +1,7 @@ -From 4862e7a5a7ba840bb269be77bef5890254997090 Mon Sep 17 00:00:00 2001 +From 3e7843504e1ca0d380698478b0185c7f1223670f Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Wed, 30 Jun 2021 14:28:14 +0700 -Subject: [PATCH 20/41] Remove pre-UAL aliases +Subject: [PATCH 19/41] Remove pre-UAL aliases --- src/hotspot/os_cpu/linux_arm/linux_arm_32.S | 40 ++++++++++----------- diff --git a/packages/openjdk-17/0021-arm-fix-assembly-in-os_linux_arm.cpp.patch b/packages/openjdk-17/0020-arm-fix-assembly-in-os_linux_arm.cpp.patch similarity index 86% rename from packages/openjdk-17/0021-arm-fix-assembly-in-os_linux_arm.cpp.patch rename to packages/openjdk-17/0020-arm-fix-assembly-in-os_linux_arm.cpp.patch index 0731f512ac9d593..b901727d2562e97 100644 --- a/packages/openjdk-17/0021-arm-fix-assembly-in-os_linux_arm.cpp.patch +++ b/packages/openjdk-17/0020-arm-fix-assembly-in-os_linux_arm.cpp.patch @@ -1,7 +1,7 @@ -From ccbb5a8342951e23fe6c113fbecf8a200dd159cc Mon Sep 17 00:00:00 2001 +From dba2008432906ce268b6a9b1841847ee60c2c1a6 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Wed, 30 Jun 2021 14:30:02 +0700 -Subject: [PATCH 21/41] arm: fix assembly in os_linux_arm.cpp +Subject: [PATCH 20/41] arm: fix assembly in os_linux_arm.cpp --- src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp | 4 ++-- diff --git a/packages/openjdk-17/0022-Add-workaround-for-tagged-pointers-on-Android-12.patch b/packages/openjdk-17/0021-Add-workaround-for-tagged-pointers-on-Android-12.patch similarity index 93% rename from packages/openjdk-17/0022-Add-workaround-for-tagged-pointers-on-Android-12.patch rename to packages/openjdk-17/0021-Add-workaround-for-tagged-pointers-on-Android-12.patch index 8b21f6b830fa6fd..109f00ceb9d2319 100644 --- a/packages/openjdk-17/0022-Add-workaround-for-tagged-pointers-on-Android-12.patch +++ b/packages/openjdk-17/0021-Add-workaround-for-tagged-pointers-on-Android-12.patch @@ -1,7 +1,7 @@ -From 104f57aeb8785a5c9003c73fb3a26425d056fafa Mon Sep 17 00:00:00 2001 +From 6e8318292b09888b257e5a52319ffd0d5a515b9e Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Fri, 3 Feb 2023 11:32:40 +0100 -Subject: [PATCH 22/41] Add workaround for tagged pointers on Android 12 +Subject: [PATCH 21/41] Add workaround for tagged pointers on Android 12 Co-authored-by: dev-bz <32380878+dev-bz@users.noreply.github.com> --- diff --git a/packages/openjdk-17/0023-x86-always-compile-with-PIC.patch b/packages/openjdk-17/0022-x86-always-compile-with-PIC.patch similarity index 93% rename from packages/openjdk-17/0023-x86-always-compile-with-PIC.patch rename to packages/openjdk-17/0022-x86-always-compile-with-PIC.patch index af3267767445a46..a8532e7aa41c0c5 100644 --- a/packages/openjdk-17/0023-x86-always-compile-with-PIC.patch +++ b/packages/openjdk-17/0022-x86-always-compile-with-PIC.patch @@ -1,7 +1,7 @@ -From c21940c9a64ad6286f70cbcf48fe29427dfa6b1a Mon Sep 17 00:00:00 2001 +From 23fb4606ea222d88bec1a05403782d3cc6ed68b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BA=AF=E6=B4=84?= <1840686745@qq.com> Date: Thu, 26 Aug 2021 14:00:54 +0800 -Subject: [PATCH 23/41] x86: always compile with PIC +Subject: [PATCH 22/41] x86: always compile with PIC --- make/hotspot/lib/JvmOverrideFiles.gmk | 18 ------------------ diff --git a/packages/openjdk-17/0024-Fix-StackOverflowError-on-ARM.patch b/packages/openjdk-17/0023-Fix-StackOverflowError-on-ARM.patch similarity index 86% rename from packages/openjdk-17/0024-Fix-StackOverflowError-on-ARM.patch rename to packages/openjdk-17/0023-Fix-StackOverflowError-on-ARM.patch index 4d319192edef6a6..6fa074393025fea 100644 --- a/packages/openjdk-17/0024-Fix-StackOverflowError-on-ARM.patch +++ b/packages/openjdk-17/0023-Fix-StackOverflowError-on-ARM.patch @@ -1,7 +1,7 @@ -From 27e919e849e7c45133174d19319f4defe4e323bb Mon Sep 17 00:00:00 2001 +From 55ea2917b92b449e8b58b96a8e2226410dd99f33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BA=AF=E6=B4=84?= <1840686745@qq.com> Date: Thu, 26 Aug 2021 03:53:25 +0800 -Subject: [PATCH 24/41] Fix StackOverflowError on ARM +Subject: [PATCH 23/41] Fix StackOverflowError on ARM --- src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp | 6 ++++++ diff --git a/packages/openjdk-17/0025-android-dlvsym-is-available-if-ANDROID_API-24.patch b/packages/openjdk-17/0024-android-dlvsym-is-available-if-ANDROID_API-24.patch similarity index 85% rename from packages/openjdk-17/0025-android-dlvsym-is-available-if-ANDROID_API-24.patch rename to packages/openjdk-17/0024-android-dlvsym-is-available-if-ANDROID_API-24.patch index f3df0fbc6031e95..b08a4ab8698801d 100644 --- a/packages/openjdk-17/0025-android-dlvsym-is-available-if-ANDROID_API-24.patch +++ b/packages/openjdk-17/0024-android-dlvsym-is-available-if-ANDROID_API-24.patch @@ -1,7 +1,7 @@ -From f0376df484311fa35e2003d88ce20e9d525e6c0c Mon Sep 17 00:00:00 2001 +From 4ce61a119ae4f8b5011abc16f029da95dcb07cbd Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Fri, 3 Feb 2023 11:50:57 +0100 -Subject: [PATCH 25/41] android: dlvsym is available if ANDROID_API >= 24 +Subject: [PATCH 24/41] android: dlvsym is available if ANDROID_API >= 24 --- src/hotspot/os/linux/os_linux.cpp | 2 +- diff --git a/packages/openjdk-17/0026-Update-hardcoded-paths-to-work-in-termux.patch b/packages/openjdk-17/0025-Update-hardcoded-paths-to-work-in-termux.patch similarity index 99% rename from packages/openjdk-17/0026-Update-hardcoded-paths-to-work-in-termux.patch rename to packages/openjdk-17/0025-Update-hardcoded-paths-to-work-in-termux.patch index b1a42d2c65e6da7..29292c54b33d73b 100644 --- a/packages/openjdk-17/0026-Update-hardcoded-paths-to-work-in-termux.patch +++ b/packages/openjdk-17/0025-Update-hardcoded-paths-to-work-in-termux.patch @@ -1,7 +1,7 @@ -From f3dd6b0c513707cabb38ab6a33e243980a1e47ac Mon Sep 17 00:00:00 2001 +From c56021794ceda956e362e5f709adaf72a7c5d0bf Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Tue, 6 Jul 2021 18:29:24 +0700 -Subject: [PATCH 26/41] Update hardcoded paths to work in termux +Subject: [PATCH 25/41] Update hardcoded paths to work in termux --- src/hotspot/os/linux/os_linux.cpp | 10 +++++-- diff --git a/packages/openjdk-17/0027-elfFile.hpp-no-need-to-define-ELF-32-64-_ST_TYPE-on-.patch b/packages/openjdk-17/0026-elfFile.hpp-no-need-to-define-ELF-32-64-_ST_TYPE-on-.patch similarity index 89% rename from packages/openjdk-17/0027-elfFile.hpp-no-need-to-define-ELF-32-64-_ST_TYPE-on-.patch rename to packages/openjdk-17/0026-elfFile.hpp-no-need-to-define-ELF-32-64-_ST_TYPE-on-.patch index 7c67885bfbb17ab..140487116813c51 100644 --- a/packages/openjdk-17/0027-elfFile.hpp-no-need-to-define-ELF-32-64-_ST_TYPE-on-.patch +++ b/packages/openjdk-17/0026-elfFile.hpp-no-need-to-define-ELF-32-64-_ST_TYPE-on-.patch @@ -1,7 +1,7 @@ -From 42543b772275a58357d35275f75dbbbd57a40709 Mon Sep 17 00:00:00 2001 +From b94b91dfd419ae771e603adf4afcd4b05a2596fc Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sat, 4 Feb 2023 22:45:13 +0100 -Subject: [PATCH 27/41] elfFile.hpp: no need to define ELF{32,64}_ST_TYPE on +Subject: [PATCH 26/41] elfFile.hpp: no need to define ELF{32,64}_ST_TYPE on android As the elf.h header already provides defintions. diff --git a/packages/openjdk-17/0028-os-linux-add-getloadavg-implementation-for-android.patch b/packages/openjdk-17/0027-os-linux-add-getloadavg-implementation-for-android.patch similarity index 88% rename from packages/openjdk-17/0028-os-linux-add-getloadavg-implementation-for-android.patch rename to packages/openjdk-17/0027-os-linux-add-getloadavg-implementation-for-android.patch index 815fcb7eac554a2..67885219cf38a3d 100644 --- a/packages/openjdk-17/0028-os-linux-add-getloadavg-implementation-for-android.patch +++ b/packages/openjdk-17/0027-os-linux-add-getloadavg-implementation-for-android.patch @@ -1,7 +1,7 @@ -From 107bac76e05fad8159e128c80d5d836c556e3469 Mon Sep 17 00:00:00 2001 +From 6c24cec35abb033117df274de7a2b57f598c8b6b Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 5 Feb 2023 09:14:50 +0100 -Subject: [PATCH 28/41] os: linux: add getloadavg implementation for android +Subject: [PATCH 27/41] os: linux: add getloadavg implementation for android --- src/hotspot/os/linux/os_linux.cpp | 13 +++++++++++++ diff --git a/packages/openjdk-17/0029-os-linux-use-getpagesize-instad-of-SHMLBA.patch b/packages/openjdk-17/0028-os-linux-use-getpagesize-instad-of-SHMLBA.patch similarity index 90% rename from packages/openjdk-17/0029-os-linux-use-getpagesize-instad-of-SHMLBA.patch rename to packages/openjdk-17/0028-os-linux-use-getpagesize-instad-of-SHMLBA.patch index b67508cd2fa39d6..41f67e96e6b3fa2 100644 --- a/packages/openjdk-17/0029-os-linux-use-getpagesize-instad-of-SHMLBA.patch +++ b/packages/openjdk-17/0028-os-linux-use-getpagesize-instad-of-SHMLBA.patch @@ -1,7 +1,7 @@ -From 5fe01f64c52f9dd75269bd286b398dc0f3220031 Mon Sep 17 00:00:00 2001 +From 5bbcd875903f7dbd7b84751af340be1584c89fba Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 5 Feb 2023 09:21:57 +0100 -Subject: [PATCH 29/41] os: linux: use getpagesize() instad of SHMLBA +Subject: [PATCH 28/41] os: linux: use getpagesize() instad of SHMLBA Since the latter is not defined on android. --- diff --git a/packages/openjdk-17/0030-libjava-change-return-type-of-strerror_r.patch b/packages/openjdk-17/0029-libjava-change-return-type-of-strerror_r.patch similarity index 94% rename from packages/openjdk-17/0030-libjava-change-return-type-of-strerror_r.patch rename to packages/openjdk-17/0029-libjava-change-return-type-of-strerror_r.patch index 9db68a2564ca8f2..12faa065250a5d5 100644 --- a/packages/openjdk-17/0030-libjava-change-return-type-of-strerror_r.patch +++ b/packages/openjdk-17/0029-libjava-change-return-type-of-strerror_r.patch @@ -1,7 +1,7 @@ -From 04200c0a455b8f77463fe643d1dc73b1b8c0cc0f Mon Sep 17 00:00:00 2001 +From 53fcacff17eaf04d6b410d6c151f1f26a387f99f Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 5 Feb 2023 11:47:24 +0100 -Subject: [PATCH 30/41] libjava: change return type of strerror_r +Subject: [PATCH 29/41] libjava: change return type of strerror_r Later versions of android uses the GNU style and returns a char pointer. Adjust jni function to match this. diff --git a/packages/openjdk-17/0031-make-cflags-handle-arm-like-other-arches.patch b/packages/openjdk-17/0030-make-cflags-handle-arm-like-other-arches.patch similarity index 88% rename from packages/openjdk-17/0031-make-cflags-handle-arm-like-other-arches.patch rename to packages/openjdk-17/0030-make-cflags-handle-arm-like-other-arches.patch index 8df9efdb70d340c..1aa7ebc377acb14 100644 --- a/packages/openjdk-17/0031-make-cflags-handle-arm-like-other-arches.patch +++ b/packages/openjdk-17/0030-make-cflags-handle-arm-like-other-arches.patch @@ -1,7 +1,7 @@ -From 0930c2f37404c2a0516925edc8ecf998a4651eff Mon Sep 17 00:00:00 2001 +From cdc244b4bae5f0e863a5cf82d078259ec46535da Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Mon, 13 Feb 2023 13:49:47 +0100 -Subject: [PATCH 31/41] make: cflags: handle arm like other arches +Subject: [PATCH 30/41] make: cflags: handle arm like other arches --- make/autoconf/flags-cflags.m4 | 8 +------- diff --git a/packages/openjdk-17/0032-Fix-bugs-in-File.getCanonicalPath.patch b/packages/openjdk-17/0031-Fix-bugs-in-File.getCanonicalPath.patch similarity index 98% rename from packages/openjdk-17/0032-Fix-bugs-in-File.getCanonicalPath.patch rename to packages/openjdk-17/0031-Fix-bugs-in-File.getCanonicalPath.patch index 4f0f163e0c4d22b..1211c1cc33c45cd 100644 --- a/packages/openjdk-17/0032-Fix-bugs-in-File.getCanonicalPath.patch +++ b/packages/openjdk-17/0031-Fix-bugs-in-File.getCanonicalPath.patch @@ -1,7 +1,7 @@ -From 5a91987277d7c9dfba1cfc05f27fa149e4d07714 Mon Sep 17 00:00:00 2001 +From 35fbdc01130a9bb84d067fa3ccd81500b2624054 Mon Sep 17 00:00:00 2001 From: agnostic-apollo Date: Thu, 28 Mar 2024 18:46:02 +0100 -Subject: [PATCH 32/41] Fix bugs in File.getCanonicalPath() +Subject: [PATCH 31/41] Fix bugs in File.getCanonicalPath() 1. If path length is `>= PATH_MAX` (4096) characters, return error. 2. If any path component length is `> NAME_MAX` (255) characters, return diff --git a/packages/openjdk-17/0033-JvmMapfile.gmk-filter-same-symbols-for-linux-and-and.patch b/packages/openjdk-17/0032-JvmMapfile.gmk-filter-same-symbols-for-linux-and-and.patch similarity index 86% rename from packages/openjdk-17/0033-JvmMapfile.gmk-filter-same-symbols-for-linux-and-and.patch rename to packages/openjdk-17/0032-JvmMapfile.gmk-filter-same-symbols-for-linux-and-and.patch index 6327aea36c83f3b..ebd0971e8bb215f 100644 --- a/packages/openjdk-17/0033-JvmMapfile.gmk-filter-same-symbols-for-linux-and-and.patch +++ b/packages/openjdk-17/0032-JvmMapfile.gmk-filter-same-symbols-for-linux-and-and.patch @@ -1,7 +1,7 @@ -From e10320f9446836280d2731ac35c8c32750d1d00e Mon Sep 17 00:00:00 2001 +From a0570e4424b4584527be59c4d87c8b680f9749b6 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Sat, 5 Jun 2021 17:25:37 +0700 -Subject: [PATCH 33/41] JvmMapfile.gmk: filter same symbols for linux and +Subject: [PATCH 32/41] JvmMapfile.gmk: filter same symbols for linux and android --- diff --git a/packages/openjdk-17/0034-Fix-build-with-lld-17.patch b/packages/openjdk-17/0033-Fix-build-with-lld-17.patch similarity index 88% rename from packages/openjdk-17/0034-Fix-build-with-lld-17.patch rename to packages/openjdk-17/0033-Fix-build-with-lld-17.patch index 73b03766897730c..f0bdbef8d985d7a 100644 --- a/packages/openjdk-17/0034-Fix-build-with-lld-17.patch +++ b/packages/openjdk-17/0033-Fix-build-with-lld-17.patch @@ -1,7 +1,7 @@ -From b72c4f3f41a6ea7fd3b96eba469fd6f63cc36992 Mon Sep 17 00:00:00 2001 +From 66f293bfe198bd0554e49f818a6952f039dcc647 Mon Sep 17 00:00:00 2001 From: agnostic-apollo Date: Thu, 28 Mar 2024 18:52:49 +0100 -Subject: [PATCH 34/41] Fix build with lld 17 +Subject: [PATCH 33/41] Fix build with lld 17 Original Author: Dimitry Andric diff --git a/packages/openjdk-17/0035-Remove-sysThreadAvailableStackWithSlack-from-hotspot.patch b/packages/openjdk-17/0034-Remove-sysThreadAvailableStackWithSlack-from-hotspot.patch similarity index 89% rename from packages/openjdk-17/0035-Remove-sysThreadAvailableStackWithSlack-from-hotspot.patch rename to packages/openjdk-17/0034-Remove-sysThreadAvailableStackWithSlack-from-hotspot.patch index 22caa11e6c0825e..43b5eb0a1a53a55 100644 --- a/packages/openjdk-17/0035-Remove-sysThreadAvailableStackWithSlack-from-hotspot.patch +++ b/packages/openjdk-17/0034-Remove-sysThreadAvailableStackWithSlack-from-hotspot.patch @@ -1,7 +1,7 @@ -From 09cbec17ad98e9130700c1650144afd748f39c97 Mon Sep 17 00:00:00 2001 +From 7f5b29bf05b2d93cfdb7fc81c979ce18d7027ec4 Mon Sep 17 00:00:00 2001 From: agnostic-apollo Date: Thu, 28 Mar 2024 18:52:49 +0100 -Subject: [PATCH 35/41] Remove sysThreadAvailableStackWithSlack from +Subject: [PATCH 34/41] Remove sysThreadAvailableStackWithSlack from hotspot-symbols https://bugs.openjdk.org/browse/JDK-8296970 diff --git a/packages/openjdk-17/0036-hotspot-os_linux-do-not-use-dlinfo-and-RTLD_DI_LINKM.patch b/packages/openjdk-17/0035-hotspot-os_linux-do-not-use-dlinfo-and-RTLD_DI_LINKM.patch similarity index 85% rename from packages/openjdk-17/0036-hotspot-os_linux-do-not-use-dlinfo-and-RTLD_DI_LINKM.patch rename to packages/openjdk-17/0035-hotspot-os_linux-do-not-use-dlinfo-and-RTLD_DI_LINKM.patch index 7c0eaaeec8dc473..b6f7ad6fb515467 100644 --- a/packages/openjdk-17/0036-hotspot-os_linux-do-not-use-dlinfo-and-RTLD_DI_LINKM.patch +++ b/packages/openjdk-17/0035-hotspot-os_linux-do-not-use-dlinfo-and-RTLD_DI_LINKM.patch @@ -1,7 +1,7 @@ -From bf5cc18b50c5cb078d2951f01ddd75330b2e2d26 Mon Sep 17 00:00:00 2001 +From 4e70d29769f9ce717f5d1fd23a5699b5256ceffd Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 31 Mar 2024 20:20:05 +0200 -Subject: [PATCH 36/41] hotspot: os_linux: do not use dlinfo and +Subject: [PATCH 35/41] hotspot: os_linux: do not use dlinfo and RTLD_DI_LINKMAP on android As they are not available. diff --git a/packages/openjdk-17/0037-OUTTREE-bionic-type-redef-fix.patch b/packages/openjdk-17/0036-OUTTREE-bionic-type-redef-fix.patch similarity index 88% rename from packages/openjdk-17/0037-OUTTREE-bionic-type-redef-fix.patch rename to packages/openjdk-17/0036-OUTTREE-bionic-type-redef-fix.patch index c4c2c87eb05630e..19cde46c8fb0c9a 100644 --- a/packages/openjdk-17/0037-OUTTREE-bionic-type-redef-fix.patch +++ b/packages/openjdk-17/0036-OUTTREE-bionic-type-redef-fix.patch @@ -1,7 +1,7 @@ -From 4a2f623088833bc5cd4765800952b277bcc086c3 Mon Sep 17 00:00:00 2001 +From 0447fe34f4c786baf9e73e38420473bb2f7d2e40 Mon Sep 17 00:00:00 2001 From: Robert Kirkman <31490854+robertkirkman@users.noreply.github.com> Date: Mon, 5 May 2025 21:07:27 -0500 -Subject: [PATCH 37/41] OUTTREE bionic type redef fix +Subject: [PATCH 36/41] OUTTREE bionic type redef fix Co-authored-by: eval Nya <11857526-nexplorer-3e@users.noreply.gitlab.com> --- diff --git a/packages/openjdk-17/0038-Fix-hardcoded-paths-in-jdk.attach.patch b/packages/openjdk-17/0037-Fix-hardcoded-paths-in-jdk.attach.patch similarity index 89% rename from packages/openjdk-17/0038-Fix-hardcoded-paths-in-jdk.attach.patch rename to packages/openjdk-17/0037-Fix-hardcoded-paths-in-jdk.attach.patch index c1e57c39cb2c401..9ea848441c6ffa4 100644 --- a/packages/openjdk-17/0038-Fix-hardcoded-paths-in-jdk.attach.patch +++ b/packages/openjdk-17/0037-Fix-hardcoded-paths-in-jdk.attach.patch @@ -1,7 +1,7 @@ -From a9a0c230df7ed7a08adb6154f9381fe2acf701a3 Mon Sep 17 00:00:00 2001 +From 50a90e10e398265e316b74de2c757ab6ef203f63 Mon Sep 17 00:00:00 2001 From: Chongyun Lee <45286352+licy183@users.noreply.github.com> Date: Tue, 3 Sep 2024 12:34:31 +0800 -Subject: [PATCH 38/41] Fix: hardcoded paths in jdk.attach +Subject: [PATCH 37/41] Fix: hardcoded paths in jdk.attach --- .../linux/classes/sun/tools/attach/VirtualMachineImpl.java | 2 +- diff --git a/packages/openjdk-17/0039-Do-not-disable-new-dtags.patch b/packages/openjdk-17/0038-Do-not-disable-new-dtags.patch similarity index 88% rename from packages/openjdk-17/0039-Do-not-disable-new-dtags.patch rename to packages/openjdk-17/0038-Do-not-disable-new-dtags.patch index 3e0cca47b1984a8..46163bd1b1b870b 100644 --- a/packages/openjdk-17/0039-Do-not-disable-new-dtags.patch +++ b/packages/openjdk-17/0038-Do-not-disable-new-dtags.patch @@ -1,7 +1,7 @@ -From e5be57bdabd83dd98173b584c2e38c21bc38b939 Mon Sep 17 00:00:00 2001 +From dd45dc6d8a86e123f783ff5b5b0832750813e126 Mon Sep 17 00:00:00 2001 From: Robert Kirkman <31490854+robertkirkman@users.noreply.github.com> Date: Mon, 5 May 2025 21:07:27 -0500 -Subject: [PATCH 39/41] Do not disable new dtags +Subject: [PATCH 38/41] Do not disable new dtags --- make/autoconf/flags-cflags.m4 | 3 --- diff --git a/packages/openjdk-17/0040-disable-statx-syscall.patch b/packages/openjdk-17/0039-disable-statx-syscall.patch similarity index 92% rename from packages/openjdk-17/0040-disable-statx-syscall.patch rename to packages/openjdk-17/0039-disable-statx-syscall.patch index 17a90addde7935d..b7b33ffbd9bc2cb 100644 --- a/packages/openjdk-17/0040-disable-statx-syscall.patch +++ b/packages/openjdk-17/0039-disable-statx-syscall.patch @@ -1,7 +1,7 @@ -From 06c3922cd68b6e64409d23bc0c418eb4bdc5c9ce Mon Sep 17 00:00:00 2001 +From 45643433ec75f01cc23c6ca1d48ab3704c60e988 Mon Sep 17 00:00:00 2001 From: Robert Kirkman <31490854+robertkirkman@users.noreply.github.com> Date: Thu, 8 May 2025 01:47:00 -0500 -Subject: [PATCH 40/41] disable statx syscall +Subject: [PATCH 39/41] disable statx syscall This turns off dynamically loading the statx() symbol, which has the same effect as reverting diff --git a/packages/openjdk-17/0041-make-autoconf-define-ARM-for-arm-build-with-clang.patch b/packages/openjdk-17/0040-make-autoconf-define-ARM-for-arm-build-with-clang.patch similarity index 90% rename from packages/openjdk-17/0041-make-autoconf-define-ARM-for-arm-build-with-clang.patch rename to packages/openjdk-17/0040-make-autoconf-define-ARM-for-arm-build-with-clang.patch index c316251412f933d..bd2107ea102fc9a 100644 --- a/packages/openjdk-17/0041-make-autoconf-define-ARM-for-arm-build-with-clang.patch +++ b/packages/openjdk-17/0040-make-autoconf-define-ARM-for-arm-build-with-clang.patch @@ -1,7 +1,7 @@ -From c231dc3e463a538af1c16f921f2e3533d56c58d0 Mon Sep 17 00:00:00 2001 +From 8b709a9a83755f795c0639deb37135012cce754e Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 31 Mar 2024 12:02:51 +0200 -Subject: [PATCH 41/41] make: autoconf: define ARM for arm build with clang +Subject: [PATCH 40/41] make: autoconf: define ARM for arm build with clang Fixes error like diff --git a/packages/openjdk-17/0041-android-Prevent-build-of-libsaproc.patch b/packages/openjdk-17/0041-android-Prevent-build-of-libsaproc.patch new file mode 100644 index 000000000000000..4a1a62a668da3e0 --- /dev/null +++ b/packages/openjdk-17/0041-android-Prevent-build-of-libsaproc.patch @@ -0,0 +1,29 @@ +From 4ef9a541979b80bbf96ee5f80f628fed006ecff2 Mon Sep 17 00:00:00 2001 +From: alexytomi <60690056+alexytomi@users.noreply.github.com> +Date: Mon, 21 Jul 2025 15:03:17 +0800 +Subject: [PATCH 41/41] android: Prevent build of libsaproc + +This is originally Grimler's but to allow jsound to build, this patch +needed to be changed. + +saproc still cannot be built though, this is a bionic limitation, it +requires prstatus_t, something missing from the ndk. It's just used for +debugging purposes though, not important +--- + make/modules/jdk.hotspot.agent/Lib.gmk | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/make/modules/jdk.hotspot.agent/Lib.gmk b/make/modules/jdk.hotspot.agent/Lib.gmk +index 59b24d0e452..7bbd5e73ec2 100644 +--- a/make/modules/jdk.hotspot.agent/Lib.gmk ++++ b/make/modules/jdk.hotspot.agent/Lib.gmk +@@ -74,6 +74,4 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBSA, \ + LIBS_windows := dbgeng.lib $(WIN_JAVA_LIB), \ + )) + +-TARGETS += $(BUILD_LIBSA) +- + ################################################################################ +-- +2.50.1 + From fa6c6171fb678679ea5bd4778836d8fd73a61480 Mon Sep 17 00:00:00 2001 From: alexytomi <60690056+alexytomi@users.noreply.github.com> Date: Mon, 21 Jul 2025 15:08:33 +0800 Subject: [PATCH 7/9] fix(main/openjdk-17/21): Update build.sh for jsound and alsa --- packages/openjdk-17/build.sh | 9 ++++++--- packages/openjdk-21/build.sh | 8 ++++++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/packages/openjdk-17/build.sh b/packages/openjdk-17/build.sh index f0bf65ffe0d656c..8279c1a49dc6cd5 100644 --- a/packages/openjdk-17/build.sh +++ b/packages/openjdk-17/build.sh @@ -3,12 +3,12 @@ TERMUX_PKG_DESCRIPTION="Java development kit and runtime" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="17.0.16" -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://github.com/openjdk/jdk17u/archive/refs/tags/jdk-${TERMUX_PKG_VERSION}-ga.tar.gz TERMUX_PKG_SHA256=bc339edfa44646fa3c80971237ba4681e43a28877912cda2839aa42a15f0c7e7 TERMUX_PKG_AUTO_UPDATE=true -TERMUX_PKG_DEPENDS="libandroid-shmem, libandroid-spawn, libiconv, libjpeg-turbo, zlib, littlecms" -TERMUX_PKG_BUILD_DEPENDS="cups, fontconfig, libxrandr, libxt, xorgproto" +TERMUX_PKG_DEPENDS="libandroid-shmem, libandroid-spawn, libiconv, libjpeg-turbo, zlib, littlecms, alsa-plugins" +TERMUX_PKG_BUILD_DEPENDS="cups, fontconfig, libxrandr, libxt, xorgproto, alsa-lib" # openjdk-17-x is recommended because X11 separation is still very experimental. TERMUX_PKG_RECOMMENDS="ca-certificates-java, openjdk-17-x, resolv-conf" TERMUX_PKG_SUGGESTS="cups" @@ -76,6 +76,9 @@ termux_step_configure() { --with-fontconfig-include="$TERMUX_PREFIX/include" \ --with-freetype-include="$TERMUX_PREFIX/include/freetype2" \ --with-freetype-lib="$TERMUX_PREFIX/lib" \ + --with-alsa="$TERMUX_PREFIX" \ + --with-alsa-include="$TERMUX_PREFIX/include/alsa" \ + --with-alsa-lib="$TERMUX_PREFIX/lib" \ --with-x="$TERMUX_PREFIX/include/X11" \ --x-includes="$TERMUX_PREFIX/include/X11" \ --x-libraries="$TERMUX_PREFIX/lib" \ diff --git a/packages/openjdk-21/build.sh b/packages/openjdk-21/build.sh index 957bfa12e1d4f83..d2e5ef2015fdcf6 100644 --- a/packages/openjdk-21/build.sh +++ b/packages/openjdk-21/build.sh @@ -3,11 +3,12 @@ TERMUX_PKG_DESCRIPTION="Java development kit and runtime" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="21.0.8" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/openjdk/jdk21u/archive/refs/tags/jdk-${TERMUX_PKG_VERSION}-ga.tar.gz TERMUX_PKG_SHA256=e0758d17991a51967931854523ca6e287eb4240f0b3e3bc231b2ddb0e77cf71b TERMUX_PKG_AUTO_UPDATE=true -TERMUX_PKG_DEPENDS="libandroid-shmem, libandroid-spawn, libiconv, libjpeg-turbo, zlib, littlecms" -TERMUX_PKG_BUILD_DEPENDS="cups, fontconfig, libxrandr, libxt, xorgproto" +TERMUX_PKG_DEPENDS="libandroid-shmem, libandroid-spawn, libiconv, libjpeg-turbo, zlib, littlecms, alsa-plugins" +TERMUX_PKG_BUILD_DEPENDS="cups, fontconfig, libxrandr, libxt, xorgproto, alsa-lib" # openjdk-21-x is recommended because X11 separation is still very experimental. TERMUX_PKG_RECOMMENDS="ca-certificates-java, openjdk-21-x, resolv-conf" TERMUX_PKG_SUGGESTS="cups" @@ -75,6 +76,9 @@ termux_step_configure() { --with-fontconfig-include="$TERMUX_PREFIX/include" \ --with-freetype-include="$TERMUX_PREFIX/include/freetype2" \ --with-freetype-lib="$TERMUX_PREFIX/lib" \ + --with-alsa="$TERMUX_PREFIX" \ + --with-alsa-include="$TERMUX_PREFIX/include/alsa" \ + --with-alsa-lib="$TERMUX_PREFIX/lib" \ --with-x="$TERMUX_PREFIX/include/X11" \ --x-includes="$TERMUX_PREFIX/include/X11" \ --x-libraries="$TERMUX_PREFIX/lib" \ From f7f8a85b1a071f7f8a55327a2b2577be13bb52e5 Mon Sep 17 00:00:00 2001 From: alexytomi <60690056+alexytomi@users.noreply.github.com> Date: Mon, 21 Jul 2025 16:48:54 +0800 Subject: [PATCH 8/9] fix(openjdk-21): Readd deleted comments to commit message Also regenerates for 21.0.8-ga --- ...net-include-netinet-in.h-for-android-builds.patch | 2 +- .../0002-os_linux-add-android-checks-and-fixes.patch | 10 +++++----- .../0003-Define-sys-gettid-on-arm-and-aarch64.patch | 8 ++++---- ...able-posix-print-uptime-overridden-by-linux.patch | 2 +- .../0005-Link-against-system-libiconv.patch | 6 +++--- ...06-aarch64_get_thread_helper-Thread-current.patch | 2 +- .../0007-Remove-aarch64_get_thread_helper.patch | 2 +- .../openjdk-21/0008-Use-Android-s-strerror_r.patch | 2 +- .../openjdk-21/0009-Use-utimensat-on-android.patch | 2 +- ...ava_sun_nio_fs_UnixNativeDispatcher_futimes.patch | 2 +- .../0011-Add-CXXFLAGS_JDKLIB-to-CXXFLAGS.patch | 8 ++++---- .../0012-Use-ASCII-codeset-on-android.patch | 2 +- ...ix-libjvm.so-path-when-run-from-Android-app.patch | 2 +- ...rm-cast-address-to-char-when-clearing-cache.patch | 2 +- ...un-fpu_control-related-functions-on-Android.patch | 2 +- ...nager-link-against-libawt-to-fix-link-error.patch | 4 ++-- ...t-libjvm.so-path-from-proc-self-maps-on-and.patch | 12 ++++++------ ...stead-of-exiting-if-getcpu-2-is-unsupported.patch | 6 +++--- .../openjdk-21/0019-Remove-pre-UAL-aliases.patch | 2 +- .../0020-arm-fix-assembly-in-os_linux_arm.cpp.patch | 2 +- ...orkaround-for-tagged-pointers-on-Android-12.patch | 2 +- .../0022-x86-always-compile-with-PIC.patch | 2 +- .../0023-Fix-StackOverflowError-on-ARM.patch | 2 +- ...droid-dlvsym-is-available-if-ANDROID_API-24.patch | 6 +++--- ...25-Update-hardcoded-paths-to-work-in-termux.patch | 8 ++++---- ...pp-no-need-to-define-ELF-32-64-_ST_TYPE-on-.patch | 2 +- ...x-add-getloadavg-implementation-for-android.patch | 6 +++--- ...8-os-linux-use-getpagesize-instad-of-SHMLBA.patch | 8 ++++---- ...29-libjava-change-return-type-of-strerror_r.patch | 2 +- ...30-make-cflags-handle-arm-like-other-arches.patch | 2 +- .../0031-Fix-bugs-in-File.getCanonicalPath.patch | 2 +- ...utoconf-define-ARM-for-arm-build-with-clang.patch | 2 +- ...s_linux-do-not-use-dlinfo-and-RTLD_DI_LINKM.patch | 6 +++--- .../0036-OUTTREE-bionic-type-redef-fix.patch | 2 +- .../0037-Fix-hardcoded-paths-in-jdk.attach.patch | 2 +- .../openjdk-21/0038-Do-not-disable-new-dtags.patch | 2 +- packages/openjdk-21/0039-disable-statx-syscall.patch | 11 ++++++++++- .../0040-android-Prevent-build-of-libsaproc.patch | 2 +- 38 files changed, 79 insertions(+), 70 deletions(-) diff --git a/packages/openjdk-21/0001-libinet-include-netinet-in.h-for-android-builds.patch b/packages/openjdk-21/0001-libinet-include-netinet-in.h-for-android-builds.patch index 19e384dc6ffade6..8047a419c79db48 100644 --- a/packages/openjdk-21/0001-libinet-include-netinet-in.h-for-android-builds.patch +++ b/packages/openjdk-21/0001-libinet-include-netinet-in.h-for-android-builds.patch @@ -1,4 +1,4 @@ -From 2c006533a199190b1895555ecd22e57504b8410d Mon Sep 17 00:00:00 2001 +From bd4ef54ab96c9af89137a869ee60ca54df527523 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 31 Mar 2024 16:31:48 +0200 Subject: [PATCH 01/40] libinet: include netinet/in.h for android builds diff --git a/packages/openjdk-21/0002-os_linux-add-android-checks-and-fixes.patch b/packages/openjdk-21/0002-os_linux-add-android-checks-and-fixes.patch index 9e29a38bc514501..db7ea02eb5a52dd 100644 --- a/packages/openjdk-21/0002-os_linux-add-android-checks-and-fixes.patch +++ b/packages/openjdk-21/0002-os_linux-add-android-checks-and-fixes.patch @@ -1,4 +1,4 @@ -From c5c06ff0ad56d3b6ec013f352e3a60c28dd43467 Mon Sep 17 00:00:00 2001 +From 88e6b658bd199afc082618a10c7b7dca50395021 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Sun, 6 Jun 2021 20:11:11 +0700 Subject: [PATCH 02/40] os_linux: add android checks and fixes @@ -8,10 +8,10 @@ Subject: [PATCH 02/40] os_linux: add android checks and fixes 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp -index 5ebd57fb300..77057c1d39c 100644 +index bfd55895ab8..f5f1f02c0c1 100644 --- a/src/hotspot/os/linux/os_linux.cpp +++ b/src/hotspot/os/linux/os_linux.cpp -@@ -143,7 +143,7 @@ +@@ -141,7 +141,7 @@ // for timer info max values which include all bits #define ALL_64_BITS CONST64(0xFFFFFFFFFFFFFFFF) @@ -20,7 +20,7 @@ index 5ebd57fb300..77057c1d39c 100644 // dlvsym is not a part of POSIX // and musl libc doesn't implement it. static void *dlvsym(void *handle, -@@ -582,6 +582,7 @@ void os::init_system_properties_values() { +@@ -580,6 +580,7 @@ void os::init_system_properties_values() { // detecting pthread library void os::Linux::libpthread_init() { @@ -28,7 +28,7 @@ index 5ebd57fb300..77057c1d39c 100644 // Save glibc and pthread version strings. #if !defined(_CS_GNU_LIBC_VERSION) || \ !defined(_CS_GNU_LIBPTHREAD_VERSION) -@@ -606,6 +607,9 @@ void os::Linux::libpthread_init() { +@@ -604,6 +605,9 @@ void os::Linux::libpthread_init() { confstr(_CS_GNU_LIBPTHREAD_VERSION, str, n); os::Linux::set_libpthread_version(str); #endif diff --git a/packages/openjdk-21/0003-Define-sys-gettid-on-arm-and-aarch64.patch b/packages/openjdk-21/0003-Define-sys-gettid-on-arm-and-aarch64.patch index 82d370794309864..bab03ed4a472e49 100644 --- a/packages/openjdk-21/0003-Define-sys-gettid-on-arm-and-aarch64.patch +++ b/packages/openjdk-21/0003-Define-sys-gettid-on-arm-and-aarch64.patch @@ -1,4 +1,4 @@ -From 4792a9c8a80a854707a45d1c326bc53e985b1571 Mon Sep 17 00:00:00 2001 +From 72548bb190ecb7683df82111a5cb7c5de8dadaf3 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Mon, 7 Jun 2021 06:27:26 +0700 Subject: [PATCH 03/40] Define sys gettid on arm and aarch64 @@ -8,10 +8,10 @@ Subject: [PATCH 03/40] Define sys gettid on arm and aarch64 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp -index 77057c1d39c..04bee9e5ff3 100644 +index f5f1f02c0c1..0c1bd103670 100644 --- a/src/hotspot/os/linux/os_linux.cpp +++ b/src/hotspot/os/linux/os_linux.cpp -@@ -394,11 +394,11 @@ bool os::Linux::get_tick_information(CPUPerfTicks* pticks, int which_logical_cpu +@@ -392,11 +392,11 @@ bool os::Linux::get_tick_information(CPUPerfTicks* pticks, int which_logical_cpu } #ifndef SYS_gettid @@ -25,7 +25,7 @@ index 77057c1d39c..04bee9e5ff3 100644 #define SYS_gettid 224 #else #ifdef __amd64__ -@@ -406,6 +406,8 @@ bool os::Linux::get_tick_information(CPUPerfTicks* pticks, int which_logical_cpu +@@ -404,6 +404,8 @@ bool os::Linux::get_tick_information(CPUPerfTicks* pticks, int which_logical_cpu #else #ifdef __sparc__ #define SYS_gettid 143 diff --git a/packages/openjdk-21/0004-Disable-posix-print-uptime-overridden-by-linux.patch b/packages/openjdk-21/0004-Disable-posix-print-uptime-overridden-by-linux.patch index fa7c4ce965e1ba6..916fb53bdda2df4 100644 --- a/packages/openjdk-21/0004-Disable-posix-print-uptime-overridden-by-linux.patch +++ b/packages/openjdk-21/0004-Disable-posix-print-uptime-overridden-by-linux.patch @@ -1,4 +1,4 @@ -From daa941f61e7da80c98deef776c7b0f6e2b46963e Mon Sep 17 00:00:00 2001 +From 9354dfab6ad57fba7e94099a7cbe1d127fdb2701 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Mon, 7 Jun 2021 08:05:09 +0700 Subject: [PATCH 04/40] Disable posix print uptime (overridden by linux!) diff --git a/packages/openjdk-21/0005-Link-against-system-libiconv.patch b/packages/openjdk-21/0005-Link-against-system-libiconv.patch index bc0f080ea1fc1a7..a624e8772c37fc5 100644 --- a/packages/openjdk-21/0005-Link-against-system-libiconv.patch +++ b/packages/openjdk-21/0005-Link-against-system-libiconv.patch @@ -1,4 +1,4 @@ -From 07f38091c2cc90526d2112e7ff29d8e8696387f4 Mon Sep 17 00:00:00 2001 +From 61b4fb651ca86721d6839f3ecd7a8c0e61b6f78f Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Fri, 3 Feb 2023 11:09:10 +0100 Subject: [PATCH 05/40] Link against system libiconv @@ -22,10 +22,10 @@ index ae985b3158f..417e0d6a049 100644 LIBS_macosx := -ljli -liconv -framework Cocoa -framework Security \ -framework ApplicationServices, \ diff --git a/make/modules/jdk.jdwp.agent/Lib.gmk b/make/modules/jdk.jdwp.agent/Lib.gmk -index ba694f50e1b..9631bf239f7 100644 +index 52ac6564d30..38f95bead4d 100644 --- a/make/modules/jdk.jdwp.agent/Lib.gmk +++ b/make/modules/jdk.jdwp.agent/Lib.gmk -@@ -64,7 +64,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJDWP, \ +@@ -65,7 +65,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJDWP, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ LIBS := $(JDKLIB_LIBS), \ diff --git a/packages/openjdk-21/0006-aarch64_get_thread_helper-Thread-current.patch b/packages/openjdk-21/0006-aarch64_get_thread_helper-Thread-current.patch index 9819ff4776e5426..927d3d4889041de 100644 --- a/packages/openjdk-21/0006-aarch64_get_thread_helper-Thread-current.patch +++ b/packages/openjdk-21/0006-aarch64_get_thread_helper-Thread-current.patch @@ -1,4 +1,4 @@ -From 094e18a447354548e9038f8dcbe5dd9124135516 Mon Sep 17 00:00:00 2001 +From e1b324b00a6aa6768041e1f922bf4d30f792436d Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Thu, 10 Jun 2021 08:45:16 +0700 Subject: [PATCH 06/40] aarch64_get_thread_helper() -> Thread::current() diff --git a/packages/openjdk-21/0007-Remove-aarch64_get_thread_helper.patch b/packages/openjdk-21/0007-Remove-aarch64_get_thread_helper.patch index 2d53f394d2e61ea..dc76d69388c3ceb 100644 --- a/packages/openjdk-21/0007-Remove-aarch64_get_thread_helper.patch +++ b/packages/openjdk-21/0007-Remove-aarch64_get_thread_helper.patch @@ -1,4 +1,4 @@ -From 5b02a238fa185fad337528bca0988e2116cb65dd Mon Sep 17 00:00:00 2001 +From d51411baeffc53a6b752b72b8ba5f0918163da41 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Thu, 10 Jun 2021 08:46:35 +0700 Subject: [PATCH 07/40] Remove aarch64_get_thread_helper() diff --git a/packages/openjdk-21/0008-Use-Android-s-strerror_r.patch b/packages/openjdk-21/0008-Use-Android-s-strerror_r.patch index 6270aa874febb76..a9fc8fec74206d1 100644 --- a/packages/openjdk-21/0008-Use-Android-s-strerror_r.patch +++ b/packages/openjdk-21/0008-Use-Android-s-strerror_r.patch @@ -1,4 +1,4 @@ -From 5db3bc8d40aaf7f463ed8bb24bdd1f2a18696f04 Mon Sep 17 00:00:00 2001 +From d5179a40d04e879c506a9e85e9d8033e8e48d116 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Thu, 10 Jun 2021 09:36:26 +0700 Subject: [PATCH 08/40] Use Android's strerror_r() diff --git a/packages/openjdk-21/0009-Use-utimensat-on-android.patch b/packages/openjdk-21/0009-Use-utimensat-on-android.patch index 890ef947b9f0fe8..030fc9ab8504990 100644 --- a/packages/openjdk-21/0009-Use-utimensat-on-android.patch +++ b/packages/openjdk-21/0009-Use-utimensat-on-android.patch @@ -1,4 +1,4 @@ -From fd9f1d19464a5e9f057661bc157dc3b70408da77 Mon Sep 17 00:00:00 2001 +From 90e4b4a59f1ae7fb998f8c7dc8d4225e6e8fbb90 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Thu, 10 Jun 2021 16:42:56 +0700 Subject: [PATCH 09/40] Use utimensat on android diff --git a/packages/openjdk-21/0010-Fixed-Java_sun_nio_fs_UnixNativeDispatcher_futimes.patch b/packages/openjdk-21/0010-Fixed-Java_sun_nio_fs_UnixNativeDispatcher_futimes.patch index d06d3a31b48e364..5dda25ba51af3d8 100644 --- a/packages/openjdk-21/0010-Fixed-Java_sun_nio_fs_UnixNativeDispatcher_futimes.patch +++ b/packages/openjdk-21/0010-Fixed-Java_sun_nio_fs_UnixNativeDispatcher_futimes.patch @@ -1,4 +1,4 @@ -From 09f92103742c681eea12b31ca7bd8047bd6d0a59 Mon Sep 17 00:00:00 2001 +From 9b396bdfb9d9f6a58efb9f947845d9aa54b72ac6 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Thu, 10 Jun 2021 18:36:56 +0700 Subject: [PATCH 10/40] Fixed Java_sun_nio_fs_UnixNativeDispatcher_futimes diff --git a/packages/openjdk-21/0011-Add-CXXFLAGS_JDKLIB-to-CXXFLAGS.patch b/packages/openjdk-21/0011-Add-CXXFLAGS_JDKLIB-to-CXXFLAGS.patch index 3fd303db0961cc4..b032a721214f398 100644 --- a/packages/openjdk-21/0011-Add-CXXFLAGS_JDKLIB-to-CXXFLAGS.patch +++ b/packages/openjdk-21/0011-Add-CXXFLAGS_JDKLIB-to-CXXFLAGS.patch @@ -1,4 +1,4 @@ -From 475cb3fe6b6fd8a12d21aeb35d2e28275499da37 Mon Sep 17 00:00:00 2001 +From 3ca6380fad0b0a0d78a152370ba668f713db24b6 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Thu, 10 Jun 2021 19:23:03 +0700 Subject: [PATCH 11/40] Add CXXFLAGS_JDKLIB to CXXFLAGS @@ -22,13 +22,13 @@ index 417e0d6a049..73a937854d4 100644 LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN) \ diff --git a/make/modules/jdk.jdwp.agent/Lib.gmk b/make/modules/jdk.jdwp.agent/Lib.gmk -index 9631bf239f7..ae889b6f582 100644 +index 38f95bead4d..571494f917b 100644 --- a/make/modules/jdk.jdwp.agent/Lib.gmk +++ b/make/modules/jdk.jdwp.agent/Lib.gmk -@@ -58,6 +58,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJDWP, \ - DISABLED_WARNINGS_clang_EventRequestImpl.c := self-assign, \ +@@ -59,6 +59,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJDWP, \ DISABLED_WARNINGS_clang_inStream.c := sometimes-uninitialized, \ DISABLED_WARNINGS_clang_log_messages.c := format-nonliteral, \ + DISABLED_WARNINGS_microsoft_debugInit.c := 5287, \ + CXXFLAGS := $(CXXFLAGS_JDKLIB), \ EXTRA_HEADER_DIRS := \ include \ diff --git a/packages/openjdk-21/0012-Use-ASCII-codeset-on-android.patch b/packages/openjdk-21/0012-Use-ASCII-codeset-on-android.patch index 082b2cfd0b9eb5e..f14f969fce431d4 100644 --- a/packages/openjdk-21/0012-Use-ASCII-codeset-on-android.patch +++ b/packages/openjdk-21/0012-Use-ASCII-codeset-on-android.patch @@ -1,4 +1,4 @@ -From 7b8ef593e9a4e7107688273e2494a03865b8e56c Mon Sep 17 00:00:00 2001 +From 456c8d6a15012a474995503038e22b74b424a373 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Thu, 10 Jun 2021 20:42:40 +0700 Subject: [PATCH 12/40] Use ASCII codeset on android diff --git a/packages/openjdk-21/0013-Fix-libjvm.so-path-when-run-from-Android-app.patch b/packages/openjdk-21/0013-Fix-libjvm.so-path-when-run-from-Android-app.patch index fdc23bc4ced65f5..d74a1ea1dd8047f 100644 --- a/packages/openjdk-21/0013-Fix-libjvm.so-path-when-run-from-Android-app.patch +++ b/packages/openjdk-21/0013-Fix-libjvm.so-path-when-run-from-Android-app.patch @@ -1,4 +1,4 @@ -From 34145419ef9781d9b3ffab94d7cc660637dfe78a Mon Sep 17 00:00:00 2001 +From a24a4c2f2b7cc6452a57767da149b18b41070a1f Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Fri, 11 Jun 2021 07:48:28 +0700 Subject: [PATCH 13/40] Fix libjvm.so path when run from Android app diff --git a/packages/openjdk-21/0014-arm-cast-address-to-char-when-clearing-cache.patch b/packages/openjdk-21/0014-arm-cast-address-to-char-when-clearing-cache.patch index bb3fc01001177a7..5602d349dd9af7f 100644 --- a/packages/openjdk-21/0014-arm-cast-address-to-char-when-clearing-cache.patch +++ b/packages/openjdk-21/0014-arm-cast-address-to-char-when-clearing-cache.patch @@ -1,4 +1,4 @@ -From 33ad7926d63078cb26e491a0c6361dd0fd7a1cf8 Mon Sep 17 00:00:00 2001 +From adc8a9656b3286bda58e0b153fa7bf4cc8a154fe Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Sat, 12 Jun 2021 06:55:18 +0700 Subject: [PATCH 14/40] arm: cast address to char when clearing cache diff --git a/packages/openjdk-21/0015-Don-t-run-fpu_control-related-functions-on-Android.patch b/packages/openjdk-21/0015-Don-t-run-fpu_control-related-functions-on-Android.patch index 48a04c0a32750d2..35d2a1df0920901 100644 --- a/packages/openjdk-21/0015-Don-t-run-fpu_control-related-functions-on-Android.patch +++ b/packages/openjdk-21/0015-Don-t-run-fpu_control-related-functions-on-Android.patch @@ -1,4 +1,4 @@ -From b87c85a3c08ba167e262fba0f407c1f13480ba82 Mon Sep 17 00:00:00 2001 +From a2674ce643008d981e49af3a8716b2894c7f9f82 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Sat, 12 Jun 2021 06:58:20 +0700 Subject: [PATCH 15/40] Don't run fpu_control related functions on Android diff --git a/packages/openjdk-21/0016-Libfontmanager-link-against-libawt-to-fix-link-error.patch b/packages/openjdk-21/0016-Libfontmanager-link-against-libawt-to-fix-link-error.patch index f0b73f5752b37ca..19f1ec27f3c87ed 100644 --- a/packages/openjdk-21/0016-Libfontmanager-link-against-libawt-to-fix-link-error.patch +++ b/packages/openjdk-21/0016-Libfontmanager-link-against-libawt-to-fix-link-error.patch @@ -1,4 +1,4 @@ -From e76f6e247dae62a0b0d50cacaf9a5cedb6fcb4ca Mon Sep 17 00:00:00 2001 +From 244e732a47c8f77eeb3e4f08d8e1965739245980 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Sat, 12 Jun 2021 17:03:05 +0700 Subject: [PATCH 16/40] Libfontmanager: link against libawt to fix link error @@ -10,7 +10,7 @@ https://github.com/androidports/openjdk/commit/a3e4f0281154537f01c2e59286a6ceed9 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/make/modules/java.desktop/lib/Awt2dLibraries.gmk b/make/modules/java.desktop/lib/Awt2dLibraries.gmk -index f0c92ee094f..64942a85aa4 100644 +index aec83408600..7139d4041c7 100644 --- a/make/modules/java.desktop/lib/Awt2dLibraries.gmk +++ b/make/modules/java.desktop/lib/Awt2dLibraries.gmk @@ -563,13 +563,13 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBFONTMANAGER, \ diff --git a/packages/openjdk-21/0017-Try-to-get-libjvm.so-path-from-proc-self-maps-on-and.patch b/packages/openjdk-21/0017-Try-to-get-libjvm.so-path-from-proc-self-maps-on-and.patch index d1fc9abfd85e488..d3437772ba2e389 100644 --- a/packages/openjdk-21/0017-Try-to-get-libjvm.so-path-from-proc-self-maps-on-and.patch +++ b/packages/openjdk-21/0017-Try-to-get-libjvm.so-path-from-proc-self-maps-on-and.patch @@ -1,4 +1,4 @@ -From b06422b658c5673ab93f9e9fca514a93bd573ea8 Mon Sep 17 00:00:00 2001 +From 52334464c162c6bf29d7b2f26ef0fa42b52da8ea Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Fri, 25 Jun 2021 17:19:24 +0700 Subject: [PATCH 17/40] Try to get libjvm.so path from /proc/self/maps on @@ -9,10 +9,10 @@ Subject: [PATCH 17/40] Try to get libjvm.so path from /proc/self/maps on 1 file changed, 44 insertions(+) diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp -index 04bee9e5ff3..25ad8934d4e 100644 +index 0c1bd103670..27c38826255 100644 --- a/src/hotspot/os/linux/os_linux.cpp +++ b/src/hotspot/os/linux/os_linux.cpp -@@ -221,6 +221,8 @@ static int clock_tics_per_sec = 100; +@@ -219,6 +219,8 @@ static int clock_tics_per_sec = 100; // avoid this static bool suppress_primordial_thread_resolution = false; @@ -21,7 +21,7 @@ index 04bee9e5ff3..25ad8934d4e 100644 // utility functions julong os::Linux::available_memory_in_container() { -@@ -1534,6 +1536,34 @@ bool os::dll_address_to_library_name(address addr, char* buf, +@@ -1532,6 +1534,34 @@ bool os::dll_address_to_library_name(address addr, char* buf, return false; } @@ -56,7 +56,7 @@ index 04bee9e5ff3..25ad8934d4e 100644 // Remember the stack's state. The Linux dynamic linker will change // the stack to 'executable' at most once, so we must safepoint only once. bool os::Linux::_stack_is_executable = false; -@@ -2664,6 +2694,19 @@ void os::jvm_path(char *buf, jint buflen) { +@@ -2662,6 +2692,19 @@ void os::jvm_path(char *buf, jint buflen) { CAST_FROM_FN_PTR(address, os::jvm_path), dli_fname, sizeof(dli_fname), nullptr); assert(ret, "cannot locate libjvm"); @@ -76,7 +76,7 @@ index 04bee9e5ff3..25ad8934d4e 100644 char *rp = nullptr; if (ret && dli_fname[0] != '\0') { rp = os::Posix::realpath(dli_fname, buf, buflen); -@@ -2729,6 +2772,7 @@ void os::jvm_path(char *buf, jint buflen) { +@@ -2727,6 +2770,7 @@ void os::jvm_path(char *buf, jint buflen) { } } } diff --git a/packages/openjdk-21/0018-Warn-instead-of-exiting-if-getcpu-2-is-unsupported.patch b/packages/openjdk-21/0018-Warn-instead-of-exiting-if-getcpu-2-is-unsupported.patch index 0ad9da5d0845bca..04f644cbf6fc111 100644 --- a/packages/openjdk-21/0018-Warn-instead-of-exiting-if-getcpu-2-is-unsupported.patch +++ b/packages/openjdk-21/0018-Warn-instead-of-exiting-if-getcpu-2-is-unsupported.patch @@ -1,4 +1,4 @@ -From 5aa1e197cc265faff035682254098a17bec02e0a Mon Sep 17 00:00:00 2001 +From 5bc0755e213d7c1c98633d5d110152a0f611258d Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Mon, 28 Jun 2021 17:47:31 +0700 Subject: [PATCH 18/40] Warn instead of exiting if getcpu(2) is unsupported @@ -8,10 +8,10 @@ Subject: [PATCH 18/40] Warn instead of exiting if getcpu(2) is unsupported 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp -index 25ad8934d4e..45014f0b176 100644 +index 27c38826255..445a11b8465 100644 --- a/src/hotspot/os/linux/os_linux.cpp +++ b/src/hotspot/os/linux/os_linux.cpp -@@ -3134,7 +3134,8 @@ void os::Linux::sched_getcpu_init() { +@@ -3132,7 +3132,8 @@ void os::Linux::sched_getcpu_init() { } if (sched_getcpu() == -1) { diff --git a/packages/openjdk-21/0019-Remove-pre-UAL-aliases.patch b/packages/openjdk-21/0019-Remove-pre-UAL-aliases.patch index 0a43a8db0989610..017a3d76bf1996e 100644 --- a/packages/openjdk-21/0019-Remove-pre-UAL-aliases.patch +++ b/packages/openjdk-21/0019-Remove-pre-UAL-aliases.patch @@ -1,4 +1,4 @@ -From 4393e5370761d64084a53b2a31af5268308d24f5 Mon Sep 17 00:00:00 2001 +From 6279cf8317ac81c6e43ca06185177241b3503bed Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Wed, 30 Jun 2021 14:28:14 +0700 Subject: [PATCH 19/40] Remove pre-UAL aliases diff --git a/packages/openjdk-21/0020-arm-fix-assembly-in-os_linux_arm.cpp.patch b/packages/openjdk-21/0020-arm-fix-assembly-in-os_linux_arm.cpp.patch index b81d30da21414d9..349855071b43258 100644 --- a/packages/openjdk-21/0020-arm-fix-assembly-in-os_linux_arm.cpp.patch +++ b/packages/openjdk-21/0020-arm-fix-assembly-in-os_linux_arm.cpp.patch @@ -1,4 +1,4 @@ -From b70466b9377643b37b0e4158768f13de67b37b77 Mon Sep 17 00:00:00 2001 +From e981a5d79d52373c7f4085c0ee0af3077e365491 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Wed, 30 Jun 2021 14:30:02 +0700 Subject: [PATCH 20/40] arm: fix assembly in os_linux_arm.cpp diff --git a/packages/openjdk-21/0021-Add-workaround-for-tagged-pointers-on-Android-12.patch b/packages/openjdk-21/0021-Add-workaround-for-tagged-pointers-on-Android-12.patch index be283a80ab4a828..eaa09b98cb07c04 100644 --- a/packages/openjdk-21/0021-Add-workaround-for-tagged-pointers-on-Android-12.patch +++ b/packages/openjdk-21/0021-Add-workaround-for-tagged-pointers-on-Android-12.patch @@ -1,4 +1,4 @@ -From 5be5306a1499ec51a808ba453b011c892812cf97 Mon Sep 17 00:00:00 2001 +From c533657a15a2ae8e736d16d3ca32cff2644ece4a Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Fri, 3 Feb 2023 11:32:40 +0100 Subject: [PATCH 21/40] Add workaround for tagged pointers on Android 12 diff --git a/packages/openjdk-21/0022-x86-always-compile-with-PIC.patch b/packages/openjdk-21/0022-x86-always-compile-with-PIC.patch index 039344520a0fe3e..ba1edb4b2285fa5 100644 --- a/packages/openjdk-21/0022-x86-always-compile-with-PIC.patch +++ b/packages/openjdk-21/0022-x86-always-compile-with-PIC.patch @@ -1,4 +1,4 @@ -From 765d3650f11009d3b7586d8080d273236f06ae23 Mon Sep 17 00:00:00 2001 +From c159df661868e80595b810b60afa070d1097ec35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BA=AF=E6=B4=84?= <1840686745@qq.com> Date: Thu, 26 Aug 2021 14:00:54 +0800 Subject: [PATCH 22/40] x86: always compile with PIC diff --git a/packages/openjdk-21/0023-Fix-StackOverflowError-on-ARM.patch b/packages/openjdk-21/0023-Fix-StackOverflowError-on-ARM.patch index 5545339048b6bc9..31d5072b64173b5 100644 --- a/packages/openjdk-21/0023-Fix-StackOverflowError-on-ARM.patch +++ b/packages/openjdk-21/0023-Fix-StackOverflowError-on-ARM.patch @@ -1,4 +1,4 @@ -From 898a25ae638bc1035dddbf831fdfd7e53bf9fb51 Mon Sep 17 00:00:00 2001 +From 672eeaaae2023a56873251b52138a4290e8325ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BA=AF=E6=B4=84?= <1840686745@qq.com> Date: Thu, 26 Aug 2021 03:53:25 +0800 Subject: [PATCH 23/40] Fix StackOverflowError on ARM diff --git a/packages/openjdk-21/0024-android-dlvsym-is-available-if-ANDROID_API-24.patch b/packages/openjdk-21/0024-android-dlvsym-is-available-if-ANDROID_API-24.patch index 59e893dca8b64f3..254229a5f751eff 100644 --- a/packages/openjdk-21/0024-android-dlvsym-is-available-if-ANDROID_API-24.patch +++ b/packages/openjdk-21/0024-android-dlvsym-is-available-if-ANDROID_API-24.patch @@ -1,4 +1,4 @@ -From 0ccd9748f93d11432725d32131747fb0b6674e7b Mon Sep 17 00:00:00 2001 +From 17822c38730a39f165e133e48882ae978a7ea780 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Fri, 3 Feb 2023 11:50:57 +0100 Subject: [PATCH 24/40] android: dlvsym is available if ANDROID_API >= 24 @@ -8,10 +8,10 @@ Subject: [PATCH 24/40] android: dlvsym is available if ANDROID_API >= 24 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp -index 45014f0b176..a753cb52221 100644 +index 445a11b8465..d7f56827713 100644 --- a/src/hotspot/os/linux/os_linux.cpp +++ b/src/hotspot/os/linux/os_linux.cpp -@@ -143,7 +143,7 @@ +@@ -141,7 +141,7 @@ // for timer info max values which include all bits #define ALL_64_BITS CONST64(0xFFFFFFFFFFFFFFFF) diff --git a/packages/openjdk-21/0025-Update-hardcoded-paths-to-work-in-termux.patch b/packages/openjdk-21/0025-Update-hardcoded-paths-to-work-in-termux.patch index 01eb361553dd957..1b6807e2f192d72 100644 --- a/packages/openjdk-21/0025-Update-hardcoded-paths-to-work-in-termux.patch +++ b/packages/openjdk-21/0025-Update-hardcoded-paths-to-work-in-termux.patch @@ -1,4 +1,4 @@ -From 84b3745a2a0ee53d09787887cfa9dc012c3a2016 Mon Sep 17 00:00:00 2001 +From c8f37affcac4ef7f7d85032780c8f69b55102f30 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Tue, 6 Jul 2021 18:29:24 +0700 Subject: [PATCH 25/40] Update hardcoded paths to work in termux @@ -32,10 +32,10 @@ Subject: [PATCH 25/40] Update hardcoded paths to work in termux 25 files changed, 75 insertions(+), 73 deletions(-) diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp -index a753cb52221..c44280ea2ef 100644 +index d7f56827713..c5403225fd6 100644 --- a/src/hotspot/os/linux/os_linux.cpp +++ b/src/hotspot/os/linux/os_linux.cpp -@@ -1461,7 +1461,13 @@ int os::current_process_id() { +@@ -1459,7 +1459,13 @@ int os::current_process_id() { // This must be hard coded because it's the system's temporary // directory not the java application's temp directory, ala java.io.tmpdir. @@ -50,7 +50,7 @@ index a753cb52221..c44280ea2ef 100644 // check if addr is inside libjvm.so bool os::address_is_in_vm(address addr) { -@@ -2347,7 +2353,7 @@ void os::Linux::print_process_memory_info(outputStream* st) { +@@ -2345,7 +2351,7 @@ void os::Linux::print_process_memory_info(outputStream* st) { } bool os::Linux::print_ld_preload_file(outputStream* st) { diff --git a/packages/openjdk-21/0026-elfFile.hpp-no-need-to-define-ELF-32-64-_ST_TYPE-on-.patch b/packages/openjdk-21/0026-elfFile.hpp-no-need-to-define-ELF-32-64-_ST_TYPE-on-.patch index 9e9001204e0dbdc..8eea53de305773e 100644 --- a/packages/openjdk-21/0026-elfFile.hpp-no-need-to-define-ELF-32-64-_ST_TYPE-on-.patch +++ b/packages/openjdk-21/0026-elfFile.hpp-no-need-to-define-ELF-32-64-_ST_TYPE-on-.patch @@ -1,4 +1,4 @@ -From 658761e4e21e68d6177996c38397d3b0e1afe015 Mon Sep 17 00:00:00 2001 +From 71ab135071cfafa34bf1cb88eef9973c14d5e29b Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sat, 4 Feb 2023 22:45:13 +0100 Subject: [PATCH 26/40] elfFile.hpp: no need to define ELF{32,64}_ST_TYPE on diff --git a/packages/openjdk-21/0027-os-linux-add-getloadavg-implementation-for-android.patch b/packages/openjdk-21/0027-os-linux-add-getloadavg-implementation-for-android.patch index 267c851d9052708..f5d406e01819028 100644 --- a/packages/openjdk-21/0027-os-linux-add-getloadavg-implementation-for-android.patch +++ b/packages/openjdk-21/0027-os-linux-add-getloadavg-implementation-for-android.patch @@ -1,4 +1,4 @@ -From f90953b14db17253864edaa552e3b6308e436331 Mon Sep 17 00:00:00 2001 +From 1a01c1a1ea8339544e1e4dfc58d81d801180a55d Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 5 Feb 2023 09:14:50 +0100 Subject: [PATCH 27/40] os: linux: add getloadavg implementation for android @@ -8,10 +8,10 @@ Subject: [PATCH 27/40] os: linux: add getloadavg implementation for android 1 file changed, 13 insertions(+) diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp -index c44280ea2ef..8c04f45c660 100644 +index c5403225fd6..850ec2a594c 100644 --- a/src/hotspot/os/linux/os_linux.cpp +++ b/src/hotspot/os/linux/os_linux.cpp -@@ -5375,7 +5375,20 @@ bool os::is_thread_cpu_time_supported() { +@@ -5373,7 +5373,20 @@ bool os::is_thread_cpu_time_supported() { // Linux doesn't yet have a (official) notion of processor sets, // so just return the system wide load average. int os::loadavg(double loadavg[], int nelem) { diff --git a/packages/openjdk-21/0028-os-linux-use-getpagesize-instad-of-SHMLBA.patch b/packages/openjdk-21/0028-os-linux-use-getpagesize-instad-of-SHMLBA.patch index 0478b60fd2e6e17..eaceda3e501232f 100644 --- a/packages/openjdk-21/0028-os-linux-use-getpagesize-instad-of-SHMLBA.patch +++ b/packages/openjdk-21/0028-os-linux-use-getpagesize-instad-of-SHMLBA.patch @@ -1,4 +1,4 @@ -From 8f2bdb23efe90b2fad93dfa55a81a630c7e84ca8 Mon Sep 17 00:00:00 2001 +From 06b8a7a3f5c0e7626969781acbb172a5ec950961 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 5 Feb 2023 09:21:57 +0100 Subject: [PATCH 28/40] os: linux: use getpagesize() instad of SHMLBA @@ -9,10 +9,10 @@ Since the latter is not defined on android. 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp -index 8c04f45c660..f41a83ebeba 100644 +index 850ec2a594c..e1e82503e46 100644 --- a/src/hotspot/os/linux/os_linux.cpp +++ b/src/hotspot/os/linux/os_linux.cpp -@@ -4063,7 +4063,7 @@ void os::large_page_init() { +@@ -4061,7 +4061,7 @@ void os::large_page_init() { static char* shmat_with_alignment(int shmid, size_t bytes, size_t alignment) { assert(is_aligned(bytes, alignment), "Must be divisible by the alignment"); @@ -21,7 +21,7 @@ index 8c04f45c660..f41a83ebeba 100644 assert(false, "Code below assumes that alignment is at least SHMLBA aligned"); return nullptr; } -@@ -4099,7 +4099,7 @@ static char* shmat_with_alignment(int shmid, size_t bytes, size_t alignment) { +@@ -4097,7 +4097,7 @@ static char* shmat_with_alignment(int shmid, size_t bytes, size_t alignment) { } static char* shmat_at_address(int shmid, char* req_addr) { diff --git a/packages/openjdk-21/0029-libjava-change-return-type-of-strerror_r.patch b/packages/openjdk-21/0029-libjava-change-return-type-of-strerror_r.patch index 4e27e53c2f9f908..d3a733085c8679b 100644 --- a/packages/openjdk-21/0029-libjava-change-return-type-of-strerror_r.patch +++ b/packages/openjdk-21/0029-libjava-change-return-type-of-strerror_r.patch @@ -1,4 +1,4 @@ -From 835395bc6a168a7740dd9254e5fbf991ec85da8f Mon Sep 17 00:00:00 2001 +From 2f849720c3122bbd9fa001b0d3787264d8945e97 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 5 Feb 2023 11:47:24 +0100 Subject: [PATCH 29/40] libjava: change return type of strerror_r diff --git a/packages/openjdk-21/0030-make-cflags-handle-arm-like-other-arches.patch b/packages/openjdk-21/0030-make-cflags-handle-arm-like-other-arches.patch index c9d9b8d502fc80e..ebec13b29491e31 100644 --- a/packages/openjdk-21/0030-make-cflags-handle-arm-like-other-arches.patch +++ b/packages/openjdk-21/0030-make-cflags-handle-arm-like-other-arches.patch @@ -1,4 +1,4 @@ -From e179561dfc899e3382615a2924c625f23167ab98 Mon Sep 17 00:00:00 2001 +From 492a8b79968b458dd6cc465efae56aa982efa849 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Mon, 13 Feb 2023 13:49:47 +0100 Subject: [PATCH 30/40] make: cflags: handle arm like other arches diff --git a/packages/openjdk-21/0031-Fix-bugs-in-File.getCanonicalPath.patch b/packages/openjdk-21/0031-Fix-bugs-in-File.getCanonicalPath.patch index 162c295bc2edafa..e49e3f7c35ab770 100644 --- a/packages/openjdk-21/0031-Fix-bugs-in-File.getCanonicalPath.patch +++ b/packages/openjdk-21/0031-Fix-bugs-in-File.getCanonicalPath.patch @@ -1,4 +1,4 @@ -From 9ed63fd98dc899a26a4c2596dab529e7ecdee3b5 Mon Sep 17 00:00:00 2001 +From 79acb84720ee3ac0492561ba62a8d4b1171686e6 Mon Sep 17 00:00:00 2001 From: agnostic-apollo Date: Thu, 28 Mar 2024 18:46:02 +0100 Subject: [PATCH 31/40] Fix bugs in File.getCanonicalPath() diff --git a/packages/openjdk-21/0034-make-autoconf-define-ARM-for-arm-build-with-clang.patch b/packages/openjdk-21/0034-make-autoconf-define-ARM-for-arm-build-with-clang.patch index 59628a6c8b860f8..07092c63dadff32 100644 --- a/packages/openjdk-21/0034-make-autoconf-define-ARM-for-arm-build-with-clang.patch +++ b/packages/openjdk-21/0034-make-autoconf-define-ARM-for-arm-build-with-clang.patch @@ -1,4 +1,4 @@ -From 604aaa784100fdf5232ca128dc24867a78002287 Mon Sep 17 00:00:00 2001 +From a27b848e79fce07b35e927544d964d57ac1e583d Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 31 Mar 2024 12:02:51 +0200 Subject: [PATCH 34/40] make: autoconf: define ARM for arm build with clang diff --git a/packages/openjdk-21/0035-hotspot-os_linux-do-not-use-dlinfo-and-RTLD_DI_LINKM.patch b/packages/openjdk-21/0035-hotspot-os_linux-do-not-use-dlinfo-and-RTLD_DI_LINKM.patch index afb3ceb5c6ad3d2..afae947c6fe4c26 100644 --- a/packages/openjdk-21/0035-hotspot-os_linux-do-not-use-dlinfo-and-RTLD_DI_LINKM.patch +++ b/packages/openjdk-21/0035-hotspot-os_linux-do-not-use-dlinfo-and-RTLD_DI_LINKM.patch @@ -1,4 +1,4 @@ -From e51f4b12c11505f48a783f91b6d3680f5215e1ad Mon Sep 17 00:00:00 2001 +From 90ce2d21d76393fb385d8823eb2473e112e20ed1 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 31 Mar 2024 20:20:05 +0200 Subject: [PATCH 35/40] hotspot: os_linux: do not use dlinfo and @@ -10,10 +10,10 @@ As they are not available. 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp -index f41a83ebeba..190df2e87ab 100644 +index e1e82503e46..1f378c87c95 100644 --- a/src/hotspot/os/linux/os_linux.cpp +++ b/src/hotspot/os/linux/os_linux.cpp -@@ -1935,11 +1935,12 @@ const char* os::Linux::dll_path(void* lib) { +@@ -1933,11 +1933,12 @@ const char* os::Linux::dll_path(void* lib) { struct link_map *lmap; const char* l_path = nullptr; assert(lib != nullptr, "dll_path parameter must not be null"); diff --git a/packages/openjdk-21/0036-OUTTREE-bionic-type-redef-fix.patch b/packages/openjdk-21/0036-OUTTREE-bionic-type-redef-fix.patch index cbadbd6710a3d61..7fc5997f8f7f85f 100644 --- a/packages/openjdk-21/0036-OUTTREE-bionic-type-redef-fix.patch +++ b/packages/openjdk-21/0036-OUTTREE-bionic-type-redef-fix.patch @@ -1,4 +1,4 @@ -From 369eef576b1ad157d613ce4bab7d1779f60f4d04 Mon Sep 17 00:00:00 2001 +From 8af2360f4c09afc7a2899f93391cd75ecd8e2b75 Mon Sep 17 00:00:00 2001 From: Robert Kirkman <31490854+robertkirkman@users.noreply.github.com> Date: Fri, 11 Jul 2025 14:40:58 +0800 Subject: [PATCH 36/40] OUTTREE bionic type redef fix diff --git a/packages/openjdk-21/0037-Fix-hardcoded-paths-in-jdk.attach.patch b/packages/openjdk-21/0037-Fix-hardcoded-paths-in-jdk.attach.patch index 8ff90c52b4410f2..e95b7eb6dc42064 100644 --- a/packages/openjdk-21/0037-Fix-hardcoded-paths-in-jdk.attach.patch +++ b/packages/openjdk-21/0037-Fix-hardcoded-paths-in-jdk.attach.patch @@ -1,4 +1,4 @@ -From 3227daf62ac28c14287d9ec7a7e3f0a21a261024 Mon Sep 17 00:00:00 2001 +From 047906b5d6f33a04a550e87b6287ecb36b343846 Mon Sep 17 00:00:00 2001 From: Chongyun Lee <45286352+licy183@users.noreply.github.com> Date: Tue, 3 Sep 2024 12:34:31 +0800 Subject: [PATCH 37/40] Fix: hardcoded paths in jdk.attach diff --git a/packages/openjdk-21/0038-Do-not-disable-new-dtags.patch b/packages/openjdk-21/0038-Do-not-disable-new-dtags.patch index 9a2802babdaed3b..f54a1360ef68e24 100644 --- a/packages/openjdk-21/0038-Do-not-disable-new-dtags.patch +++ b/packages/openjdk-21/0038-Do-not-disable-new-dtags.patch @@ -1,4 +1,4 @@ -From 9a3d9e8417f1f2dc0c2d84d714c91423eb91a441 Mon Sep 17 00:00:00 2001 +From 983c835c3333bba70e0d99be9e074f0c6575a0e7 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Fri, 11 Jul 2025 14:51:08 +0800 Subject: [PATCH 38/40] Do not disable new dtags diff --git a/packages/openjdk-21/0039-disable-statx-syscall.patch b/packages/openjdk-21/0039-disable-statx-syscall.patch index d73a0320506fd64..e909aef4479f7d0 100644 --- a/packages/openjdk-21/0039-disable-statx-syscall.patch +++ b/packages/openjdk-21/0039-disable-statx-syscall.patch @@ -1,8 +1,17 @@ -From f97ac55d7949045c6ec39195ade04cf2cba4d709 Mon Sep 17 00:00:00 2001 +From 914124d7ad97d2654932a8febc794bea7d6d4682 Mon Sep 17 00:00:00 2001 From: Robert Kirkman <31490854+robertkirkman@users.noreply.github.com> Date: Fri, 11 Jul 2025 14:52:14 +0800 Subject: [PATCH 39/40] disable statx syscall +This turns off dynamically loading the statx() symbol, which has the +same effect as reverting +https://github.com/openjdk/jdk21u/commit/4cf572e3b99b675418e456e7815fb6fd79245e30 +, +which was fixing https://bugs.openjdk.org/browse/JDK-8316304 , +because on some devices, for some reason it causes launching any JAR to +crash the Java runtime. + +Fixes https://github.com/termux/termux-packages/issues/24651 --- src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/openjdk-21/0040-android-Prevent-build-of-libsaproc.patch b/packages/openjdk-21/0040-android-Prevent-build-of-libsaproc.patch index 0973301f5205ac9..feb23069fc4e5cf 100644 --- a/packages/openjdk-21/0040-android-Prevent-build-of-libsaproc.patch +++ b/packages/openjdk-21/0040-android-Prevent-build-of-libsaproc.patch @@ -1,4 +1,4 @@ -From 2602cf58d57f40db090634be92380cb6f32cc038 Mon Sep 17 00:00:00 2001 +From d5ef1bde4b2e76a5f59498da5850332b2c54fb21 Mon Sep 17 00:00:00 2001 From: alexytomi <60690056+alexytomi@users.noreply.github.com> Date: Fri, 11 Jul 2025 15:50:21 +0800 Subject: [PATCH 40/40] android: Prevent build of libsaproc From 60d110cbed820418e684b0061d5cd15119b2ad7c Mon Sep 17 00:00:00 2001 From: alexytomi <60690056+alexytomi@users.noreply.github.com> Date: Mon, 21 Jul 2025 16:52:44 +0800 Subject: [PATCH 9/9] fix(openjdk-17): Readd deleted comments to commit message Also regenerates for 17.0.16-ga --- ...01-libinet-include-netinet-in.h-for-android-builds.patch | 2 +- .../0002-os_linux-add-android-checks-and-fixes.patch | 2 +- .../0003-Define-sys-gettid-on-arm-and-aarch64.patch | 2 +- ...004-Disable-posix-print-uptime-overridden-by-linux.patch | 4 ++-- packages/openjdk-17/0005-Link-against-system-libiconv.patch | 6 +++--- .../0006-aarch64_get_thread_helper-Thread-current.patch | 2 +- .../openjdk-17/0007-Remove-aarch64_get_thread_helper.patch | 2 +- packages/openjdk-17/0008-Use-Android-s-strerror_r.patch | 2 +- packages/openjdk-17/0009-Use-utimensat-on-android.patch | 2 +- ...Fixed-Java_sun_nio_fs_UnixNativeDispatcher_futimes.patch | 2 +- .../openjdk-17/0011-Add-CXXFLAGS_JDKLIB-to-CXXFLAGS.patch | 4 ++-- packages/openjdk-17/0012-Use-ASCII-codeset-on-android.patch | 2 +- .../0013-Fix-libjvm.so-path-when-run-from-Android-app.patch | 2 +- .../0014-arm-cast-address-to-char-when-clearing-cache.patch | 2 +- ...Don-t-run-fpu_control-related-functions-on-Android.patch | 2 +- ...bfontmanager-link-against-libawt-to-fix-link-error.patch | 4 ++-- ...y-to-get-libjvm.so-path-from-proc-self-maps-on-and.patch | 2 +- ...Warn-instead-of-exiting-if-getcpu-2-is-unsupported.patch | 2 +- packages/openjdk-17/0019-Remove-pre-UAL-aliases.patch | 2 +- .../0020-arm-fix-assembly-in-os_linux_arm.cpp.patch | 2 +- ...1-Add-workaround-for-tagged-pointers-on-Android-12.patch | 2 +- packages/openjdk-17/0022-x86-always-compile-with-PIC.patch | 2 +- .../openjdk-17/0023-Fix-StackOverflowError-on-ARM.patch | 2 +- ...0024-android-dlvsym-is-available-if-ANDROID_API-24.patch | 2 +- .../0025-Update-hardcoded-paths-to-work-in-termux.patch | 2 +- ...fFile.hpp-no-need-to-define-ELF-32-64-_ST_TYPE-on-.patch | 2 +- ...os-linux-add-getloadavg-implementation-for-android.patch | 2 +- .../0028-os-linux-use-getpagesize-instad-of-SHMLBA.patch | 2 +- .../0029-libjava-change-return-type-of-strerror_r.patch | 2 +- .../0030-make-cflags-handle-arm-like-other-arches.patch | 2 +- .../openjdk-17/0031-Fix-bugs-in-File.getCanonicalPath.patch | 2 +- ...mMapfile.gmk-filter-same-symbols-for-linux-and-and.patch | 5 ++++- packages/openjdk-17/0033-Fix-build-with-lld-17.patch | 5 ++++- ...move-sysThreadAvailableStackWithSlack-from-hotspot.patch | 2 +- ...tspot-os_linux-do-not-use-dlinfo-and-RTLD_DI_LINKM.patch | 2 +- .../openjdk-17/0036-OUTTREE-bionic-type-redef-fix.patch | 2 +- .../openjdk-17/0037-Fix-hardcoded-paths-in-jdk.attach.patch | 2 +- packages/openjdk-17/0038-Do-not-disable-new-dtags.patch | 2 +- packages/openjdk-17/0039-disable-statx-syscall.patch | 2 +- ...-make-autoconf-define-ARM-for-arm-build-with-clang.patch | 2 +- .../0041-android-Prevent-build-of-libsaproc.patch | 2 +- 41 files changed, 52 insertions(+), 46 deletions(-) diff --git a/packages/openjdk-17/0001-libinet-include-netinet-in.h-for-android-builds.patch b/packages/openjdk-17/0001-libinet-include-netinet-in.h-for-android-builds.patch index 5fb65a53759de25..229b84dd08dbe36 100644 --- a/packages/openjdk-17/0001-libinet-include-netinet-in.h-for-android-builds.patch +++ b/packages/openjdk-17/0001-libinet-include-netinet-in.h-for-android-builds.patch @@ -1,4 +1,4 @@ -From e159d599b5b615e91f87d1f5a603166fbf700e70 Mon Sep 17 00:00:00 2001 +From cb10ccc87c6a1b082214cf808157dfb88c2e7cba Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 31 Mar 2024 16:31:48 +0200 Subject: [PATCH 01/41] libinet: include netinet/in.h for android builds diff --git a/packages/openjdk-17/0002-os_linux-add-android-checks-and-fixes.patch b/packages/openjdk-17/0002-os_linux-add-android-checks-and-fixes.patch index 52815179c252054..56a90102b67929d 100644 --- a/packages/openjdk-17/0002-os_linux-add-android-checks-and-fixes.patch +++ b/packages/openjdk-17/0002-os_linux-add-android-checks-and-fixes.patch @@ -1,4 +1,4 @@ -From c4e6f2727bcfa54e53a5363a882005d2cc6e13ac Mon Sep 17 00:00:00 2001 +From 3250d39d75058736f8a0e27460cbd1358629b0af Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Sun, 6 Jun 2021 20:11:11 +0700 Subject: [PATCH 02/41] os_linux: add android checks and fixes diff --git a/packages/openjdk-17/0003-Define-sys-gettid-on-arm-and-aarch64.patch b/packages/openjdk-17/0003-Define-sys-gettid-on-arm-and-aarch64.patch index 12ee9e013e6020b..78fee19547ab27b 100644 --- a/packages/openjdk-17/0003-Define-sys-gettid-on-arm-and-aarch64.patch +++ b/packages/openjdk-17/0003-Define-sys-gettid-on-arm-and-aarch64.patch @@ -1,4 +1,4 @@ -From fa6e4295cba4a221b54eb3e5081959fae1385b21 Mon Sep 17 00:00:00 2001 +From 52f07eb0a8759a654f0edc6ee28713aebef62e76 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Mon, 7 Jun 2021 06:27:26 +0700 Subject: [PATCH 03/41] Define sys gettid on arm and aarch64 diff --git a/packages/openjdk-17/0004-Disable-posix-print-uptime-overridden-by-linux.patch b/packages/openjdk-17/0004-Disable-posix-print-uptime-overridden-by-linux.patch index cac8ad92c205d87..48f2c9ddf144b7c 100644 --- a/packages/openjdk-17/0004-Disable-posix-print-uptime-overridden-by-linux.patch +++ b/packages/openjdk-17/0004-Disable-posix-print-uptime-overridden-by-linux.patch @@ -1,4 +1,4 @@ -From bc3d635d272b42d2828ad466eb265239b812efb4 Mon Sep 17 00:00:00 2001 +From d0fbee557152c1e80c8ed0de5b7e46d5fd5ef8c9 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Mon, 7 Jun 2021 08:05:09 +0700 Subject: [PATCH 04/41] Disable posix print uptime (overridden by linux!) @@ -8,7 +8,7 @@ Subject: [PATCH 04/41] Disable posix print uptime (overridden by linux!) 1 file changed, 4 insertions(+) diff --git a/src/hotspot/os/posix/os_posix.cpp b/src/hotspot/os/posix/os_posix.cpp -index 4307a189edf..64c512255a5 100644 +index 1561f50fba7..844a3b2d5f9 100644 --- a/src/hotspot/os/posix/os_posix.cpp +++ b/src/hotspot/os/posix/os_posix.cpp @@ -67,7 +67,9 @@ diff --git a/packages/openjdk-17/0005-Link-against-system-libiconv.patch b/packages/openjdk-17/0005-Link-against-system-libiconv.patch index b2cda8091c563ed..352d03858d66675 100644 --- a/packages/openjdk-17/0005-Link-against-system-libiconv.patch +++ b/packages/openjdk-17/0005-Link-against-system-libiconv.patch @@ -1,4 +1,4 @@ -From 7ed4e2516cef61dcdba85d76473aadc2319e2b4e Mon Sep 17 00:00:00 2001 +From efc25729a65746fcfa206a82196c90a6031df8f5 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Fri, 3 Feb 2023 11:09:10 +0100 Subject: [PATCH 05/41] Link against system libiconv @@ -22,10 +22,10 @@ index 3996ad21386..727f312da92 100644 LIBS_macosx := -ljli -liconv -framework Cocoa -framework Security \ -framework ApplicationServices, \ diff --git a/make/modules/jdk.jdwp.agent/Lib.gmk b/make/modules/jdk.jdwp.agent/Lib.gmk -index aef358c14bd..fbc1750bc58 100644 +index 0a041fed9c8..9db8c4e5487 100644 --- a/make/modules/jdk.jdwp.agent/Lib.gmk +++ b/make/modules/jdk.jdwp.agent/Lib.gmk -@@ -61,7 +61,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJDWP, \ +@@ -62,7 +62,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJDWP, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ LIBS := $(JDKLIB_LIBS), \ diff --git a/packages/openjdk-17/0006-aarch64_get_thread_helper-Thread-current.patch b/packages/openjdk-17/0006-aarch64_get_thread_helper-Thread-current.patch index c16fa66b5b774e2..ccb5d3f37da994c 100644 --- a/packages/openjdk-17/0006-aarch64_get_thread_helper-Thread-current.patch +++ b/packages/openjdk-17/0006-aarch64_get_thread_helper-Thread-current.patch @@ -1,4 +1,4 @@ -From 95061a1046ab1e8b475207e5d5170fe4308a2952 Mon Sep 17 00:00:00 2001 +From f764c59c37204af097f7f9b040cdda2caeda82ae Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Thu, 10 Jun 2021 08:45:16 +0700 Subject: [PATCH 06/41] aarch64_get_thread_helper() -> Thread::current() diff --git a/packages/openjdk-17/0007-Remove-aarch64_get_thread_helper.patch b/packages/openjdk-17/0007-Remove-aarch64_get_thread_helper.patch index 1b5d5af037796fe..310139273fd052f 100644 --- a/packages/openjdk-17/0007-Remove-aarch64_get_thread_helper.patch +++ b/packages/openjdk-17/0007-Remove-aarch64_get_thread_helper.patch @@ -1,4 +1,4 @@ -From 95f6e35422483d68a1ee4755f477be4fd0f70f03 Mon Sep 17 00:00:00 2001 +From d1f6eff24470ab1c5c70bacea042e9d78a2ef6aa Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Thu, 10 Jun 2021 08:46:35 +0700 Subject: [PATCH 07/41] Remove aarch64_get_thread_helper() diff --git a/packages/openjdk-17/0008-Use-Android-s-strerror_r.patch b/packages/openjdk-17/0008-Use-Android-s-strerror_r.patch index 652adb081153349..cbfdbc3e2b9b24f 100644 --- a/packages/openjdk-17/0008-Use-Android-s-strerror_r.patch +++ b/packages/openjdk-17/0008-Use-Android-s-strerror_r.patch @@ -1,4 +1,4 @@ -From b26089a1468383af956dac35c8385dae405d0c3b Mon Sep 17 00:00:00 2001 +From 97a9008bd6710cb48c51afdb2788f6283a7d905c Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Thu, 10 Jun 2021 09:36:26 +0700 Subject: [PATCH 08/41] Use Android's strerror_r() diff --git a/packages/openjdk-17/0009-Use-utimensat-on-android.patch b/packages/openjdk-17/0009-Use-utimensat-on-android.patch index 391a48876821c90..28443324b8725f5 100644 --- a/packages/openjdk-17/0009-Use-utimensat-on-android.patch +++ b/packages/openjdk-17/0009-Use-utimensat-on-android.patch @@ -1,4 +1,4 @@ -From 5b950bcf5af029ef6c272c33f8f28114306a05cf Mon Sep 17 00:00:00 2001 +From 9c13a7933750d370c3804e995aa286eebceb705b Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Thu, 10 Jun 2021 16:42:56 +0700 Subject: [PATCH 09/41] Use utimensat on android diff --git a/packages/openjdk-17/0010-Fixed-Java_sun_nio_fs_UnixNativeDispatcher_futimes.patch b/packages/openjdk-17/0010-Fixed-Java_sun_nio_fs_UnixNativeDispatcher_futimes.patch index 3efb77ce5af4673..bc382e0426128e4 100644 --- a/packages/openjdk-17/0010-Fixed-Java_sun_nio_fs_UnixNativeDispatcher_futimes.patch +++ b/packages/openjdk-17/0010-Fixed-Java_sun_nio_fs_UnixNativeDispatcher_futimes.patch @@ -1,4 +1,4 @@ -From dd22bff9df3fa0e5c7742fe55a7444206eb3230f Mon Sep 17 00:00:00 2001 +From dccc71da9d0e60124ebf86dc13015a47995e68f9 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Thu, 10 Jun 2021 18:36:56 +0700 Subject: [PATCH 10/41] Fixed Java_sun_nio_fs_UnixNativeDispatcher_futimes diff --git a/packages/openjdk-17/0011-Add-CXXFLAGS_JDKLIB-to-CXXFLAGS.patch b/packages/openjdk-17/0011-Add-CXXFLAGS_JDKLIB-to-CXXFLAGS.patch index a8082dac1f5d5d8..f1963aa1fc59600 100644 --- a/packages/openjdk-17/0011-Add-CXXFLAGS_JDKLIB-to-CXXFLAGS.patch +++ b/packages/openjdk-17/0011-Add-CXXFLAGS_JDKLIB-to-CXXFLAGS.patch @@ -1,4 +1,4 @@ -From 5d8b5a25ee9d786b8a8829ded18a2efa98a558f3 Mon Sep 17 00:00:00 2001 +From cfc70476b73a888d835fe16078221fa7df9046c0 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Thu, 10 Jun 2021 19:23:03 +0700 Subject: [PATCH 11/41] Add CXXFLAGS_JDKLIB to CXXFLAGS @@ -22,7 +22,7 @@ index 727f312da92..dd9bebe2e04 100644 EXTRA_HEADER_DIRS := java.base:libjli, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ diff --git a/make/modules/jdk.jdwp.agent/Lib.gmk b/make/modules/jdk.jdwp.agent/Lib.gmk -index fbc1750bc58..7ba77268ae1 100644 +index 9db8c4e5487..0e9e7a4c7bb 100644 --- a/make/modules/jdk.jdwp.agent/Lib.gmk +++ b/make/modules/jdk.jdwp.agent/Lib.gmk @@ -52,6 +52,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJDWP, \ diff --git a/packages/openjdk-17/0012-Use-ASCII-codeset-on-android.patch b/packages/openjdk-17/0012-Use-ASCII-codeset-on-android.patch index 40647b9cb9dd3f0..8368ec7de52cc9f 100644 --- a/packages/openjdk-17/0012-Use-ASCII-codeset-on-android.patch +++ b/packages/openjdk-17/0012-Use-ASCII-codeset-on-android.patch @@ -1,4 +1,4 @@ -From 0efc724f95719cb1f00511195946aeb9b1d5445a Mon Sep 17 00:00:00 2001 +From 84d2774fad890cd44834071605ee58d46052b68e Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Thu, 10 Jun 2021 20:42:40 +0700 Subject: [PATCH 12/41] Use ASCII codeset on android diff --git a/packages/openjdk-17/0013-Fix-libjvm.so-path-when-run-from-Android-app.patch b/packages/openjdk-17/0013-Fix-libjvm.so-path-when-run-from-Android-app.patch index 050fa2e368e6c88..2c6102452f43755 100644 --- a/packages/openjdk-17/0013-Fix-libjvm.so-path-when-run-from-Android-app.patch +++ b/packages/openjdk-17/0013-Fix-libjvm.so-path-when-run-from-Android-app.patch @@ -1,4 +1,4 @@ -From 7576c333056a336be9a348fa58be76338994c582 Mon Sep 17 00:00:00 2001 +From 1520b468ac903d44c2284bbb1034f19be1f105dd Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Fri, 11 Jun 2021 07:48:28 +0700 Subject: [PATCH 13/41] Fix libjvm.so path when run from Android app diff --git a/packages/openjdk-17/0014-arm-cast-address-to-char-when-clearing-cache.patch b/packages/openjdk-17/0014-arm-cast-address-to-char-when-clearing-cache.patch index dabae3bdc2cbd2b..55646eb022d5795 100644 --- a/packages/openjdk-17/0014-arm-cast-address-to-char-when-clearing-cache.patch +++ b/packages/openjdk-17/0014-arm-cast-address-to-char-when-clearing-cache.patch @@ -1,4 +1,4 @@ -From f35176d756d2690abda9c06d66048363b79a5fd7 Mon Sep 17 00:00:00 2001 +From f85020388eacf5bd3b96b7e2455c25891d37dd90 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Sat, 12 Jun 2021 06:55:18 +0700 Subject: [PATCH 14/41] arm: cast address to char when clearing cache diff --git a/packages/openjdk-17/0015-Don-t-run-fpu_control-related-functions-on-Android.patch b/packages/openjdk-17/0015-Don-t-run-fpu_control-related-functions-on-Android.patch index 1a97db34168cf47..f875272b249afeb 100644 --- a/packages/openjdk-17/0015-Don-t-run-fpu_control-related-functions-on-Android.patch +++ b/packages/openjdk-17/0015-Don-t-run-fpu_control-related-functions-on-Android.patch @@ -1,4 +1,4 @@ -From 3fa6ceb5bb225002dc443c21cac2113653a6e2f3 Mon Sep 17 00:00:00 2001 +From 8160ad4e3e301914091a31db4fb2cd75af766cb9 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Sat, 12 Jun 2021 06:58:20 +0700 Subject: [PATCH 15/41] Don't run fpu_control related functions on Android diff --git a/packages/openjdk-17/0016-Libfontmanager-link-against-libawt-to-fix-link-error.patch b/packages/openjdk-17/0016-Libfontmanager-link-against-libawt-to-fix-link-error.patch index 05c40b45828818d..002e3650fcdf0ca 100644 --- a/packages/openjdk-17/0016-Libfontmanager-link-against-libawt-to-fix-link-error.patch +++ b/packages/openjdk-17/0016-Libfontmanager-link-against-libawt-to-fix-link-error.patch @@ -1,4 +1,4 @@ -From a71a157259c0871a800a5e2dd907e069641bc6c6 Mon Sep 17 00:00:00 2001 +From a0205205eecd21a6c49468636b9e7bdf7348f15b Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Sat, 12 Jun 2021 17:03:05 +0700 Subject: [PATCH 16/41] Libfontmanager: link against libawt to fix link error @@ -10,7 +10,7 @@ https://github.com/androidports/openjdk/commit/a3e4f0281154537f01c2e59286a6ceed9 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/make/modules/java.desktop/lib/Awt2dLibraries.gmk b/make/modules/java.desktop/lib/Awt2dLibraries.gmk -index bf6a987149a..0b93c50a190 100644 +index 5b92445774d..b4e055f4ca3 100644 --- a/make/modules/java.desktop/lib/Awt2dLibraries.gmk +++ b/make/modules/java.desktop/lib/Awt2dLibraries.gmk @@ -554,13 +554,13 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBFONTMANAGER, \ diff --git a/packages/openjdk-17/0017-Try-to-get-libjvm.so-path-from-proc-self-maps-on-and.patch b/packages/openjdk-17/0017-Try-to-get-libjvm.so-path-from-proc-self-maps-on-and.patch index 3185af45b76f305..59dae7e99a43854 100644 --- a/packages/openjdk-17/0017-Try-to-get-libjvm.so-path-from-proc-self-maps-on-and.patch +++ b/packages/openjdk-17/0017-Try-to-get-libjvm.so-path-from-proc-self-maps-on-and.patch @@ -1,4 +1,4 @@ -From 3227444a86a8a0b5cb41a4ab1cd2f10da803f89f Mon Sep 17 00:00:00 2001 +From 0b2ae9df5b743e8c04a38e5e74815b78bcc7b5ea Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Fri, 25 Jun 2021 17:19:24 +0700 Subject: [PATCH 17/41] Try to get libjvm.so path from /proc/self/maps on diff --git a/packages/openjdk-17/0018-Warn-instead-of-exiting-if-getcpu-2-is-unsupported.patch b/packages/openjdk-17/0018-Warn-instead-of-exiting-if-getcpu-2-is-unsupported.patch index 169e11ad385b6ff..32e27d8cae3a048 100644 --- a/packages/openjdk-17/0018-Warn-instead-of-exiting-if-getcpu-2-is-unsupported.patch +++ b/packages/openjdk-17/0018-Warn-instead-of-exiting-if-getcpu-2-is-unsupported.patch @@ -1,4 +1,4 @@ -From c5f533ed4d2752a86b68e8e180b8bd9d807c55d4 Mon Sep 17 00:00:00 2001 +From ad201e092384d9dea00bdc8d7e0e0338c0da15ff Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Mon, 28 Jun 2021 17:47:31 +0700 Subject: [PATCH 18/41] Warn instead of exiting if getcpu(2) is unsupported diff --git a/packages/openjdk-17/0019-Remove-pre-UAL-aliases.patch b/packages/openjdk-17/0019-Remove-pre-UAL-aliases.patch index affb31237432f27..2c9d96ade26dfe7 100644 --- a/packages/openjdk-17/0019-Remove-pre-UAL-aliases.patch +++ b/packages/openjdk-17/0019-Remove-pre-UAL-aliases.patch @@ -1,4 +1,4 @@ -From 3e7843504e1ca0d380698478b0185c7f1223670f Mon Sep 17 00:00:00 2001 +From a74a5441d02ca1a84dd1e797d00b5fdcc6ed61ad Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Wed, 30 Jun 2021 14:28:14 +0700 Subject: [PATCH 19/41] Remove pre-UAL aliases diff --git a/packages/openjdk-17/0020-arm-fix-assembly-in-os_linux_arm.cpp.patch b/packages/openjdk-17/0020-arm-fix-assembly-in-os_linux_arm.cpp.patch index b901727d2562e97..656f1b492725003 100644 --- a/packages/openjdk-17/0020-arm-fix-assembly-in-os_linux_arm.cpp.patch +++ b/packages/openjdk-17/0020-arm-fix-assembly-in-os_linux_arm.cpp.patch @@ -1,4 +1,4 @@ -From dba2008432906ce268b6a9b1841847ee60c2c1a6 Mon Sep 17 00:00:00 2001 +From e6fbd5f4c0fb264c09fb2e5d1b3778540def0eb8 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Wed, 30 Jun 2021 14:30:02 +0700 Subject: [PATCH 20/41] arm: fix assembly in os_linux_arm.cpp diff --git a/packages/openjdk-17/0021-Add-workaround-for-tagged-pointers-on-Android-12.patch b/packages/openjdk-17/0021-Add-workaround-for-tagged-pointers-on-Android-12.patch index 109f00ceb9d2319..313612419a6f766 100644 --- a/packages/openjdk-17/0021-Add-workaround-for-tagged-pointers-on-Android-12.patch +++ b/packages/openjdk-17/0021-Add-workaround-for-tagged-pointers-on-Android-12.patch @@ -1,4 +1,4 @@ -From 6e8318292b09888b257e5a52319ffd0d5a515b9e Mon Sep 17 00:00:00 2001 +From 2260a0aff913475063919b7a09ffd039b5ba1f93 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Fri, 3 Feb 2023 11:32:40 +0100 Subject: [PATCH 21/41] Add workaround for tagged pointers on Android 12 diff --git a/packages/openjdk-17/0022-x86-always-compile-with-PIC.patch b/packages/openjdk-17/0022-x86-always-compile-with-PIC.patch index a8532e7aa41c0c5..a8d39b16c6e14bd 100644 --- a/packages/openjdk-17/0022-x86-always-compile-with-PIC.patch +++ b/packages/openjdk-17/0022-x86-always-compile-with-PIC.patch @@ -1,4 +1,4 @@ -From 23fb4606ea222d88bec1a05403782d3cc6ed68b8 Mon Sep 17 00:00:00 2001 +From be891506c1307e91e93bbaaaa6b4d0339bab15f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BA=AF=E6=B4=84?= <1840686745@qq.com> Date: Thu, 26 Aug 2021 14:00:54 +0800 Subject: [PATCH 22/41] x86: always compile with PIC diff --git a/packages/openjdk-17/0023-Fix-StackOverflowError-on-ARM.patch b/packages/openjdk-17/0023-Fix-StackOverflowError-on-ARM.patch index 6fa074393025fea..1ee501b77bd9fda 100644 --- a/packages/openjdk-17/0023-Fix-StackOverflowError-on-ARM.patch +++ b/packages/openjdk-17/0023-Fix-StackOverflowError-on-ARM.patch @@ -1,4 +1,4 @@ -From 55ea2917b92b449e8b58b96a8e2226410dd99f33 Mon Sep 17 00:00:00 2001 +From 567ea15f0cd46cd30c1ac92c405882b3f1a3560a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BA=AF=E6=B4=84?= <1840686745@qq.com> Date: Thu, 26 Aug 2021 03:53:25 +0800 Subject: [PATCH 23/41] Fix StackOverflowError on ARM diff --git a/packages/openjdk-17/0024-android-dlvsym-is-available-if-ANDROID_API-24.patch b/packages/openjdk-17/0024-android-dlvsym-is-available-if-ANDROID_API-24.patch index b08a4ab8698801d..b7ad6c13f2df6a0 100644 --- a/packages/openjdk-17/0024-android-dlvsym-is-available-if-ANDROID_API-24.patch +++ b/packages/openjdk-17/0024-android-dlvsym-is-available-if-ANDROID_API-24.patch @@ -1,4 +1,4 @@ -From 4ce61a119ae4f8b5011abc16f029da95dcb07cbd Mon Sep 17 00:00:00 2001 +From 53ece631f4abe7cf4a1962443ed7783853737ecf Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Fri, 3 Feb 2023 11:50:57 +0100 Subject: [PATCH 24/41] android: dlvsym is available if ANDROID_API >= 24 diff --git a/packages/openjdk-17/0025-Update-hardcoded-paths-to-work-in-termux.patch b/packages/openjdk-17/0025-Update-hardcoded-paths-to-work-in-termux.patch index 29292c54b33d73b..0251f34358986de 100644 --- a/packages/openjdk-17/0025-Update-hardcoded-paths-to-work-in-termux.patch +++ b/packages/openjdk-17/0025-Update-hardcoded-paths-to-work-in-termux.patch @@ -1,4 +1,4 @@ -From c56021794ceda956e362e5f709adaf72a7c5d0bf Mon Sep 17 00:00:00 2001 +From 9628bc5bd805dc5c5bfc8fcb600173c8b53886f6 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Tue, 6 Jul 2021 18:29:24 +0700 Subject: [PATCH 25/41] Update hardcoded paths to work in termux diff --git a/packages/openjdk-17/0026-elfFile.hpp-no-need-to-define-ELF-32-64-_ST_TYPE-on-.patch b/packages/openjdk-17/0026-elfFile.hpp-no-need-to-define-ELF-32-64-_ST_TYPE-on-.patch index 140487116813c51..f0f985428fb39d0 100644 --- a/packages/openjdk-17/0026-elfFile.hpp-no-need-to-define-ELF-32-64-_ST_TYPE-on-.patch +++ b/packages/openjdk-17/0026-elfFile.hpp-no-need-to-define-ELF-32-64-_ST_TYPE-on-.patch @@ -1,4 +1,4 @@ -From b94b91dfd419ae771e603adf4afcd4b05a2596fc Mon Sep 17 00:00:00 2001 +From e2b1453eac09e4a94e8cef9a87a82884ac494440 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sat, 4 Feb 2023 22:45:13 +0100 Subject: [PATCH 26/41] elfFile.hpp: no need to define ELF{32,64}_ST_TYPE on diff --git a/packages/openjdk-17/0027-os-linux-add-getloadavg-implementation-for-android.patch b/packages/openjdk-17/0027-os-linux-add-getloadavg-implementation-for-android.patch index 67885219cf38a3d..d34d88ffe1fcb8d 100644 --- a/packages/openjdk-17/0027-os-linux-add-getloadavg-implementation-for-android.patch +++ b/packages/openjdk-17/0027-os-linux-add-getloadavg-implementation-for-android.patch @@ -1,4 +1,4 @@ -From 6c24cec35abb033117df274de7a2b57f598c8b6b Mon Sep 17 00:00:00 2001 +From d2ce8690239f278f0e3c90c3f8a6e3a00700692e Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 5 Feb 2023 09:14:50 +0100 Subject: [PATCH 27/41] os: linux: add getloadavg implementation for android diff --git a/packages/openjdk-17/0028-os-linux-use-getpagesize-instad-of-SHMLBA.patch b/packages/openjdk-17/0028-os-linux-use-getpagesize-instad-of-SHMLBA.patch index 41f67e96e6b3fa2..3fb2617a7bc1431 100644 --- a/packages/openjdk-17/0028-os-linux-use-getpagesize-instad-of-SHMLBA.patch +++ b/packages/openjdk-17/0028-os-linux-use-getpagesize-instad-of-SHMLBA.patch @@ -1,4 +1,4 @@ -From 5bbcd875903f7dbd7b84751af340be1584c89fba Mon Sep 17 00:00:00 2001 +From 71b7270a74253ba3568c8b845b81c0b12e17f941 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 5 Feb 2023 09:21:57 +0100 Subject: [PATCH 28/41] os: linux: use getpagesize() instad of SHMLBA diff --git a/packages/openjdk-17/0029-libjava-change-return-type-of-strerror_r.patch b/packages/openjdk-17/0029-libjava-change-return-type-of-strerror_r.patch index 12faa065250a5d5..5839865aa6f75f2 100644 --- a/packages/openjdk-17/0029-libjava-change-return-type-of-strerror_r.patch +++ b/packages/openjdk-17/0029-libjava-change-return-type-of-strerror_r.patch @@ -1,4 +1,4 @@ -From 53fcacff17eaf04d6b410d6c151f1f26a387f99f Mon Sep 17 00:00:00 2001 +From 150d2695d444c529d4a8bbc581bf65c81b134c8e Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 5 Feb 2023 11:47:24 +0100 Subject: [PATCH 29/41] libjava: change return type of strerror_r diff --git a/packages/openjdk-17/0030-make-cflags-handle-arm-like-other-arches.patch b/packages/openjdk-17/0030-make-cflags-handle-arm-like-other-arches.patch index 1aa7ebc377acb14..d2cf3b2eb02540a 100644 --- a/packages/openjdk-17/0030-make-cflags-handle-arm-like-other-arches.patch +++ b/packages/openjdk-17/0030-make-cflags-handle-arm-like-other-arches.patch @@ -1,4 +1,4 @@ -From cdc244b4bae5f0e863a5cf82d078259ec46535da Mon Sep 17 00:00:00 2001 +From 99e59513c253f8253058576294dca435ee4b4257 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Mon, 13 Feb 2023 13:49:47 +0100 Subject: [PATCH 30/41] make: cflags: handle arm like other arches diff --git a/packages/openjdk-17/0031-Fix-bugs-in-File.getCanonicalPath.patch b/packages/openjdk-17/0031-Fix-bugs-in-File.getCanonicalPath.patch index 1211c1cc33c45cd..5edfc481799c0f6 100644 --- a/packages/openjdk-17/0031-Fix-bugs-in-File.getCanonicalPath.patch +++ b/packages/openjdk-17/0031-Fix-bugs-in-File.getCanonicalPath.patch @@ -1,4 +1,4 @@ -From 35fbdc01130a9bb84d067fa3ccd81500b2624054 Mon Sep 17 00:00:00 2001 +From 581930358c016da526cc28d44f4dfcbf0a697406 Mon Sep 17 00:00:00 2001 From: agnostic-apollo Date: Thu, 28 Mar 2024 18:46:02 +0100 Subject: [PATCH 31/41] Fix bugs in File.getCanonicalPath() diff --git a/packages/openjdk-17/0032-JvmMapfile.gmk-filter-same-symbols-for-linux-and-and.patch b/packages/openjdk-17/0032-JvmMapfile.gmk-filter-same-symbols-for-linux-and-and.patch index ebd0971e8bb215f..dcca955157de476 100644 --- a/packages/openjdk-17/0032-JvmMapfile.gmk-filter-same-symbols-for-linux-and-and.patch +++ b/packages/openjdk-17/0032-JvmMapfile.gmk-filter-same-symbols-for-linux-and-and.patch @@ -1,9 +1,12 @@ -From a0570e4424b4584527be59c4d87c8b680f9749b6 Mon Sep 17 00:00:00 2001 +From 2ab32bac5188108f678033515dc5efbe925c088a Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Sat, 5 Jun 2021 17:25:37 +0700 Subject: [PATCH 32/41] JvmMapfile.gmk: filter same symbols for linux and android +# modified: +# - DUMP_SYMBOLS_CMD := $(NM) --defined-only *$(OBJ_SUFFIX) +# + DUMP_SYMBOLS_CMD := $(NM) $(NMFLAGS) --defined-only *$(OBJ_SUFFIX) --- make/hotspot/lib/JvmMapfile.gmk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/openjdk-17/0033-Fix-build-with-lld-17.patch b/packages/openjdk-17/0033-Fix-build-with-lld-17.patch index f0bdbef8d985d7a..1a6cd33669e9e84 100644 --- a/packages/openjdk-17/0033-Fix-build-with-lld-17.patch +++ b/packages/openjdk-17/0033-Fix-build-with-lld-17.patch @@ -1,4 +1,4 @@ -From 66f293bfe198bd0554e49f818a6952f039dcc647 Mon Sep 17 00:00:00 2001 +From 7694e04ecd5604eefb93912b669746a19a9da3fd Mon Sep 17 00:00:00 2001 From: agnostic-apollo Date: Thu, 28 Mar 2024 18:52:49 +0100 Subject: [PATCH 33/41] Fix build with lld 17 @@ -6,6 +6,9 @@ Subject: [PATCH 33/41] Fix build with lld 17 Original Author: Dimitry Andric https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=274109 + +# modified: see `JvmMapfile.gmk: filter same symbols for linux and +android` --- make/hotspot/lib/JvmMapfile.gmk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/openjdk-17/0034-Remove-sysThreadAvailableStackWithSlack-from-hotspot.patch b/packages/openjdk-17/0034-Remove-sysThreadAvailableStackWithSlack-from-hotspot.patch index 43b5eb0a1a53a55..95c8563ff1d8e7d 100644 --- a/packages/openjdk-17/0034-Remove-sysThreadAvailableStackWithSlack-from-hotspot.patch +++ b/packages/openjdk-17/0034-Remove-sysThreadAvailableStackWithSlack-from-hotspot.patch @@ -1,4 +1,4 @@ -From 7f5b29bf05b2d93cfdb7fc81c979ce18d7027ec4 Mon Sep 17 00:00:00 2001 +From efb5138d5fd49e214de9433f461a7d6031cd5300 Mon Sep 17 00:00:00 2001 From: agnostic-apollo Date: Thu, 28 Mar 2024 18:52:49 +0100 Subject: [PATCH 34/41] Remove sysThreadAvailableStackWithSlack from diff --git a/packages/openjdk-17/0035-hotspot-os_linux-do-not-use-dlinfo-and-RTLD_DI_LINKM.patch b/packages/openjdk-17/0035-hotspot-os_linux-do-not-use-dlinfo-and-RTLD_DI_LINKM.patch index b6f7ad6fb515467..a900511280e6ade 100644 --- a/packages/openjdk-17/0035-hotspot-os_linux-do-not-use-dlinfo-and-RTLD_DI_LINKM.patch +++ b/packages/openjdk-17/0035-hotspot-os_linux-do-not-use-dlinfo-and-RTLD_DI_LINKM.patch @@ -1,4 +1,4 @@ -From 4e70d29769f9ce717f5d1fd23a5699b5256ceffd Mon Sep 17 00:00:00 2001 +From fcd6a52b605a4e4b45dabef0a011ee751d93f322 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 31 Mar 2024 20:20:05 +0200 Subject: [PATCH 35/41] hotspot: os_linux: do not use dlinfo and diff --git a/packages/openjdk-17/0036-OUTTREE-bionic-type-redef-fix.patch b/packages/openjdk-17/0036-OUTTREE-bionic-type-redef-fix.patch index 19cde46c8fb0c9a..c330955434e13c8 100644 --- a/packages/openjdk-17/0036-OUTTREE-bionic-type-redef-fix.patch +++ b/packages/openjdk-17/0036-OUTTREE-bionic-type-redef-fix.patch @@ -1,4 +1,4 @@ -From 0447fe34f4c786baf9e73e38420473bb2f7d2e40 Mon Sep 17 00:00:00 2001 +From 9b707614f68b437f1dce8f08b843815c4b098b09 Mon Sep 17 00:00:00 2001 From: Robert Kirkman <31490854+robertkirkman@users.noreply.github.com> Date: Mon, 5 May 2025 21:07:27 -0500 Subject: [PATCH 36/41] OUTTREE bionic type redef fix diff --git a/packages/openjdk-17/0037-Fix-hardcoded-paths-in-jdk.attach.patch b/packages/openjdk-17/0037-Fix-hardcoded-paths-in-jdk.attach.patch index 9ea848441c6ffa4..68adc190cf52e24 100644 --- a/packages/openjdk-17/0037-Fix-hardcoded-paths-in-jdk.attach.patch +++ b/packages/openjdk-17/0037-Fix-hardcoded-paths-in-jdk.attach.patch @@ -1,4 +1,4 @@ -From 50a90e10e398265e316b74de2c757ab6ef203f63 Mon Sep 17 00:00:00 2001 +From 644c065232dd2d25a1d5c36a2c685cab2fcaab1f Mon Sep 17 00:00:00 2001 From: Chongyun Lee <45286352+licy183@users.noreply.github.com> Date: Tue, 3 Sep 2024 12:34:31 +0800 Subject: [PATCH 37/41] Fix: hardcoded paths in jdk.attach diff --git a/packages/openjdk-17/0038-Do-not-disable-new-dtags.patch b/packages/openjdk-17/0038-Do-not-disable-new-dtags.patch index 46163bd1b1b870b..347c10325540939 100644 --- a/packages/openjdk-17/0038-Do-not-disable-new-dtags.patch +++ b/packages/openjdk-17/0038-Do-not-disable-new-dtags.patch @@ -1,4 +1,4 @@ -From dd45dc6d8a86e123f783ff5b5b0832750813e126 Mon Sep 17 00:00:00 2001 +From dc6bb17cdfb7cf1760925b83fd0a2a912aee6cd2 Mon Sep 17 00:00:00 2001 From: Robert Kirkman <31490854+robertkirkman@users.noreply.github.com> Date: Mon, 5 May 2025 21:07:27 -0500 Subject: [PATCH 38/41] Do not disable new dtags diff --git a/packages/openjdk-17/0039-disable-statx-syscall.patch b/packages/openjdk-17/0039-disable-statx-syscall.patch index b7b33ffbd9bc2cb..9104ee748585f54 100644 --- a/packages/openjdk-17/0039-disable-statx-syscall.patch +++ b/packages/openjdk-17/0039-disable-statx-syscall.patch @@ -1,4 +1,4 @@ -From 45643433ec75f01cc23c6ca1d48ab3704c60e988 Mon Sep 17 00:00:00 2001 +From 083445fde3bff418e361166867fd3c97c2c29398 Mon Sep 17 00:00:00 2001 From: Robert Kirkman <31490854+robertkirkman@users.noreply.github.com> Date: Thu, 8 May 2025 01:47:00 -0500 Subject: [PATCH 39/41] disable statx syscall diff --git a/packages/openjdk-17/0040-make-autoconf-define-ARM-for-arm-build-with-clang.patch b/packages/openjdk-17/0040-make-autoconf-define-ARM-for-arm-build-with-clang.patch index bd2107ea102fc9a..1795393eb372570 100644 --- a/packages/openjdk-17/0040-make-autoconf-define-ARM-for-arm-build-with-clang.patch +++ b/packages/openjdk-17/0040-make-autoconf-define-ARM-for-arm-build-with-clang.patch @@ -1,4 +1,4 @@ -From 8b709a9a83755f795c0639deb37135012cce754e Mon Sep 17 00:00:00 2001 +From 80700bc10f5a1b2b184a7a0b25b8367cb4ce3555 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 31 Mar 2024 12:02:51 +0200 Subject: [PATCH 40/41] make: autoconf: define ARM for arm build with clang diff --git a/packages/openjdk-17/0041-android-Prevent-build-of-libsaproc.patch b/packages/openjdk-17/0041-android-Prevent-build-of-libsaproc.patch index 4a1a62a668da3e0..e7dfee78e43eb4d 100644 --- a/packages/openjdk-17/0041-android-Prevent-build-of-libsaproc.patch +++ b/packages/openjdk-17/0041-android-Prevent-build-of-libsaproc.patch @@ -1,4 +1,4 @@ -From 4ef9a541979b80bbf96ee5f80f628fed006ecff2 Mon Sep 17 00:00:00 2001 +From aa366976ef521258abaee49f588354c897eac08f Mon Sep 17 00:00:00 2001 From: alexytomi <60690056+alexytomi@users.noreply.github.com> Date: Mon, 21 Jul 2025 15:03:17 +0800 Subject: [PATCH 41/41] android: Prevent build of libsaproc