From 32f6ac44d65cd3c90c9b379ea60c8f49064e08f5 Mon Sep 17 00:00:00 2001
From: "Zoltan A. Kocsis" <11808286+zaklogician@users.noreply.github.com>
Date: Fri, 13 Feb 2026 04:30:09 +0000
Subject: [PATCH] rust: update target jsons for rustc 1.93+

Recent versions of `rustc` expect the `target-pointer-width` field in
`target.json` files to hvae type `u16` instead of `string`.

The target specifications under `example/rust` and `initialiser` still
use the older format, which results in errors when running `build_sdk.py`
on a system with newer `rustc` versions.

Here we update these files to the newer format, which makes the build
succeed on `rustc` 1.93.0 and above.

NB this commit does not add condition logic / multiple copies to support
multiple incompatible versions of these json files, so the build will
now fail with outdated versions of `rustc` instead.

Signed-off-by: Zoltan A. Kocsis <11808286+zaklogician@users.noreply.github.com>
---
 example/rust/support/targets/aarch64-sel4-microkit-minimal.json | 2 +-
 .../rust/support/targets/riscv64gc-sel4-microkit-minimal.json   | 2 +-
 initialiser/support/targets/aarch64-sel4-minimal.json           | 2 +-
 initialiser/support/targets/riscv64imac-sel4-minimal.json       | 2 +-
 initialiser/support/targets/x86_64-sel4-minimal.json            | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/example/rust/support/targets/aarch64-sel4-microkit-minimal.json b/example/rust/support/targets/aarch64-sel4-microkit-minimal.json
index 322a1359d..1cc21d2d5 100644
--- a/example/rust/support/targets/aarch64-sel4-microkit-minimal.json
+++ b/example/rust/support/targets/aarch64-sel4-microkit-minimal.json
@@ -31,5 +31,5 @@
     "kcfi",
     "kernel-address"
   ],
-  "target-pointer-width": "64"
+  "target-pointer-width": 64
 }
diff --git a/example/rust/support/targets/riscv64gc-sel4-microkit-minimal.json b/example/rust/support/targets/riscv64gc-sel4-microkit-minimal.json
index 0e0e9ddeb..cd077a5c2 100644
--- a/example/rust/support/targets/riscv64gc-sel4-microkit-minimal.json
+++ b/example/rust/support/targets/riscv64gc-sel4-microkit-minimal.json
@@ -25,5 +25,5 @@
     "shadow-call-stack",
     "kernel-address"
   ],
-  "target-pointer-width": "64"
+  "target-pointer-width": 64
 }
diff --git a/initialiser/support/targets/aarch64-sel4-minimal.json b/initialiser/support/targets/aarch64-sel4-minimal.json
index 46fc21aa8..96c14fa07 100644
--- a/initialiser/support/targets/aarch64-sel4-minimal.json
+++ b/initialiser/support/targets/aarch64-sel4-minimal.json
@@ -30,5 +30,5 @@
     "kcfi",
     "kernel-address"
   ],
-  "target-pointer-width": "64"
+  "target-pointer-width": 64
 }
diff --git a/initialiser/support/targets/riscv64imac-sel4-minimal.json b/initialiser/support/targets/riscv64imac-sel4-minimal.json
index 8697c8c59..6e6803eda 100644
--- a/initialiser/support/targets/riscv64imac-sel4-minimal.json
+++ b/initialiser/support/targets/riscv64imac-sel4-minimal.json
@@ -24,5 +24,5 @@
     "shadow-call-stack",
     "kernel-address"
   ],
-  "target-pointer-width": "64"
+  "target-pointer-width": 64
 }
diff --git a/initialiser/support/targets/x86_64-sel4-minimal.json b/initialiser/support/targets/x86_64-sel4-minimal.json
index c09af2c79..6266d15e8 100644
--- a/initialiser/support/targets/x86_64-sel4-minimal.json
+++ b/initialiser/support/targets/x86_64-sel4-minimal.json
@@ -28,5 +28,5 @@
     "kcfi",
     "kernel-address"
   ],
-  "target-pointer-width": "64"
+  "target-pointer-width": 64
 }