Remove metadata from target specs

This metadata was leftover from the builtin targets they are based on. Signed-off-by: Nick Spinale <[email protected]>
seL4 · Sep 19, 2024 · 33e5beb · 33e5beb
1 parent 5f6d5da
commit 33e5beb
Show file tree

Hide file tree

Showing 27 changed files with 107 additions and 105 deletions.
diff --git a/crates/sel4-generate-target-specs/src/main.rs b/crates/sel4-generate-target-specs/src/main.rs
@@ -223,7 +223,9 @@ impl Context {
 }
 
 fn builtin(triple: &str) -> Target {
-    Target::expect_builtin(&TargetTriple::from_triple(triple))
+    let mut target = Target::expect_builtin(&TargetTriple::from_triple(triple));
+    target.metadata = Default::default();
+    target
 }
 
 fn all_target_specs() -> BTreeMap<String, Target> {

diff --git a/support/targets/aarch64-sel4-microkit-minimal.json b/support/targets/aarch64-sel4-microkit-minimal.json
@@ -13,10 +13,10 @@
   "llvm-target": "aarch64-unknown-none",
   "max-atomic-width": 128,
   "metadata": {
-    "description": "Bare ARM64, hardfloat",
-    "host_tools": false,
-    "std": false,
-    "tier": 2
+    "description": null,
+    "host_tools": null,
+    "std": null,
+    "tier": null
   },
   "panic-strategy": "abort",
   "pre-link-args": {

diff --git a/support/targets/aarch64-sel4-microkit-resettable-minimal.json b/support/targets/aarch64-sel4-microkit-resettable-minimal.json
@@ -13,10 +13,10 @@
   "llvm-target": "aarch64-unknown-none",
   "max-atomic-width": 128,
   "metadata": {
-    "description": "Bare ARM64, hardfloat",
-    "host_tools": false,
-    "std": false,
-    "tier": 2
+    "description": null,
+    "host_tools": null,
+    "std": null,
+    "tier": null
   },
   "panic-strategy": "abort",
   "pre-link-args": {

diff --git a/support/targets/aarch64-sel4-microkit-resettable.json b/support/targets/aarch64-sel4-microkit-resettable.json
@@ -13,10 +13,10 @@
   "llvm-target": "aarch64-unknown-none",
   "max-atomic-width": 128,
   "metadata": {
-    "description": "Bare ARM64, hardfloat",
-    "host_tools": false,
-    "std": false,
-    "tier": 2
+    "description": null,
+    "host_tools": null,
+    "std": null,
+    "tier": null
   },
   "pre-link-args": {
     "gnu-lld": [

diff --git a/support/targets/aarch64-sel4-microkit.json b/support/targets/aarch64-sel4-microkit.json
@@ -13,10 +13,10 @@
   "llvm-target": "aarch64-unknown-none",
   "max-atomic-width": 128,
   "metadata": {
-    "description": "Bare ARM64, hardfloat",
-    "host_tools": false,
-    "std": false,
-    "tier": 2
+    "description": null,
+    "host_tools": null,
+    "std": null,
+    "tier": null
   },
   "pre-link-args": {
     "gnu-lld": [

diff --git a/support/targets/aarch64-sel4-minimal.json b/support/targets/aarch64-sel4-minimal.json
@@ -12,10 +12,10 @@
   "llvm-target": "aarch64-unknown-none",
   "max-atomic-width": 128,
   "metadata": {
-    "description": "Bare ARM64, hardfloat",
-    "host_tools": false,
-    "std": false,
-    "tier": 2
+    "description": null,
+    "host_tools": null,
+    "std": null,
+    "tier": null
   },
   "panic-strategy": "abort",
   "pre-link-args": {

diff --git a/support/targets/aarch64-sel4.json b/support/targets/aarch64-sel4.json
@@ -12,10 +12,10 @@
   "llvm-target": "aarch64-unknown-none",
   "max-atomic-width": 128,
   "metadata": {
-    "description": "Bare ARM64, hardfloat",
-    "host_tools": false,
-    "std": false,
-    "tier": 2
+    "description": null,
+    "host_tools": null,
+    "std": null,
+    "tier": null
   },
   "pre-link-args": {
     "gnu-lld": [

diff --git a/support/targets/armv7a-sel4-minimal.json b/support/targets/armv7a-sel4-minimal.json
@@ -15,10 +15,10 @@
   "llvm-target": "armv7a-none-eabi",
   "max-atomic-width": 64,
   "metadata": {
-    "description": "Bare Armv7-A",
-    "host_tools": false,
-    "std": false,
-    "tier": 2
+    "description": null,
+    "host_tools": null,
+    "std": null,
+    "tier": null
   },
   "panic-strategy": "abort",
   "relocation-model": "static",

diff --git a/support/targets/armv7a-sel4.json b/support/targets/armv7a-sel4.json
@@ -15,10 +15,10 @@
   "llvm-target": "armv7a-none-eabi",
   "max-atomic-width": 64,
   "metadata": {
-    "description": "Bare Armv7-A",
-    "host_tools": false,
-    "std": false,
-    "tier": 2
+    "description": null,
+    "host_tools": null,
+    "std": null,
+    "tier": null
   },
   "panic-strategy": "abort",
   "relocation-model": "static",

diff --git a/support/targets/riscv32imac-sel4-minimal.json b/support/targets/riscv32imac-sel4-minimal.json
@@ -13,10 +13,10 @@
   "llvm-target": "riscv32",
   "max-atomic-width": 32,
   "metadata": {
-    "description": "Bare RISC-V (RV32IMAC ISA)",
-    "host_tools": false,
-    "std": false,
-    "tier": 2
+    "description": null,
+    "host_tools": null,
+    "std": null,
+    "tier": null
   },
   "panic-strategy": "abort",
   "relocation-model": "static",

diff --git a/support/targets/riscv32imac-sel4.json b/support/targets/riscv32imac-sel4.json
@@ -13,10 +13,10 @@
   "llvm-target": "riscv32",
   "max-atomic-width": 32,
   "metadata": {
-    "description": "Bare RISC-V (RV32IMAC ISA)",
-    "host_tools": false,
-    "std": false,
-    "tier": 2
+    "description": null,
+    "host_tools": null,
+    "std": null,
+    "tier": null
   },
   "relocation-model": "static",
   "target-pointer-width": "32"

diff --git a/support/targets/riscv32imafc-sel4-minimal.json b/support/targets/riscv32imafc-sel4-minimal.json
@@ -14,10 +14,10 @@
   "llvm-target": "riscv32",
   "max-atomic-width": 32,
   "metadata": {
-    "description": "Bare RISC-V (RV32IMAFC ISA)",
-    "host_tools": false,
-    "std": false,
-    "tier": 2
+    "description": null,
+    "host_tools": null,
+    "std": null,
+    "tier": null
   },
   "panic-strategy": "abort",
   "relocation-model": "static",

diff --git a/support/targets/riscv32imafc-sel4.json b/support/targets/riscv32imafc-sel4.json
@@ -14,10 +14,10 @@
   "llvm-target": "riscv32",
   "max-atomic-width": 32,
   "metadata": {
-    "description": "Bare RISC-V (RV32IMAFC ISA)",
-    "host_tools": false,
-    "std": false,
-    "tier": 2
+    "description": null,
+    "host_tools": null,
+    "std": null,
+    "tier": null
   },
   "relocation-model": "static",
   "target-pointer-width": "32"

diff --git a/support/targets/riscv64gc-sel4-microkit-minimal.json b/support/targets/riscv64gc-sel4-microkit-minimal.json
@@ -16,10 +16,10 @@
   "llvm-target": "riscv64",
   "max-atomic-width": 64,
   "metadata": {
-    "description": "Bare RISC-V (RV64IMAFDC ISA)",
-    "host_tools": false,
-    "std": false,
-    "tier": 2
+    "description": null,
+    "host_tools": null,
+    "std": null,
+    "tier": null
   },
   "panic-strategy": "abort",
   "relocation-model": "static",

diff --git a/support/targets/riscv64gc-sel4-microkit-resettable-minimal.json b/support/targets/riscv64gc-sel4-microkit-resettable-minimal.json
@@ -16,10 +16,10 @@
   "llvm-target": "riscv64",
   "max-atomic-width": 64,
   "metadata": {
-    "description": "Bare RISC-V (RV64IMAFDC ISA)",
-    "host_tools": false,
-    "std": false,
-    "tier": 2
+    "description": null,
+    "host_tools": null,
+    "std": null,
+    "tier": null
   },
   "panic-strategy": "abort",
   "relocation-model": "static",

diff --git a/support/targets/riscv64gc-sel4-microkit-resettable.json b/support/targets/riscv64gc-sel4-microkit-resettable.json
@@ -16,10 +16,10 @@
   "llvm-target": "riscv64",
   "max-atomic-width": 64,
   "metadata": {
-    "description": "Bare RISC-V (RV64IMAFDC ISA)",
-    "host_tools": false,
-    "std": false,
-    "tier": 2
+    "description": null,
+    "host_tools": null,
+    "std": null,
+    "tier": null
   },
   "relocation-model": "static",
   "supported-sanitizers": [

diff --git a/support/targets/riscv64gc-sel4-microkit.json b/support/targets/riscv64gc-sel4-microkit.json
@@ -16,10 +16,10 @@
   "llvm-target": "riscv64",
   "max-atomic-width": 64,
   "metadata": {
-    "description": "Bare RISC-V (RV64IMAFDC ISA)",
-    "host_tools": false,
-    "std": false,
-    "tier": 2
+    "description": null,
+    "host_tools": null,
+    "std": null,
+    "tier": null
   },
   "relocation-model": "static",
   "supported-sanitizers": [

diff --git a/support/targets/riscv64gc-sel4-minimal.json b/support/targets/riscv64gc-sel4-minimal.json
@@ -15,10 +15,10 @@
   "llvm-target": "riscv64",
   "max-atomic-width": 64,
   "metadata": {
-    "description": "Bare RISC-V (RV64IMAFDC ISA)",
-    "host_tools": false,
-    "std": false,
-    "tier": 2
+    "description": null,
+    "host_tools": null,
+    "std": null,
+    "tier": null
   },
   "panic-strategy": "abort",
   "relocation-model": "static",

diff --git a/support/targets/riscv64gc-sel4.json b/support/targets/riscv64gc-sel4.json
@@ -15,10 +15,10 @@
   "llvm-target": "riscv64",
   "max-atomic-width": 64,
   "metadata": {
-    "description": "Bare RISC-V (RV64IMAFDC ISA)",
-    "host_tools": false,
-    "std": false,
-    "tier": 2
+    "description": null,
+    "host_tools": null,
+    "std": null,
+    "tier": null
   },
   "relocation-model": "static",
   "supported-sanitizers": [

diff --git a/support/targets/riscv64imac-sel4-microkit-minimal.json b/support/targets/riscv64imac-sel4-microkit-minimal.json
@@ -15,10 +15,10 @@
   "llvm-target": "riscv64",
   "max-atomic-width": 64,
   "metadata": {
-    "description": "Bare RISC-V (RV64IMAC ISA)",
-    "host_tools": false,
-    "std": false,
-    "tier": 2
+    "description": null,
+    "host_tools": null,
+    "std": null,
+    "tier": null
   },
   "panic-strategy": "abort",
   "relocation-model": "static",

diff --git a/support/targets/riscv64imac-sel4-microkit-resettable-minimal.json b/support/targets/riscv64imac-sel4-microkit-resettable-minimal.json
@@ -15,10 +15,10 @@
   "llvm-target": "riscv64",
   "max-atomic-width": 64,
   "metadata": {
-    "description": "Bare RISC-V (RV64IMAC ISA)",
-    "host_tools": false,
-    "std": false,
-    "tier": 2
+    "description": null,
+    "host_tools": null,
+    "std": null,
+    "tier": null
   },
   "panic-strategy": "abort",
   "relocation-model": "static",

diff --git a/support/targets/riscv64imac-sel4-microkit-resettable.json b/support/targets/riscv64imac-sel4-microkit-resettable.json
@@ -15,10 +15,10 @@
   "llvm-target": "riscv64",
   "max-atomic-width": 64,
   "metadata": {
-    "description": "Bare RISC-V (RV64IMAC ISA)",
-    "host_tools": false,
-    "std": false,
-    "tier": 2
+    "description": null,
+    "host_tools": null,
+    "std": null,
+    "tier": null
   },
   "relocation-model": "static",
   "supported-sanitizers": [

diff --git a/support/targets/riscv64imac-sel4-microkit.json b/support/targets/riscv64imac-sel4-microkit.json
@@ -15,10 +15,10 @@
   "llvm-target": "riscv64",
   "max-atomic-width": 64,
   "metadata": {
-    "description": "Bare RISC-V (RV64IMAC ISA)",
-    "host_tools": false,
-    "std": false,
-    "tier": 2
+    "description": null,
+    "host_tools": null,
+    "std": null,
+    "tier": null
   },
   "relocation-model": "static",
   "supported-sanitizers": [

diff --git a/support/targets/riscv64imac-sel4-minimal.json b/support/targets/riscv64imac-sel4-minimal.json
@@ -14,10 +14,10 @@
   "llvm-target": "riscv64",
   "max-atomic-width": 64,
   "metadata": {
-    "description": "Bare RISC-V (RV64IMAC ISA)",
-    "host_tools": false,
-    "std": false,
-    "tier": 2
+    "description": null,
+    "host_tools": null,
+    "std": null,
+    "tier": null
   },
   "panic-strategy": "abort",
   "relocation-model": "static",

diff --git a/support/targets/riscv64imac-sel4.json b/support/targets/riscv64imac-sel4.json
@@ -14,10 +14,10 @@
   "llvm-target": "riscv64",
   "max-atomic-width": 64,
   "metadata": {
-    "description": "Bare RISC-V (RV64IMAC ISA)",
-    "host_tools": false,
-    "std": false,
-    "tier": 2
+    "description": null,
+    "host_tools": null,
+    "std": null,
+    "tier": null
   },
   "relocation-model": "static",
   "supported-sanitizers": [

diff --git a/support/targets/x86_64-sel4-minimal.json b/support/targets/x86_64-sel4-minimal.json
@@ -14,10 +14,10 @@
   "llvm-target": "x86_64-unknown-none-elf",
   "max-atomic-width": 64,
   "metadata": {
-    "description": "Freestanding/bare-metal x86_64 softfloat",
-    "host_tools": false,
-    "std": false,
-    "tier": 2
+    "description": null,
+    "host_tools": null,
+    "std": null,
+    "tier": null
   },
   "panic-strategy": "abort",
   "plt-by-default": false,