Skip to content

Commit

Permalink
fix rust error "missing unwind resume"
Browse files Browse the repository at this point in the history
- add test code to demo issue
- disable landing pad creation on build in Makefile
  • Loading branch information
ashleygwilliams committed Nov 23, 2015
1 parent 8741e73 commit ed57033
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Makefile
Expand Up @@ -33,7 +33,7 @@ $(kernel): cargo $(rust_os) $(assembly_object_files) $(linker_script)
@ld -n --gc-sections -T $(linker_script) -o $(kernel) $(assembly_object_files) $(rust_os)

cargo:
@cargo build --target $(target)
@cargo rustc --target $(target) -- -Z no-landing-pads

build/arch/$(arch)/%.o: src/arch/$(arch)/%.asm
@mkdir -p $(shell dirname $@)
Expand Down
1 change: 1 addition & 0 deletions src/lib.rs
Expand Up @@ -7,6 +7,7 @@ extern crate rlibc;
#[no_mangle]
pub extern fn rust_main() {
let v = ["huge", "page", "long", "mode"];
let test = (0..3).flat_map(|x| 0..x).zip(0..);
}

#[lang = "eh_personality"] extern fn eh_personality() {}
Expand Down

0 comments on commit ed57033

Please sign in to comment.