From ac560ba98503339aa87a977773ac2b7db9db9540 Mon Sep 17 00:00:00 2001
From: occheung <dc@m-labs.hk>
Date: Mon, 30 May 2022 17:12:05 +0800
Subject: [PATCH] nac3artiq: switch ld.lld to nac3ld for non-host target

---
 Cargo.lock           |  1 +
 nac3artiq/Cargo.toml |  1 +
 nac3artiq/src/lib.rs | 70 ++++++++++++++++++++++++++------------------
 3 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 56151d1f7..b6c25bc25 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -489,6 +489,7 @@ version = "0.1.0"
 dependencies = [
  "inkwell",
  "nac3core",
+ "nac3ld",
  "nac3parser",
  "parking_lot 0.11.2",
  "pyo3",
diff --git a/nac3artiq/Cargo.toml b/nac3artiq/Cargo.toml
index 794cc28de..b6298a547 100644
--- a/nac3artiq/Cargo.toml
+++ b/nac3artiq/Cargo.toml
@@ -14,6 +14,7 @@ parking_lot = "0.11"
 tempfile = "3"
 nac3parser = { path = "../nac3parser" }
 nac3core = { path = "../nac3core" }
+nac3ld = { path = "../nac3ld" }
 
 [dependencies.inkwell]
 git = "https://github.com/TheDan64/inkwell.git"
diff --git a/nac3artiq/src/lib.rs b/nac3artiq/src/lib.rs
index 85e71d441..4f0b49fbe 100644
--- a/nac3artiq/src/lib.rs
+++ b/nac3artiq/src/lib.rs
@@ -1,5 +1,6 @@
 use std::collections::{HashMap, HashSet};
 use std::fs;
+use std::io::Write;
 use std::process::Command;
 use std::rc::Rc;
 use std::sync::Arc;
@@ -36,6 +37,8 @@ use nac3core::{
     typecheck::{type_inferencer::PrimitiveStore, typedef::Type},
 };
 
+use nac3ld::Linker;
+
 use tempfile::{self, TempDir};
 
 use crate::codegen::attributes_writeback;
@@ -854,7 +857,7 @@ impl Nac3 {
             Isa::RiscV32IMA => (TargetTriple::create("riscv32-unknown-linux"), "+a,+m".to_string()),
             Isa::CortexA9 => (
                 TargetTriple::create("armv7-unknown-linux-gnueabihf"),
-                "+dsp,+fp16,+neon,+vfp3".to_string(),
+                "+dsp,+fp16,+neon,+vfp3,+long-calls".to_string(),
             ),
         };
         let target =
@@ -869,37 +872,46 @@ impl Nac3 {
                 CodeModel::Default,
             )
             .expect("couldn't create target machine");
-        target_machine
-            .write_to_file(&main, FileType::Object, &working_directory.join("module.o"))
-            .expect("couldn't write module to file");
+        
+        if isa == Isa::Host {
+            target_machine
+                .write_to_file(&main, FileType::Object, &working_directory.join("module.o"))
+                .expect("couldn't write module to file");
+            let linker_args = vec![
+                "-shared".to_string(),
+                "--eh-frame-hdr".to_string(),
+                "-x".to_string(),
+                "-o".to_string(),
+                filename.to_string(),
+                working_directory.join("module.o").to_string_lossy().to_string(),
+            ];
 
-        let mut linker_args = vec![
-            "-shared".to_string(),
-            "--eh-frame-hdr".to_string(),
-            "-x".to_string(),
-            "-o".to_string(),
-            filename.to_string(),
-            working_directory.join("module.o").to_string_lossy().to_string(),
-        ];
-        if isa != Isa::Host {
-            linker_args.push(
-                "-T".to_string()
-                    + self.working_directory.path().join("kernel.ld").to_str().unwrap(),
-            );
-        }
-
-        #[cfg(not(windows))]
-        let lld_command = "ld.lld";
-        #[cfg(windows)]
-        let lld_command = "ld.lld.exe";
-        if let Ok(linker_status) = Command::new(lld_command).args(linker_args).status() {
-            if !linker_status.success() {
-                return Err(CompileError::new_err("failed to start linker"));
+            #[cfg(not(windows))]
+            let lld_command = "ld.lld";
+            #[cfg(windows)]
+            let lld_command = "ld.lld.exe";
+            if let Ok(linker_status) = Command::new(lld_command).args(linker_args).status() {
+                if !linker_status.success() {
+                    return Err(CompileError::new_err("failed to start linker"));
+                }
+            } else {
+                return Err(CompileError::new_err(
+                    "linker returned non-zero status code",
+                ));
             }
         } else {
-            return Err(CompileError::new_err(
-                "linker returned non-zero status code",
-            ));
+            let object_mem = target_machine
+                .write_to_memory_buffer(&main, FileType::Object)
+                .expect("couldn't write module to object file buffer");
+            if let Ok(dyn_lib) = Linker::ld(object_mem.as_slice()) {
+                if let Ok(mut file) = fs::File::create(filename) {
+                    file.write_all(&dyn_lib).expect("couldn't write linked library to file");
+                } else {
+                    return Err(CompileError::new_err("failed to create file"));
+                }
+            } else {
+                return Err(CompileError::new_err("linker failed to process object file"));
+            }
         }
 
         Ok(())