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

Use the panic=abort option instead of -Z no-landing-pads

Browse Source 
(cherry picked from commit 725c452157)
This commit is contained in:
Philipp Oppermann
2016-05-29 18:00:29 +02:00
parent 20f7e5472b
commit 69b22d1fc0
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Cargo.toml
View File

@@ -22,3 +22,9 @@ version = "0.7.0"
[lib] [lib]
crate-type = ["staticlib"] crate-type = ["staticlib"]
[profile.dev]
panic = "abort"
[profile.release]
panic = "abort"

2
Makefile
View File

@@ -49,7 +49,7 @@ $(kernel): cargo $(rust_os) $(assembly_object_files) $(linker_script)
@ld -n --gc-sections -T $(linker_script) -o $(kernel) $(assembly_object_files) $(rust_os) @ld -n --gc-sections -T $(linker_script) -o $(kernel) $(assembly_object_files) $(rust_os)
cargo: cargo:
@cargo rustc --target $(target) -- -Z no-landing-pads @cargo build --target $(target)
# compile assembly files # compile assembly files
build/arch/$(arch)/%.o: src/arch/$(arch)/%.asm build/arch/$(arch)/%.o: src/arch/$(arch)/%.asm