From 86b437d8d172125801fd3c22d975075ee4b51ccc Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Tue, 21 Jul 2026 16:43:59 +0000 Subject: [PATCH 1/2] Update examples to `x86_64` v0.15 --- example-kernel-built-in-target/Cargo.lock | 17 ++++++++++++----- example-kernel-built-in-target/Cargo.toml | 2 +- example-kernels/Cargo.lock | 15 +++++++++++---- example-kernels/basic/Cargo.toml | 2 +- example-kernels/runner-doctest/Cargo.toml | 2 +- example-kernels/runner-fail-reboot/Cargo.toml | 2 +- example-kernels/runner-test/Cargo.toml | 2 +- example-kernels/runner/Cargo.toml | 2 +- 8 files changed, 29 insertions(+), 15 deletions(-) diff --git a/example-kernel-built-in-target/Cargo.lock b/example-kernel-built-in-target/Cargo.lock index 527c5e2..530d200 100644 --- a/example-kernel-built-in-target/Cargo.lock +++ b/example-kernel-built-in-target/Cargo.lock @@ -16,12 +16,18 @@ checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af" [[package]] name = "bootloader" -version = "0.9.34" +version = "0.9.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13f6a8a495d2f93fe3d6eb3a224f9aa749a63cfd746ed03eb5ddcbd00ade7d8f" +checksum = "e22d5a0b9e11dd5bee9d24a68885de6dc7ed367f897323b1c1286150fd469374" [[package]] -name = "built-in-target" +name = "const_fn" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413d67b29ef1021b4d60f4aa1e925ca031751e213832b4b1d588fae623c05c60" + +[[package]] +name = "example-kernel-built-in-target" version = "0.1.0" dependencies = [ "bootloader", @@ -42,12 +48,13 @@ checksum = "442887c63f2c839b346c192d047a7c87e73d0689c9157b00b53dcc27dd5ea793" [[package]] name = "x86_64" -version = "0.14.13" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c101112411baafbb4bf8d33e4c4a80ab5b02d74d2612331c61e8192fc9710491" +checksum = "be4ec631e1a81d50e46c35a4a00322bd076c47491b64c2fb10a7ffa89002c697" dependencies = [ "bit_field", "bitflags", + "const_fn", "rustversion", "volatile", ] diff --git a/example-kernel-built-in-target/Cargo.toml b/example-kernel-built-in-target/Cargo.toml index 4664912..1a0d009 100644 --- a/example-kernel-built-in-target/Cargo.toml +++ b/example-kernel-built-in-target/Cargo.toml @@ -5,4 +5,4 @@ edition = "2018" [dependencies] bootloader = "0.9.7" -x86_64 = "0.14.1" +x86_64 = "0.15" diff --git a/example-kernels/Cargo.lock b/example-kernels/Cargo.lock index eefb175..71922cb 100644 --- a/example-kernels/Cargo.lock +++ b/example-kernels/Cargo.lock @@ -24,9 +24,15 @@ checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af" [[package]] name = "bootloader" -version = "0.9.34" +version = "0.9.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13f6a8a495d2f93fe3d6eb3a224f9aa749a63cfd746ed03eb5ddcbd00ade7d8f" +checksum = "e22d5a0b9e11dd5bee9d24a68885de6dc7ed367f897323b1c1286150fd469374" + +[[package]] +name = "const_fn" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413d67b29ef1021b4d60f4aa1e925ca031751e213832b4b1d588fae623c05c60" [[package]] name = "rlibc" @@ -83,12 +89,13 @@ checksum = "442887c63f2c839b346c192d047a7c87e73d0689c9157b00b53dcc27dd5ea793" [[package]] name = "x86_64" -version = "0.14.13" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c101112411baafbb4bf8d33e4c4a80ab5b02d74d2612331c61e8192fc9710491" +checksum = "be4ec631e1a81d50e46c35a4a00322bd076c47491b64c2fb10a7ffa89002c697" dependencies = [ "bit_field", "bitflags", + "const_fn", "rustversion", "volatile", ] diff --git a/example-kernels/basic/Cargo.toml b/example-kernels/basic/Cargo.toml index 5a9a509..99833fa 100644 --- a/example-kernels/basic/Cargo.toml +++ b/example-kernels/basic/Cargo.toml @@ -6,4 +6,4 @@ edition = "2018" [dependencies] bootloader = "0.9.7" -x86_64 = "0.14.1" +x86_64 = "0.15" diff --git a/example-kernels/runner-doctest/Cargo.toml b/example-kernels/runner-doctest/Cargo.toml index ff240ec..ba4a830 100644 --- a/example-kernels/runner-doctest/Cargo.toml +++ b/example-kernels/runner-doctest/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" [dependencies] bootloader = "0.9.7" -x86_64 = "0.14.1" +x86_64 = "0.15" rlibc = "1.0.0" [package.metadata.bootimage] diff --git a/example-kernels/runner-fail-reboot/Cargo.toml b/example-kernels/runner-fail-reboot/Cargo.toml index c15f396..ce140a0 100644 --- a/example-kernels/runner-fail-reboot/Cargo.toml +++ b/example-kernels/runner-fail-reboot/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" [dependencies] bootloader = "0.9.7" -x86_64 = "0.14.1" +x86_64 = "0.15" rlibc = "1.0.0" [package.metadata.bootimage] diff --git a/example-kernels/runner-test/Cargo.toml b/example-kernels/runner-test/Cargo.toml index 83bcb52..08b0b5a 100644 --- a/example-kernels/runner-test/Cargo.toml +++ b/example-kernels/runner-test/Cargo.toml @@ -10,7 +10,7 @@ harness = false [dependencies] bootloader = "0.9.7" -x86_64 = "0.14.1" +x86_64 = "0.15" rlibc = "1.0.0" [package.metadata.bootimage] diff --git a/example-kernels/runner/Cargo.toml b/example-kernels/runner/Cargo.toml index 17d0be9..e18d43f 100644 --- a/example-kernels/runner/Cargo.toml +++ b/example-kernels/runner/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" [dependencies] bootloader = "0.9.7" -x86_64 = "0.14.1" +x86_64 = "0.15" [package.metadata.bootimage] run-args = ["-device", "isa-debug-exit,iobase=0xf4,iosize=0x04", "-display", "none"] From 21b2e4ecff6acfa7ac7143b957afdc9e7f9a93ff Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Tue, 21 Jul 2026 16:44:31 +0000 Subject: [PATCH 2/2] Fix example kernel custom target: `x86-softfloat` ABI is now just `softfloat` --- example-kernels/x86_64-bootimage-example-kernels.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example-kernels/x86_64-bootimage-example-kernels.json b/example-kernels/x86_64-bootimage-example-kernels.json index 4b172a6..4d24793 100644 --- a/example-kernels/x86_64-bootimage-example-kernels.json +++ b/example-kernels/x86_64-bootimage-example-kernels.json @@ -12,5 +12,5 @@ "panic-strategy": "abort", "disable-redzone": true, "features": "-mmx,-sse,+soft-float", - "rustc-abi": "x86-softfloat" + "rustc-abi": "softfloat" }