From 9c7bf0711b0bfc867bd6a42e63e758edc8095c07 Mon Sep 17 00:00:00 2001
From: Nick Lewycky <nick@wasmer.io>
Date: Fri, 6 Dec 2019 12:06:18 -0800
Subject: [PATCH] Initial commit of Aarch64 support for the llvm backend.

---
 CHANGELOG.md                     |  1 +
 lib/llvm-backend/Cargo.toml      |  8 +++++++-
 lib/llvm-backend/src/code.rs     | 12 +++++++++++-
 lib/llvm-backend/src/lib.rs      |  5 ++++-
 lib/spectests/tests/excludes.txt |  5 +++++
 5 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 60ff42f8b9b..2dfdaaae6b6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## **[Unreleased]**
 
+- [#1044](https://github.com/wasmerio/wasmer/pull/1044) Enable Aarch64 support in the LLVM backend.
 - [#1030](https://github.com/wasmerio/wasmer/pull/1030) Ability to generate `ImportObject` for a specific version WASI version with the C API.
 - [#1028](https://github.com/wasmerio/wasmer/pull/1028) Introduce strict/non-strict modes for `get_wasi_version`
 - [#1029](https://github.com/wasmerio/wasmer/pull/1029) Add the “floating” `WasiVersion::Latest` version.
diff --git a/lib/llvm-backend/Cargo.toml b/lib/llvm-backend/Cargo.toml
index b9fa7e6a720..f08bff86483 100644
--- a/lib/llvm-backend/Cargo.toml
+++ b/lib/llvm-backend/Cargo.toml
@@ -17,12 +17,18 @@ goblin = "0.0.24"
 libc = "0.2.60"
 byteorder = "1"
 
-[dependencies.inkwell]
+[target.'cfg(target_arch = "x86_64")'.dependencies.inkwell]
 git = "https://github.com/TheDan64/inkwell"
 rev = "781620e9fa30e51a6e03bd0d49b5f5bb7a782520"
 default-features = false
 features = ["llvm8-0", "target-x86"]
 
+[target.'cfg(target_arch = "aarch64")'.dependencies.inkwell]
+git = "https://github.com/TheDan64/inkwell"
+rev = "781620e9fa30e51a6e03bd0d49b5f5bb7a782520"
+default-features = false
+features = ["llvm8-0", "target-aarch64"]
+
 [target.'cfg(unix)'.dependencies]
 nix = "0.15"
 
diff --git a/lib/llvm-backend/src/code.rs b/lib/llvm-backend/src/code.rs
index 4365dbf3326..ff270a7be94 100644
--- a/lib/llvm-backend/src/code.rs
+++ b/lib/llvm-backend/src/code.rs
@@ -8472,7 +8472,17 @@ impl<'ctx> ModuleCodeGenerator<LLVMFunctionCodeGenerator<'ctx>, LLVMBackend, Cod
                 info: true,
                 machine_code: true,
             }),
-            _ => unimplemented!("compile to target other than x86-64 is not supported"),
+            _ if triple.starts_with("aarch64") => {
+                Target::initialize_aarch64(&InitializationConfig {
+                    asm_parser: true,
+                    asm_printer: true,
+                    base: true,
+                    disassembler: true,
+                    info: true,
+                    machine_code: true,
+                })
+            }
+            _ => unimplemented!("target {} not supported", triple),
         }
 
         let target = Target::from_triple(&triple).unwrap();
diff --git a/lib/llvm-backend/src/lib.rs b/lib/llvm-backend/src/lib.rs
index 853cfac1195..5ab0ad6eb2c 100644
--- a/lib/llvm-backend/src/lib.rs
+++ b/lib/llvm-backend/src/lib.rs
@@ -6,7 +6,10 @@
     unused_unsafe,
     unreachable_patterns
 )]
-#![cfg_attr(not(target_os = "windows"), deny(dead_code))]
+#![cfg_attr(
+    all(not(target_os = "windows"), not(target_arch = "aarch64")),
+    deny(dead_code)
+)]
 #![cfg_attr(nightly, feature(unwind_attributes))]
 #![doc(html_favicon_url = "https://wasmer.io/static/icons/favicon.ico")]
 #![doc(html_logo_url = "https://avatars3.githubusercontent.com/u/44205449?s=200&v=4")]
diff --git a/lib/spectests/tests/excludes.txt b/lib/spectests/tests/excludes.txt
index a2742b0dcc2..0a9e3017f5a 100644
--- a/lib/spectests/tests/excludes.txt
+++ b/lib/spectests/tests/excludes.txt
@@ -273,6 +273,11 @@ llvm:fail:f64.wast:1621 # AssertReturn - result F64(0) ("0x0") does not match ex
 llvm:fail:f64.wast:2020 # AssertReturn - result F64(9223372036854775808) ("0x8000000000000000") does not match expected F64(0) ("0x0")
 llvm:fail:linking.wast:388 # AssertReturn - Call failed RuntimeError: WebAssembly trap occurred during runtime: incorrect `call_indirect` signature
 
+# LLVM Aarch64
+llvm:skip:atomic.wast:*:*:aarch64 # Out of range relocations.
+llvm:skip:skip-stack-guard-page.wast:2275:*:aarch64 # Uncaught SIGSEGV only in release builds
+llvm:skip:skip-stack-guard-page.wast:2282:*:aarch64 # Uncaught SIGSEGV only in release builds
+
 # LLVM Windows
 llvm:skip:address.wast:*:windows
 llvm:skip:align.wast:*:windows