bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Remove support for alias -Z symbol-mangling-version

Browse source
This commit is contained in:
Zalathar 2023-11-02 17:34:05 +11:00
parent a9e1e43b56
commit 76103a8f6e
4 changed files with 13 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

1
compiler/rustc_interface/src/tests.rs
View file

@ -817,7 +817,6 @@ fn test_unstable_options_tracking_hash() {
tracked!(split_lto_unit, Some(true)); tracked!(split_lto_unit, Some(true));
tracked!(src_hash_algorithm, Some(SourceFileHashAlgorithm::Sha1)); tracked!(src_hash_algorithm, Some(SourceFileHashAlgorithm::Sha1));
tracked!(stack_protector, StackProtector::All); tracked!(stack_protector, StackProtector::All);
tracked!(symbol_mangling_version, Some(SymbolManglingVersion::V0));
tracked!(teach, true); tracked!(teach, true);
tracked!(thinlto, Some(true)); tracked!(thinlto, Some(true));
tracked!(thir_unsafeck, true); tracked!(thir_unsafeck, true);

27
compiler/rustc_session/src/config.rs
View file

@ -2674,28 +2674,19 @@ pub fn build_session_options(
); );
} }
// Handle both `-Z symbol-mangling-version` and `-C symbol-mangling-version`; the latter takes // Check for unstable values of `-C symbol-mangling-version`.
// precedence. // This is what prevents them from being used on stable compilers.
match (cg.symbol_mangling_version, unstable_opts.symbol_mangling_version) { match cg.symbol_mangling_version {
(Some(smv_c), Some(smv_z)) if smv_c != smv_z => { // Stable values:
None | Some(SymbolManglingVersion::V0) => {}
// Unstable values:
Some(SymbolManglingVersion::Legacy) => {
if !unstable_opts.unstable_options {
handler.early_error( handler.early_error(
"incompatible values passed for `-C symbol-mangling-version` \ "`-C symbol-mangling-version=legacy` requires `-Z unstable-options`",
and `-Z symbol-mangling-version`",
); );
} }
(Some(SymbolManglingVersion::V0), _) => {}
(Some(_), _) if !unstable_opts.unstable_options => {
handler
.early_error("`-C symbol-mangling-version=legacy` requires `-Z unstable-options`");
} }
(None, None) => {}
(None, smv) => {
handler.early_warn(
"`-Z symbol-mangling-version` is deprecated; use `-C symbol-mangling-version`",
);
cg.symbol_mangling_version = smv;
}
_ => {}
} }
// Check for unstable values of `-C instrument-coverage`. // Check for unstable values of `-C instrument-coverage`.

3
compiler/rustc_session/src/options.rs
View file

@ -1823,9 +1823,6 @@ written to standard error output)"),
"control if mem::uninitialized and mem::zeroed panic on more UB"), "control if mem::uninitialized and mem::zeroed panic on more UB"),
strip: Strip = (Strip::None, parse_strip, [UNTRACKED], strip: Strip = (Strip::None, parse_strip, [UNTRACKED],
"tell the linker which information to strip (`none` (default), `debuginfo` or `symbols`)"), "tell the linker which information to strip (`none` (default), `debuginfo` or `symbols`)"),
symbol_mangling_version: Option<SymbolManglingVersion> = (None,
parse_symbol_mangling_version, [TRACKED],
"which mangling version to use for symbol names ('legacy' (default) or 'v0')"),
#[rustc_lint_opt_deny_field_access("use `Session::teach` instead of this field")] #[rustc_lint_opt_deny_field_access("use `Session::teach` instead of this field")]
teach: bool = (false, parse_bool, [TRACKED], teach: bool = (false, parse_bool, [TRACKED],
"show extended diagnostic help (default: no)"), "show extended diagnostic help (default: no)"),

2
tests/run-make/crate-hash-rustc-version/Makefile
View file

@ -4,7 +4,7 @@ include ../tools.mk
# Ensure that crates compiled with different rustc versions cannot # Ensure that crates compiled with different rustc versions cannot
# be dynamically linked. # be dynamically linked.
FLAGS := -Cprefer-dynamic -Zsymbol-mangling-version=v0 FLAGS := -Cprefer-dynamic -Csymbol-mangling-version=v0
UNAME := $(shell uname) UNAME := $(shell uname)
ifeq ($(UNAME),Linux) ifeq ($(UNAME),Linux)
EXT=".so" EXT=".so"