diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 53de4a22..9303e1e7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -51,7 +51,7 @@ jobs: KERNEL_MANIFEST: "test-kernel/Cargo.toml" - name: 'Convert Bootloader ELF to Binary' - run: cargo objcopy -- -I elf64-x86-64 -O binary --binary-architecture=i386:x86-64 target/x86_64-bootloader/release/bootloader target/x86_64-bootloader/release/bootloader.bin + run: rust-objcopy -I elf64-x86-64 -O binary --binary-architecture=i386:x86-64 target/x86_64-bootloader/release/bootloader target/x86_64-bootloader/release/bootloader.bin # install QEMU - name: Install QEMU (Linux) diff --git a/Changelog.md b/Changelog.md index 9cccee57..666a532f 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,5 +1,7 @@ # Unreleased +- change `rustc-abi` in custom targets from `x86-softfloat` to `softfloat`, following [rust-lang/rust#157151](https://github.com/rust-lang/rust/pull/157151) + # 0.9.34 – 2026-02-01 This release is compatible with Rust nightlies starting with `nightly-2026-02-01`. diff --git a/example-kernel/x86_64-example-kernel.json b/example-kernel/x86_64-example-kernel.json index 4b172a61..4d247937 100644 --- a/example-kernel/x86_64-example-kernel.json +++ b/example-kernel/x86_64-example-kernel.json @@ -12,5 +12,5 @@ "panic-strategy": "abort", "disable-redzone": true, "features": "-mmx,-sse,+soft-float", - "rustc-abi": "x86-softfloat" + "rustc-abi": "softfloat" } diff --git a/test-kernel/x86_64-test-kernel.json b/test-kernel/x86_64-test-kernel.json index 4b172a61..4d247937 100644 --- a/test-kernel/x86_64-test-kernel.json +++ b/test-kernel/x86_64-test-kernel.json @@ -12,5 +12,5 @@ "panic-strategy": "abort", "disable-redzone": true, "features": "-mmx,-sse,+soft-float", - "rustc-abi": "x86-softfloat" + "rustc-abi": "softfloat" } diff --git a/x86_64-bootloader.json b/x86_64-bootloader.json index 8136047a..d8f3718a 100644 --- a/x86_64-bootloader.json +++ b/x86_64-bootloader.json @@ -19,5 +19,5 @@ "panic-strategy": "abort", "executables": true, "relocation-model": "static", - "rustc-abi": "x86-softfloat" + "rustc-abi": "softfloat" }