Skip to content

Commit d942a88

Browse files
authored
Rollup merge of #140809 - bjorn3:panic_runtime_cleanup, r=petrochenkov
Reduce special casing for the panic runtime See the individual commits for more info.
2 parents 4921551 + 0260c66 commit d942a88

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

cargo-miri/src/setup.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ pub fn setup(
8383
SysrootConfig::NoStd
8484
} else {
8585
SysrootConfig::WithStd {
86-
std_features: ["panic_unwind", "backtrace"].into_iter().map(Into::into).collect(),
86+
std_features: ["panic-unwind", "backtrace"].into_iter().map(Into::into).collect(),
8787
}
8888
};
8989
let cargo_cmd = {

src/bin/miri.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,7 @@ impl rustc_driver::Callbacks for MiriBeRustCompilerCalls {
295295
level: SymbolExportLevel::C,
296296
kind: SymbolExportKind::Text,
297297
used: false,
298+
rustc_std_internal_symbol: false,
298299
},
299300
))
300301
} else {

0 commit comments

Comments
 (0)