Improved Native support

examples/engine_cross_compilation.rs

@@ -99,7 +99,11 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 }
 
 #[test]
-#[cfg(not(windows))]
+#[cfg(not(any(
+    windows,
+    // We don't support yet crosscompilation in macOS with Apple Silicon
+    all(target_os = "macos", target_arch = "aarch64")
+)))]
 fn test_cross_compilation() -> Result<(), Box<dyn std::error::Error>> {
     main()
 }

lib/engine-native/src/artifact.rs

@@ -254,15 +254,26 @@ impl NativeArtifact {
         };
 
         let is_cross_compiling = engine_inner.is_cross_compiling();
+        let target_triple_str = {
+            let into_str = target_triple.to_string();
+            // We have to adapt the target triple string, because otherwise
+            // Apple's clang will not recognize it.
+            if into_str == "aarch64-apple-darwin" {
+                "arm64-apple-darwin".to_string()
+            } else {
+                into_str
+            }
+        };
+
         let cross_compiling_args: Vec<String> = if is_cross_compiling {
             vec![
-                format!("--target={}", target_triple),
+                format!("--target={}", target_triple_str),
                 "-fuse-ld=lld".to_string(),
                 "-nodefaultlibs".to_string(),
                 "-nostdlib".to_string(),
             ]
         } else {
-            vec![]
+            vec![format!("--target={}", target_triple_str)]
         };
         let target_args = match (target_triple.operating_system, is_cross_compiling) {
             (OperatingSystem::Windows, true) => vec!["-Wl,/force:unresolved,/noentry"],
@@ -271,7 +282,7 @@ impl NativeArtifact {
         };
         trace!(
             "Compiling for target {} from host {}",
-            target_triple.to_string(),
+            target_triple_str,
             Triple::host().to_string(),
         );
 

lib/object/src/module.rs

@@ -209,6 +209,12 @@ pub fn emit_compilation(
             RelocationKind::PltRelative,
             RelocationEncoding::X86Branch,
         ),
+        // Object doesn't fully support it yet
+        // Architecture::Aarch64(_) => (
+        //     32,
+        //     RelocationKind::PltRelative,
+        //     RelocationEncoding::Generic,
+        // ),
         architecture => {
             return Err(ObjectError::UnsupportedArchitecture(
                 architecture.to_string(),

tests/compilers/traps.rs

@@ -421,7 +421,8 @@ fn mismatched_arguments() -> Result<()> {
     any(
         feature = "test-singlepass",
         feature = "test-llvm",
-        feature = "test-native"
+        feature = "test-native",
+        all(target_os = "macos", target_arch = "aarch64")
     ),
     ignore
 )]