From c6ea362571bd7f7bc0d36b2aa61b44e183a2d841 Mon Sep 17 00:00:00 2001 From: Tshepang Mbambo Date: Mon, 31 Oct 2022 04:23:46 +0200 Subject: [PATCH 1/2] remove obsolete comment --- src/bootstrap/bin/rustc.rs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/bootstrap/bin/rustc.rs b/src/bootstrap/bin/rustc.rs index 776d73b98c4f1..76a3e5f08b16c 100644 --- a/src/bootstrap/bin/rustc.rs +++ b/src/bootstrap/bin/rustc.rs @@ -97,10 +97,6 @@ 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. - // - // `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 == Some("panic_abort") || crate_name == Some("compiler_builtins") && stage != "0" { From b21674f3bdca0083e7802842d282f64ee30080fb Mon Sep 17 00:00:00 2001 From: Tshepang Mbambo Date: Fri, 25 Nov 2022 16:28:18 +0200 Subject: [PATCH 2/2] remove unused code --- src/bootstrap/bin/rustc.rs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/bootstrap/bin/rustc.rs b/src/bootstrap/bin/rustc.rs index 76a3e5f08b16c..1d5260228121b 100644 --- a/src/bootstrap/bin/rustc.rs +++ b/src/bootstrap/bin/rustc.rs @@ -97,9 +97,7 @@ 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 == Some("panic_abort") - || crate_name == Some("compiler_builtins") && stage != "0" - { + if crate_name == Some("panic_abort") { cmd.arg("-C").arg("panic=abort"); }