From abd788e50b4a5905244dcba5f53b8383a60e1595 Mon Sep 17 00:00:00 2001
From: Dmytro Yurinov <foontinz@protonmail.com>
Date: Wed, 8 Apr 2026 18:28:44 +0200
Subject: [PATCH] Fix darwin-aarch64 (Apple Silicon Mac) native loading
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Apple Silicon Macs running native arm64 Java crash at JVM init when
loading NativeExecutor with NoClassDefFoundError on
StaticComponentContainer, caused by dlopen rejecting a Linux ELF named .so:

  Files$NotLoadedException: Unable to load file
    org/burningwave/jvm/libNativeExecutor-aarch64.so
  UnsatisfiedLinkError: ... slice is not valid mach-o file

Two-part fix:

1. Libraries.java: when osArch=aarch64 AND os is macOS, use the
   .dylib extension. The previous aarch64 branch hardcoded "so" for
   ALL aarch64 platforms — correct on Linux but wrong on macOS,
   where it was reached *before* the macOS branch that would have
   set extension="dylib".

2. native/pom.xml: introduce a linker.arch.suffix property
   (default x${sun.arch.data.model}, overridden to "aarch64" in a
   new mac-aarch64 profile activated on os.family=mac AND
   os.arch=aarch64). This makes a native build on a native arm64
   macOS runner produce libNativeExecutor-aarch64.dylib instead of
   libNativeExecutor-x64.dylib.

3. Pre-built native/bin/libNativeExecutor-aarch64.dylib compiled
   with Apple clang++ 21.0 against OpenJDK 17.0.18 ARM headers,
   targeting arm64-apple-darwin. CI can regenerate this once a
   macos-latest aarch64 workflow entry is added (left as a
   follow-up PR to keep this one focused on the actual fix).

The C++ source is purely portable JNI (zero #ifdef __APPLE__) so it
compiles cleanly with no source changes; verified by exact symbol-set
match against the existing libNativeExecutor-aarch64.so (40 JNI exports).

Tested end-to-end on Apple M5 Pro / OpenJDK 17.0.18 ARM Homebrew with
the smoke test:

  Class.forName("org.burningwave.jvm.NativeExecutor");
  Class.forName("org.burningwave.core.assembler.StaticComponentContainer");

Both classes load and statically initialize successfully. Also
reproducible inside a real Forge 1.20.1 modpack (Biohazard: Project
Genesis) that bundles jvm-driver via TheImpossibleLibrary.

Refs: TheComputerizer/The-Impossible-Library#35
---
 .../org/burningwave/jvm/util/Libraries.java   |   8 ++++--
 native/bin/libNativeExecutor-aarch64.dylib    | Bin 0 -> 44864 bytes
 native/pom.xml                                |  26 ++++++++++++++++--
 3 files changed, 30 insertions(+), 4 deletions(-)
 create mode 100755 native/bin/libNativeExecutor-aarch64.dylib

diff --git a/java/src/main/java/org/burningwave/jvm/util/Libraries.java b/java/src/main/java/org/burningwave/jvm/util/Libraries.java
index 780bea97..9a379e20 100644
--- a/java/src/main/java/org/burningwave/jvm/util/Libraries.java
+++ b/java/src/main/java/org/burningwave/jvm/util/Libraries.java
@@ -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;
diff --git a/native/bin/libNativeExecutor-aarch64.dylib b/native/bin/libNativeExecutor-aarch64.dylib
new file mode 100755
index 0000000000000000000000000000000000000000..1169ccfb702145fba8c0ed515a015b4f7e28dd34
GIT binary patch
literal 44864
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
a!O@<Y-nO2nzWCi;y<M+mUFYSgPWnGlF5#pA

literal 0
HcmV?d00001

diff --git a/native/pom.xml b/native/pom.xml
index 7a4988e6..cd481a0e 100644
--- a/native/pom.xml
+++ b/native/pom.xml
@@ -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>
@@ -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>
@@ -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>