jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e529461bcb126e0975ffa3f86e1fd5a630551de2
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Tue Dec 22 12:55:54 2020 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Tue Jun 29 16:36:50 2021 +0200
Enable JVM also on macOS ARM64
My previous attempts of `make check` and running a --with-java build against
various Azul JDK 13--17 have always crashed with SIGBUS that smelled like
our
uses of pthread_jit_write_protect_np in
bridges/source/cpp_uno/shared/vtablefactory.cxx colided with corresponding
calls
in the in-process JVM, randomly(?) causing some attempts of running
generated
code to SIGBUS. (See the email thread starting at
<https://lists.freedesktop.org/archives/libreoffice/2020-December/086490.html>
"Using Java on macOS ARM64".)
But at least with the recent
<https://cdn.azul.com/zulu/bin/zulu17.0.63-ea-jdk17.0.0-ea.27-macosx_aarch64.zip>
on macOS 11.4, this appears to work reliably now: Multiple `make check
screenshot` as well as some manual use of LibreOffice did not run into any
such
issues.
Change-Id: I2b1327e7e877ed71420c174c1d88e68a96b3532e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118114
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
index 51d5046c203f..4f1e95fb4580 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
@@ -59,7 +59,7 @@ char const* const* SunInfo::getRuntimePaths(int * size)
"/bin/jrockit/jvm.dll",
// The 64-bit JRE has the jvm in bin/server
"/bin/server/jvm.dll"
-#elif defined MACOSX && defined X86_64
+#elif defined MACOSX
// Oracle Java 7, under /Library/Internet
Plug-Ins/JavaAppletPlugin.plugin/Contents/Home
"/lib/server/libjvm.dylib",
"/lib/jli/libjli.dylib"
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
