From ed55b4909348b314cd446da17baf5a47cb988447 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Tue, 12 Jan 2021 19:57:07 -0700
Subject: [PATCH] Update aarch64 target to new Rust

---
 targets/aarch64-unknown-none.json | 52 ++++++++++++++++---------------
 targets/arm-unknown-none.json     | 26 ----------------
 2 files changed, 27 insertions(+), 51 deletions(-)
 delete mode 100644 targets/arm-unknown-none.json

diff --git a/targets/aarch64-unknown-none.json b/targets/aarch64-unknown-none.json
index e819a5e..d36ded3 100644
--- a/targets/aarch64-unknown-none.json
+++ b/targets/aarch64-unknown-none.json
@@ -1,27 +1,29 @@
 {
-  "llvm-target": "aarch64-unknown-none",
-  "target-endian": "little",
-  "target-pointer-width": "64",
-  "target-c-int-width": "32",
-  "data-layout": "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128",
-  "arch": "aarch64",
-  "os": "none",
-  "env": "",
-  "vendor": "unknown",
-  "linker-flavor": "gcc",
-  "target-family": "redox",
-  "pre-link-args": ["-m64", "-nostdlib", "-static"],
-  "features": "+a53,+strict-align,-fp-armv8",
-  "dynamic-linking": false,
-  "executables": false,
-  "relocation-model": "pic",
-  "code-model": "large",
-  "disable-redzone": true,
-  "eliminate-frame-pointer": false,
-  "exe-suffix": "",
-  "has-rpath": false,
-  "no-compiler-rt": true,
-  "no-default-libraries": true,
-  "position-independent-executables": false,
-  "has-elf-tls": true
+    "llvm-target": "aarch64-unknown-none",
+    "target-endian": "little",
+    "target-pointer-width": "64",
+    "target-c-int-width": "32",
+    "data-layout": "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128",
+    "arch": "aarch64",
+    "os": "none",
+    "env": "",
+    "vendor": "unknown",
+    "linker-flavor": "gcc",
+    "target-family": "redox",
+    "pre-link-args": {
+        "gcc": ["-m64", "-nostdlib", "-static"]
+    },
+    "features": "+a53,+strict-align,-fp-armv8",
+    "dynamic-linking": false,
+    "executables": false,
+    "relocation-model": "pic",
+    "code-model": "large",
+    "disable-redzone": true,
+    "eliminate-frame-pointer": false,
+    "exe-suffix": "",
+    "has-rpath": false,
+    "no-compiler-rt": true,
+    "no-default-libraries": true,
+    "position-independent-executables": false,
+    "has-elf-tls": true
 }
diff --git a/targets/arm-unknown-none.json b/targets/arm-unknown-none.json
deleted file mode 100644
index dad0ed5..0000000
--- a/targets/arm-unknown-none.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "llvm-target": "arm-unknown-none",
-    "target-endian": "little",
-    "target-pointer-width": "32",
-    "data-layout": "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64",
-    "arch": "arm",
-    "os": "none",
-    "env": "",
-    "vendor": "unknown",
-    "linker-flavor": "gcc",
-    "target-family": "redox",
-    "pre-link-args": ["-nostdlib", "-static"],
-    "features": "+soft-float",
-    "dynamic-linking": false,
-    "executables": false,
-    "relocation-model": "static",
-    "code-model": "kernel",
-    "disable-redzone": true,
-    "eliminate-frame-pointer": false,
-    "exe-suffix": "",
-    "has-rpath": false,
-    "no-compiler-rt": true,
-    "no-default-libraries": true,
-    "position-independent-executables": false,
-    "has-elf-tls": true
-}