From d047867200681f38805fae9779cc33096c9006a4 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Sat, 2 Jan 2021 12:07:04 +0100
Subject: [PATCH] Update target specs for recent Rust versions (#698)

* Update target specs for recent Rust versions

* Revert debug thing
---
 .../res/specs/aarch64-freestanding.json       | 20 ++++++-------
 .../res/specs/arm-freestanding.json           | 17 +++++------
 .../res/specs/riscv-hifive.json               | 29 +++++++++----------
 .../res/specs/x86_64-multiboot2.json          |  3 +-
 4 files changed, 32 insertions(+), 37 deletions(-)

diff --git a/kernel/standalone-builder/res/specs/aarch64-freestanding.json b/kernel/standalone-builder/res/specs/aarch64-freestanding.json
index 3407704a7..7a2c8b9e3 100644
--- a/kernel/standalone-builder/res/specs/aarch64-freestanding.json
+++ b/kernel/standalone-builder/res/specs/aarch64-freestanding.json
@@ -1,19 +1,10 @@
 {
-    "abi-blacklist": [
-      "stdcall",
-      "fastcall",
-      "vectorcall",
-      "thiscall",
-      "win64",
-      "sysv64"
-    ],
     "arch": "aarch64",
     "data-layout": "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128",
     "disable-redzone": true,
     "env": "",
     "executables": true,
-    "features": "+strict-align,-neon,-fp-armv8",
-    "is-builtin": true,
+    "features": "+strict-align,+neon,+fp-armv8",
     "linker": "rust-lld",
     "linker-flavor": "ld.lld",
     "linker-is-gnu": true,
@@ -25,5 +16,12 @@
     "target-c-int-width": "32",
     "target-endian": "little",
     "target-pointer-width": "64",
-    "vendor": ""
+    "unsupported-abis": [
+      "stdcall",
+      "fastcall",
+      "vectorcall",
+      "thiscall",
+      "win64",
+      "sysv64"
+    ]
 }
diff --git a/kernel/standalone-builder/res/specs/arm-freestanding.json b/kernel/standalone-builder/res/specs/arm-freestanding.json
index a0909824e..ce9992bac 100644
--- a/kernel/standalone-builder/res/specs/arm-freestanding.json
+++ b/kernel/standalone-builder/res/specs/arm-freestanding.json
@@ -1,12 +1,4 @@
 {
-    "abi-blacklist": [
-        "stdcall",
-        "fastcall",
-        "vectorcall",
-        "thiscall",
-        "win64",
-        "sysv64"
-    ],
     "arch": "arm",
     "data-layout": "e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64",
     "emit-debug-gdb-scripts": false,
@@ -24,5 +16,12 @@
     "target-c-int-width": "32",
     "target-endian": "little",
     "target-pointer-width": "32",
-    "vendor": ""
+    "unsupported-abis": [
+        "stdcall",
+        "fastcall",
+        "vectorcall",
+        "thiscall",
+        "win64",
+        "sysv64"
+    ]
 }
diff --git a/kernel/standalone-builder/res/specs/riscv-hifive.json b/kernel/standalone-builder/res/specs/riscv-hifive.json
index b4dfd0df9..ca9c833e7 100644
--- a/kernel/standalone-builder/res/specs/riscv-hifive.json
+++ b/kernel/standalone-builder/res/specs/riscv-hifive.json
@@ -1,18 +1,4 @@
 {
-    "abi-blacklist": [
-        "cdecl",
-        "stdcall",
-        "fastcall",
-        "vectorcall",
-        "thiscall",
-        "aapcs",
-        "win64",
-        "sysv64",
-        "ptx-kernel",
-        "msp430-interrupt",
-        "x86-interrupt",
-        "amdgpu-kernel"
-    ],
     "arch": "riscv32",
     "cpu": "generic-rv32",
     "data-layout": "e-m:e-p:32:32-i64:64-n32-S128",
@@ -32,5 +18,18 @@
     "target-c-int-width": "32",
     "target-endian": "little",
     "target-pointer-width": "32",
-    "vendor": "unknown"
+    "unsupported-abis": [
+        "cdecl",
+        "stdcall",
+        "fastcall",
+        "vectorcall",
+        "thiscall",
+        "aapcs",
+        "win64",
+        "sysv64",
+        "ptx-kernel",
+        "msp430-interrupt",
+        "x86-interrupt",
+        "amdgpu-kernel"
+    ]
 }
diff --git a/kernel/standalone-builder/res/specs/x86_64-multiboot2.json b/kernel/standalone-builder/res/specs/x86_64-multiboot2.json
index 77303c1bd..55599c0ef 100644
--- a/kernel/standalone-builder/res/specs/x86_64-multiboot2.json
+++ b/kernel/standalone-builder/res/specs/x86_64-multiboot2.json
@@ -21,6 +21,5 @@
     "stack-probes": true,
     "target-c-int-width": "32",
     "target-endian": "little",
-    "target-pointer-width": "64",
-    "vendor": "unknown"
+    "target-pointer-width": "64"
 }