Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Compile compiler_builtins with abort panic strategy
  • Loading branch information
petrochenkov committed Jul 15, 2017
1 parent 086eaa7 commit 5f37110
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
7 changes: 6 additions & 1 deletion src/bootstrap/bin/rustc.rs
Expand Up @@ -150,7 +150,12 @@ fn main() {
// This... is a bit of a hack how we detect this. Ideally this
// information should be encoded in the crate I guess? Would likely
// require an RFC amendment to RFC 1513, however.
if crate_name == "panic_abort" {
//
// `compiler_builtins` are unconditionally compiled with panic=abort to
// workaround undefined references to `rust_eh_unwind_resume` generated
// otherwise, see issue https://github.com/rust-lang/rust/issues/43095.
if crate_name == "panic_abort" ||
crate_name == "compiler_builtins" && stage != "0" {
cmd.arg("-C").arg("panic=abort");
}

Expand Down
3 changes: 2 additions & 1 deletion src/librustc/middle/dependency_format.rs
Expand Up @@ -396,7 +396,8 @@ fn verify_ok<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, list: &[Linkage]) {
}
let cnum = CrateNum::new(i + 1);
let found_strategy = sess.cstore.panic_strategy(cnum);
if desired_strategy == found_strategy {
let is_compiler_builtins = sess.cstore.is_compiler_builtins(cnum);
if is_compiler_builtins || desired_strategy == found_strategy {
continue
}

Expand Down

0 comments on commit 5f37110

Please sign in to comment.