From 94cc564f59a32c001d248ba1436fe1e222f49b61 Mon Sep 17 00:00:00 2001 From: Nick Spinale Date: Tue, 12 May 2026 01:50:27 -0700 Subject: [PATCH] Update everything Signed-off-by: Nick Spinale --- .cargo/config.toml | 1 + Cargo.lock | 54 +++++++++++++++---------------- docker/Dockerfile | 4 +-- rust-toolchain.toml | 2 +- support/targets/aarch64-sel4.json | 3 +- 5 files changed, 33 insertions(+), 31 deletions(-) diff --git a/.cargo/config.toml b/.cargo/config.toml index 6f1b60f..e641372 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -9,6 +9,7 @@ RUST_TARGET_PATH = { value = "support/targets", relative = true } [build] target = "aarch64-sel4" +rustflags = ["-Zunstable-options"] [unstable] unstable-options = true diff --git a/Cargo.lock b/Cargo.lock index 5204cb7..ad6ce2f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -349,7 +349,7 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sel4" version = "0.1.0" -source = "git+https://github.com/seL4/rust-sel4#2c9786744900433f37e803c25ab208835a802cf3" +source = "git+https://github.com/seL4/rust-sel4#7a2321f2d84310ba7a09fe7f5988e6dcecde3566" dependencies = [ "cfg-if", "sel4-config", @@ -359,7 +359,7 @@ dependencies = [ [[package]] name = "sel4-alloca" version = "0.1.0" -source = "git+https://github.com/seL4/rust-sel4#2c9786744900433f37e803c25ab208835a802cf3" +source = "git+https://github.com/seL4/rust-sel4#7a2321f2d84310ba7a09fe7f5988e6dcecde3566" dependencies = [ "cfg-if", ] @@ -367,7 +367,7 @@ dependencies = [ [[package]] name = "sel4-bitfield-ops" version = "0.1.0" -source = "git+https://github.com/seL4/rust-sel4#2c9786744900433f37e803c25ab208835a802cf3" +source = "git+https://github.com/seL4/rust-sel4#7a2321f2d84310ba7a09fe7f5988e6dcecde3566" dependencies = [ "rustversion", ] @@ -375,12 +375,12 @@ dependencies = [ [[package]] name = "sel4-build-env" version = "0.1.0" -source = "git+https://github.com/seL4/rust-sel4#2c9786744900433f37e803c25ab208835a802cf3" +source = "git+https://github.com/seL4/rust-sel4#7a2321f2d84310ba7a09fe7f5988e6dcecde3566" [[package]] name = "sel4-config" version = "0.1.0" -source = "git+https://github.com/seL4/rust-sel4#2c9786744900433f37e803c25ab208835a802cf3" +source = "git+https://github.com/seL4/rust-sel4#7a2321f2d84310ba7a09fe7f5988e6dcecde3566" dependencies = [ "prettyplease", "proc-macro2", @@ -394,7 +394,7 @@ dependencies = [ [[package]] name = "sel4-config-data" version = "0.1.0" -source = "git+https://github.com/seL4/rust-sel4#2c9786744900433f37e803c25ab208835a802cf3" +source = "git+https://github.com/seL4/rust-sel4#7a2321f2d84310ba7a09fe7f5988e6dcecde3566" dependencies = [ "sel4-build-env", "sel4-config-types", @@ -404,7 +404,7 @@ dependencies = [ [[package]] name = "sel4-config-macros" version = "0.1.0" -source = "git+https://github.com/seL4/rust-sel4#2c9786744900433f37e803c25ab208835a802cf3" +source = "git+https://github.com/seL4/rust-sel4#7a2321f2d84310ba7a09fe7f5988e6dcecde3566" dependencies = [ "fallible-iterator", "proc-macro2", @@ -417,7 +417,7 @@ dependencies = [ [[package]] name = "sel4-config-types" version = "0.1.0" -source = "git+https://github.com/seL4/rust-sel4#2c9786744900433f37e803c25ab208835a802cf3" +source = "git+https://github.com/seL4/rust-sel4#7a2321f2d84310ba7a09fe7f5988e6dcecde3566" dependencies = [ "serde", ] @@ -425,12 +425,12 @@ dependencies = [ [[package]] name = "sel4-ctors-dtors" version = "0.1.0" -source = "git+https://github.com/seL4/rust-sel4#2c9786744900433f37e803c25ab208835a802cf3" +source = "git+https://github.com/seL4/rust-sel4#7a2321f2d84310ba7a09fe7f5988e6dcecde3566" [[package]] name = "sel4-dlmalloc" version = "0.1.0" -source = "git+https://github.com/seL4/rust-sel4#2c9786744900433f37e803c25ab208835a802cf3" +source = "git+https://github.com/seL4/rust-sel4#7a2321f2d84310ba7a09fe7f5988e6dcecde3566" dependencies = [ "dlmalloc", "lock_api", @@ -439,17 +439,17 @@ dependencies = [ [[package]] name = "sel4-elf-header" version = "0.1.0" -source = "git+https://github.com/seL4/rust-sel4#2c9786744900433f37e803c25ab208835a802cf3" +source = "git+https://github.com/seL4/rust-sel4#7a2321f2d84310ba7a09fe7f5988e6dcecde3566" [[package]] name = "sel4-immediate-sync-once-cell" version = "0.1.0" -source = "git+https://github.com/seL4/rust-sel4#2c9786744900433f37e803c25ab208835a802cf3" +source = "git+https://github.com/seL4/rust-sel4#7a2321f2d84310ba7a09fe7f5988e6dcecde3566" [[package]] name = "sel4-initialize-tls" version = "0.1.0" -source = "git+https://github.com/seL4/rust-sel4#2c9786744900433f37e803c25ab208835a802cf3" +source = "git+https://github.com/seL4/rust-sel4#7a2321f2d84310ba7a09fe7f5988e6dcecde3566" dependencies = [ "cfg-if", "sel4-alloca", @@ -458,7 +458,7 @@ dependencies = [ [[package]] name = "sel4-panicking" version = "0.1.0" -source = "git+https://github.com/seL4/rust-sel4#2c9786744900433f37e803c25ab208835a802cf3" +source = "git+https://github.com/seL4/rust-sel4#7a2321f2d84310ba7a09fe7f5988e6dcecde3566" dependencies = [ "cfg-if", "sel4-immediate-sync-once-cell", @@ -469,12 +469,12 @@ dependencies = [ [[package]] name = "sel4-panicking-env" version = "0.1.0" -source = "git+https://github.com/seL4/rust-sel4#2c9786744900433f37e803c25ab208835a802cf3" +source = "git+https://github.com/seL4/rust-sel4#7a2321f2d84310ba7a09fe7f5988e6dcecde3566" [[package]] name = "sel4-root-task" version = "0.1.0" -source = "git+https://github.com/seL4/rust-sel4#2c9786744900433f37e803c25ab208835a802cf3" +source = "git+https://github.com/seL4/rust-sel4#7a2321f2d84310ba7a09fe7f5988e6dcecde3566" dependencies = [ "sel4", "sel4-dlmalloc", @@ -489,7 +489,7 @@ dependencies = [ [[package]] name = "sel4-root-task-macros" version = "0.1.0" -source = "git+https://github.com/seL4/rust-sel4#2c9786744900433f37e803c25ab208835a802cf3" +source = "git+https://github.com/seL4/rust-sel4#7a2321f2d84310ba7a09fe7f5988e6dcecde3566" dependencies = [ "proc-macro2", "quote", @@ -499,7 +499,7 @@ dependencies = [ [[package]] name = "sel4-runtime-common" version = "0.1.0" -source = "git+https://github.com/seL4/rust-sel4#2c9786744900433f37e803c25ab208835a802cf3" +source = "git+https://github.com/seL4/rust-sel4#7a2321f2d84310ba7a09fe7f5988e6dcecde3566" dependencies = [ "cfg-if", "sel4", @@ -514,12 +514,12 @@ dependencies = [ [[package]] name = "sel4-stack" version = "0.1.0" -source = "git+https://github.com/seL4/rust-sel4#2c9786744900433f37e803c25ab208835a802cf3" +source = "git+https://github.com/seL4/rust-sel4#7a2321f2d84310ba7a09fe7f5988e6dcecde3566" [[package]] name = "sel4-sync" version = "0.1.0" -source = "git+https://github.com/seL4/rust-sel4#2c9786744900433f37e803c25ab208835a802cf3" +source = "git+https://github.com/seL4/rust-sel4#7a2321f2d84310ba7a09fe7f5988e6dcecde3566" dependencies = [ "lock_api", "sel4", @@ -529,7 +529,7 @@ dependencies = [ [[package]] name = "sel4-sys" version = "0.1.0" -source = "git+https://github.com/seL4/rust-sel4#2c9786744900433f37e803c25ab208835a802cf3" +source = "git+https://github.com/seL4/rust-sel4#7a2321f2d84310ba7a09fe7f5988e6dcecde3566" dependencies = [ "bindgen", "glob", @@ -790,16 +790,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" [[package]] -name = "xml-rs" -version = "0.8.26" +name = "xml" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62ce76d9b56901b19a74f19431b0d8b3bc7ca4ad685a746dfd78ca8f4fc6bda" +checksum = "636f85e5ca6488e96401b61eb7de54f4e44755c988af0f52cf90230c312a1a89" [[package]] name = "xmltree" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b619f8c85654798007fb10afa5125590b43b088c225a25fc2fec100a9fad0fc6" +checksum = "cbc04313cab124e498ab1724e739720807b6dc405b9ed0edc5860164d2e4ff70" dependencies = [ - "xml-rs", + "xml", ] diff --git a/docker/Dockerfile b/docker/Dockerfile index 4ea3d41..9d9c4b5 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -45,7 +45,7 @@ ENV PATH=/root/.cargo/bin:$PATH ENV SEL4_INSTALL_DIR=/opt/seL4 -RUN git clone --branch 14.0.0 https://github.com/seL4/seL4.git +RUN git clone --branch 15.0.0 https://github.com/seL4/seL4.git RUN set -eux; \ cd seL4; \ @@ -68,7 +68,7 @@ RUN set -eux; \ RUN set -eux; \ url="https://github.com/seL4/rust-sel4"; \ - rev="2c9786744900433f37e803c25ab208835a802cf3"; \ + rev="7a2321f2d84310ba7a09fe7f5988e6dcecde3566"; \ common_args="--git $url --rev $rev --root $SEL4_INSTALL_DIR"; \ CC_aarch64_unknown_none=aarch64-linux-gnu-gcc \ SEL4_PREFIX=$SEL4_INSTALL_DIR \ diff --git a/rust-toolchain.toml b/rust-toolchain.toml index eb169ee..a22b4ce 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -5,5 +5,5 @@ # [toolchain] -channel = "nightly-2025-10-20" +channel = "nightly-2026-03-18" components = [ "rustfmt", "rust-src", "rustc-dev", "llvm-tools-preview", "rust-analyzer" ] diff --git a/support/targets/aarch64-sel4.json b/support/targets/aarch64-sel4.json index 1727389..0235b26 100644 --- a/support/targets/aarch64-sel4.json +++ b/support/targets/aarch64-sel4.json @@ -2,9 +2,10 @@ "arch": "aarch64", "crt-objects-fallback": "false", "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128-Fn32", + "default-uwtable": true, "disable-redzone": true, "exe-suffix": ".elf", - "features": "+v8a,+strict-align,+neon,+fp-armv8", + "features": "+v8a,+strict-align,+neon", "has-thread-local": true, "linker": "rust-lld", "linker-flavor": "gnu-lld",