Skip to content

Fix darwin-aarch64 (Apple Silicon Mac) native loading #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
foontinz wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix darwin-aarch64 (Apple Silicon Mac) native loading #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions java/src/main/java/org/burningwave/jvm/util/Libraries.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,15 @@ private Libraries() {
}
String osArch = jVMInfo.osArch != null ? jVMInfo.osArch : "generic";
String operatingSystemName = jVMInfo.operatingSystemName != null ? jVMInfo.operatingSystemName.toLowerCase(Locale.ENGLISH) : "generic";
boolean isMac = (operatingSystemName.indexOf("mac") >= 0) || (operatingSystemName.indexOf("darwin") >= 0);
prefix = "lib";
if (osArch.equals("aarch64")) {
conventionedSuffix = osArch;
extension = "so";
} else if ((operatingSystemName.indexOf("mac") >= 0) || (operatingSystemName.indexOf("darwin") >= 0)) {
// On macOS the loader still needs the platform-correct extension; previously
// this branch hardcoded "so" which made aarch64 macOS fail with
// "slice is not valid mach-o file" when dlopen tried to parse a Linux ELF.
extension = isMac ? "dylib" : "so";
} else if (isMac) {
extension = "dylib";
} else if (operatingSystemName.indexOf("win") >= 0) {
prefix = null;
Expand Down
Binary file added native/bin/libNativeExecutor-aarch64.dylib
View file
Open in desktop
Binary file not shown.
26 changes: 24 additions & 2 deletions native/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@
<org.codehaus.mojo.option.gcc-compiler.flags>-O3 -fPIC</org.codehaus.mojo.option.gcc-compiler.flags>
<org.codehaus.mojo.option.gcc-linker.flags>-fPIC -shared</org.codehaus.mojo.option.gcc-linker.flags>
<org.codehaus.mojo.option.gcc-linker.artifact-name>NativeExecutor</org.codehaus.mojo.option.gcc-linker.artifact-name>
<!-- Filename arch suffix for the produced native artifact. Defaults to x32/x64 based on
sun.arch.data.model. Profiles below override this for non-x86 architectures
(e.g. mac-aarch64 sets it to "aarch64"). -->
<linker.arch.suffix>x${sun.arch.data.model}</linker.arch.suffix>
</properties>

<profiles>
Expand All @@ -63,7 +67,25 @@
<properties>
<org.codehaus.mojo.option.gcc-linker.final-name>lib${org.codehaus.mojo.option.gcc-linker.artifact-name}</org.codehaus.mojo.option.gcc-linker.final-name>
<packaging.type>dylib</packaging.type>
<org.codehaus.mojo.option.spec-include-dir-two>${java.home}/include/darwin/</org.codehaus.mojo.option.spec-include-dir-two>
<org.codehaus.mojo.option.spec-include-dir-two>${java.home}/include/darwin/</org.codehaus.mojo.option.spec-include-dir-two>
</properties>
</profile>
<profile>
<!-- Apple Silicon (arm64) macOS. Activated when the build runs on a native arm64 JVM
on macOS. Overrides the artifact filename suffix from "x64" to "aarch64" so
the resulting binary is named libNativeExecutor-aarch64.dylib instead of
libNativeExecutor-x64.dylib. The compile flags inherit from the `mac` profile;
Apple clang++ targets arm64-apple-darwin natively, no extra -arch flag needed
when running on a native arm64 JVM. -->
<id>mac-aarch64</id>
<activation>
<os>
<family>mac</family>
<arch>aarch64</arch>
</os>
</activation>
<properties>
<linker.arch.suffix>aarch64</linker.arch.suffix>
</properties>
</profile>
<profile>
Expand Down Expand Up @@ -251,7 +273,7 @@
</fileNames>
</source>
</sources>
<linkerFinalName>${org.codehaus.mojo.option.gcc-linker.final-name}-x${sun.arch.data.model}</linkerFinalName>
<linkerFinalName>${org.codehaus.mojo.option.gcc-linker.final-name}-${linker.arch.suffix}</linkerFinalName>
<linkerFinalNameExt>${packaging.type}</linkerFinalNameExt>
</configuration>
</execution>
Expand Down