Skip to content

Commit fd86cbb

Browse files
Auto merge of #142257 - wesleywiser:test_v0_symbol_mangling, r=<try>
[Experiment] Build the standard library with -Csymbol-mangling-version=v0 r? ghost
2 parents 100199c + b3b1c67 commit fd86cbb

File tree

2 files changed

+2
-22
lines changed

2 files changed

+2
-22
lines changed

compiler/rustc_session/src/config.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1408,7 +1408,7 @@ impl Options {
14081408
}
14091409

14101410
pub fn get_symbol_mangling_version(&self) -> SymbolManglingVersion {
1411-
self.cg.symbol_mangling_version.unwrap_or(SymbolManglingVersion::Legacy)
1411+
self.cg.symbol_mangling_version.unwrap_or(SymbolManglingVersion::V0)
14121412
}
14131413
}
14141414

src/bootstrap/src/core/builder/cargo.rs

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -578,22 +578,6 @@ impl Builder<'_> {
578578
rustflags.arg(sysroot_str);
579579
}
580580

581-
let use_new_symbol_mangling = match self.config.rust_new_symbol_mangling {
582-
Some(setting) => {
583-
// If an explicit setting is given, use that
584-
setting
585-
}
586-
None => {
587-
if mode == Mode::Std {
588-
// The standard library defaults to the legacy scheme
589-
false
590-
} else {
591-
// The compiler and tools default to the new scheme
592-
true
593-
}
594-
}
595-
};
596-
597581
// By default, windows-rs depends on a native library that doesn't get copied into the
598582
// sysroot. Passing this cfg enables raw-dylib support instead, which makes the native
599583
// library unnecessary. This can be removed when windows-rs enables raw-dylib
@@ -602,11 +586,7 @@ impl Builder<'_> {
602586
rustflags.arg("--cfg=windows_raw_dylib");
603587
}
604588

605-
if use_new_symbol_mangling {
606-
rustflags.arg("-Csymbol-mangling-version=v0");
607-
} else {
608-
rustflags.arg("-Csymbol-mangling-version=legacy");
609-
}
589+
rustflags.arg("-Csymbol-mangling-version=v0");
610590

611591
// FIXME: the following components don't build with `-Zrandomize-layout` yet:
612592
// - rust-analyzer, due to the rowan crate

0 commit comments

Comments
 (0)