head 1.2; access; symbols pkgsrc-2025Q3:1.1.0.2 pkgsrc-2025Q3-base:1.1; locks; strict; comment @// @; 1.2 date 2025.11.15.12.13.36; author ryoon; state dead; branches; next 1.1; commitid umEhn07ufDTu6EiG; 1.1 date 2025.08.04.13.22.06; author pho; state Exp; branches; next ; commitid hLvjvkVJi5XjNp5G; desc @@ 1.2 log @lang/openjdk11: Update to 1.11.0.29.7 Changelog: Updated BSD port of JDK 11 Additional features include: Update to 11.0.29 GA @ text @$NetBSD: patch-src_hotspot_cpu_aarch64_jniFastGetField__aarch64.cpp,v 1.1 2025/08/04 13:22:06 pho Exp $ Workaround for the Hotspot VM dying on Apple Silicon chips. See the patch to threadWXSetters.inline.hpp for details. --- src/hotspot/cpu/aarch64/jniFastGetField_aarch64.cpp.orig 2025-04-19 23:57:10.000000000 +0000 +++ src/hotspot/cpu/aarch64/jniFastGetField_aarch64.cpp @@@@ -57,8 +57,6 @@@@ static const Register result = r7 // (8262896). So each FastGetXXXField is wrapped into a C++ statically // compiled template function that optionally switches to WXExec if necessary. -#ifdef __APPLE__ - static address generated_fast_get_field[T_LONG + 1 - T_BOOLEAN]; template struct BasicTypeToJni {}; @@@@ -85,15 +83,6 @@@@ address JNI_FastGetField::generate_fast_ return (address)static_fast_get_field_wrapper; } -#else // __APPLE__ - -template -address JNI_FastGetField::generate_fast_get_int_field1() { - return generate_fast_get_int_field0((BasicType)BType); -} - -#endif // __APPLE__ - address JNI_FastGetField::generate_fast_get_int_field0(BasicType type) { const char *name; switch (type) { @ 1.1 log @lang/openjdk11: Workaround for the VM dying on Apple Silicon chips See the patch for threadWXSetters.inline.hpp for details. I rebuilt the bootkit for aarch64 with new patches applied. This may cause some performance regression on Cortex series, but as I stated in the patch comment, relying on assumptions made on implementation details of chips is fundamentally unsound, and that's why it didn't work on Apple Silicon in the first place. Also backported fixes regarding floating point arithmetics that appeared in OpenJDK 22. @ text @d1 1 a1 1 $NetBSD$ @