Commit fd86cbb

authored

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 fd86cbbCopy full SHA for fd86cbb

File tree

-22

lines changed

-22

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1408,7 +1408,7 @@ impl Options {`
`1408`	`1408`	`}`
`1409`	`1409`
`1410`	`1410`	`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)`
`1412`	`1412`	`}`
`1413`	`1413`	`}`
`1414`	`1414`

Lines changed: 1 addition & 21 deletions

Original file line number	Diff line number	Diff line change
`@@ -578,22 +578,6 @@ impl Builder<'_> {`
`578`	`578`	`rustflags.arg(sysroot_str);`
`579`	`579`	`}`
`580`	`580`
`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`		`-`
`597`	`581`	`// By default, windows-rs depends on a native library that doesn't get copied into the`
`598`	`582`	`// sysroot. Passing this cfg enables raw-dylib support instead, which makes the native`
`599`	`583`	`// library unnecessary. This can be removed when windows-rs enables raw-dylib`
`@@ -602,11 +586,7 @@ impl Builder<'_> {`
`602`	`586`	`rustflags.arg("--cfg=windows_raw_dylib");`
`603`	`587`	`}`
`604`	`588`
`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");`
`610`	`590`
`611`	`591`	// FIXME: the following components don't build with `-Zrandomize-layout` yet:
`612`	`592`	`// - rust-analyzer, due to the rowan crate`

Comments

(0)