Skip to content

Commit f132d23

Browse files
committed
chore: upgrade rustc
1 parent aebb4c3 commit f132d23

File tree

6 files changed

+33
-26
lines changed

6 files changed

+33
-26
lines changed

docs/labs/0x01/tasks.md

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -34,22 +34,24 @@
3434

3535
```json
3636
{
37-
"llvm-target": "x86_64-unknown-none",
38-
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128",
39-
"linker-flavor": "ld.lld",
40-
"target-endian": "little",
41-
"target-pointer-width": "64",
42-
"target-c-int-width": "32",
43-
"arch": "x86_64",
44-
"os": "none",
45-
"executables": true,
46-
"linker": "rust-lld",
47-
"disable-redzone": true,
48-
"features": "-mmx,-sse,+soft-float",
49-
"panic-strategy": "abort",
50-
"pre-link-args": {
51-
"ld.lld": ["-Tpkg/kernel/config/kernel.ld", "-export-dynamic"]
52-
}
37+
"llvm-target": "x86_64-unknown-none",
38+
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128",
39+
"arch": "x86_64",
40+
"target-endian": "little",
41+
"target-pointer-width": "64",
42+
"target-c-int-width": "32",
43+
"os": "none",
44+
"executables": true,
45+
"linker-flavor": "ld.lld",
46+
"linker": "rust-lld",
47+
"panic-strategy": "abort",
48+
"disable-redzone": true,
49+
"features": "-mmx,-sse,+soft-float",
50+
"rustc-abi": "x86-softfloat",
51+
"panic-strategy": "abort",
52+
"pre-link-args": {
53+
"ld.lld": ["-Tpkg/kernel/config/kernel.ld", "-export-dynamic"]
54+
}
5355
}
5456
```
5557

docs/wiki/linux.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,10 @@ wsl --install -d Ubuntu
8888

8989
```bash
9090
$ rustc --version
91-
rustc 1.83.0 (90b35a623 2024-11-26)
91+
rustc 1.84.1 (e71f9a9a9 2025-01-27)
9292
9393
$ rustc +nightly --version
94-
rustc 1.85.0-nightly (9c707a8b7 2024-12-07)
94+
rustc 1.86.0-nightly (124cc9219 2025-02-09)
9595
9696
$ qemu-system-x86_64 --version
9797
QEMU emulator version 8.2.2 (Debian 1:8.2.2+ds-0ubuntu1.4)
@@ -107,10 +107,10 @@ GNU gdb (Ubuntu 15.0.50.20240403-0ubuntu1) 15.0.50.20240403-git
107107

108108
```bash
109109
$ rustc --version
110-
rustc 1.83.0 (90b35a623 2024-11-26)
110+
rustc 1.84.1 (e71f9a9a9 2025-01-27)
111111
112112
$ rustc +nightly --version
113-
rustc 1.85.0-nightly (9c707a8b7 2024-12-07)
113+
rustc 1.86.0-nightly (124cc9219 2025-02-09)
114114
115115
$ qemu-system-x86_64 --version
116116
QEMU emulator version 6.2.0 (Debian 1:6.2+dfsg-2ubuntu6.15)

src/0x00/pkg/boot/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ edition = "2021"
55
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
66

77
[dependencies]
8-
uefi = { version = "0.33", default-features = false }
8+
uefi = { version = "0.34", default-features = false }
99
log = "0.4"
1010

1111
[features]

src/0x01/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ bitflags = "2.3"
2424
libm = "0.2"
2525
xmas-elf = "0.9"
2626
arrayvec = { version = "0.7", default-features = false }
27-
uefi = { version = "0.33", default-features = false }
27+
uefi = { version = "0.34", default-features = false }
2828
lazy_static = { version = "1.4", features = ["spin_no_std"] }
2929

3030
# Local dependencies

src/0x01/pkg/kernel/config/x86_64-unknown-none.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
{
22
"llvm-target": "x86_64-unknown-none",
33
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128",
4-
"linker-flavor": "ld.lld",
4+
"arch": "x86_64",
55
"target-endian": "little",
66
"target-pointer-width": "64",
77
"target-c-int-width": "32",
8-
"arch": "x86_64",
98
"os": "none",
109
"executables": true,
10+
"linker-flavor": "ld.lld",
1111
"linker": "rust-lld",
12+
"panic-strategy": "abort",
1213
"disable-redzone": true,
1314
"features": "-mmx,-sse,+soft-float",
15+
"rustc-abi": "x86-softfloat",
1416
"panic-strategy": "abort",
1517
"pre-link-args": {
1618
"ld.lld": ["-Tpkg/kernel/config/kernel.ld", "-export-dynamic"]
Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
11
{
22
"llvm-target": "x86_64-unknown-ysos",
33
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128",
4-
"linker-flavor": "ld.lld",
4+
"arch": "x86_64",
55
"target-endian": "little",
66
"target-pointer-width": "64",
77
"target-c-int-width": "32",
8-
"arch": "x86_64",
98
"os": "none",
109
"executables": true,
10+
"linker-flavor": "ld.lld",
1111
"linker": "rust-lld",
12+
"panic-strategy": "abort",
1213
"disable-redzone": true,
1314
"features": "-mmx,-sse,+soft-float",
15+
"rustc-abi": "x86-softfloat",
1416
"panic-strategy": "abort",
1517
"pre-link-args": {
1618
"ld.lld": ["-Tpkg/app/config/app.ld"]
1719
}
1820
}
21+
```

0 commit comments

Comments
 (0)