Skip to content

Commit 6704389

Browse files
authored
Merge pull request #568 from rust-osdev/fix/rustc-abi-softfloat
(v0.9) Change `rustc-abi` in custom targets from `x86-softfloat` to `softfloat`
2 parents 6748c03 + ccb0ad3 commit 6704389

5 files changed

Lines changed: 6 additions & 4 deletions

File tree

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
KERNEL_MANIFEST: "test-kernel/Cargo.toml"
5252

5353
- name: 'Convert Bootloader ELF to Binary'
54-
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
54+
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
5555

5656
# install QEMU
5757
- name: Install QEMU (Linux)

Changelog.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Unreleased
22

3+
- change `rustc-abi` in custom targets from `x86-softfloat` to `softfloat`, following [rust-lang/rust#157151](https://github.com/rust-lang/rust/pull/157151)
4+
35
# 0.9.34 – 2026-02-01
46

57
This release is compatible with Rust nightlies starting with `nightly-2026-02-01`.

example-kernel/x86_64-example-kernel.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@
1212
"panic-strategy": "abort",
1313
"disable-redzone": true,
1414
"features": "-mmx,-sse,+soft-float",
15-
"rustc-abi": "x86-softfloat"
15+
"rustc-abi": "softfloat"
1616
}

test-kernel/x86_64-test-kernel.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@
1212
"panic-strategy": "abort",
1313
"disable-redzone": true,
1414
"features": "-mmx,-sse,+soft-float",
15-
"rustc-abi": "x86-softfloat"
15+
"rustc-abi": "softfloat"
1616
}

x86_64-bootloader.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@
1919
"panic-strategy": "abort",
2020
"executables": true,
2121
"relocation-model": "static",
22-
"rustc-abi": "x86-softfloat"
22+
"rustc-abi": "softfloat"
2323
}

0 commit comments

Comments
 (0)