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 <sbergman@redhat.com>
This commit is contained in:
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user