michaelkuc6/blog_os
1
0
Fork 0
mirror of https://github.com/phil-opp/blog_os.git synced 2025-12-16 22:37:49 +00:00
Code Issues Projects Releases Wiki Activity

Fix: Change "panic" to "panic-strategy" (#392)

Browse Source
This commit is contained in:
Toothbrush
2018-02-20 21:10:05 +00:00
committed by Philipp Oppermann
parent 07553ed219
commit 1cdc010446
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
blog/content/second-edition/posts/02-minimal-rust-kernel/index.md
View File

@@ -143,7 +143,7 @@ Instead of using the platform's default linker (which might not support Linux ta
[LLD]: https://lld.llvm.org/ [LLD]: https://lld.llvm.org/
```json ```json
"panic": "abort", "panic-strategy": "abort",
``` ```
This setting specifies that the target doesn't support [stack unwinding] on panic, so instead the program should abort directly. This has the same effect as the `panic = "abort"` option in our Cargo.toml, so we can remove it from there. This setting specifies that the target doesn't support [stack unwinding] on panic, so instead the program should abort directly. This has the same effect as the `panic = "abort"` option in our Cargo.toml, so we can remove it from there.
@@ -189,7 +189,7 @@ Our target specification file now looks like this:
"executables": true, "executables": true,
"features": "-mmx,-sse,+soft-float", "features": "-mmx,-sse,+soft-float",
"disable-redzone": true, "disable-redzone": true,
"panic": "abort" "panic-strategy": "abort"
} }
``` ```

2
x86_64-blog_os.json
View File

@@ -11,5 +11,5 @@
"executables": true, "executables": true,
"features": "-mmx,-sse,+soft-float", "features": "-mmx,-sse,+soft-float",
"disable-redzone": true, "disable-redzone": true,
"panic": "abort" "panic-strategy": "abort"
} }