nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-25 16:24:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #75472 - Mark-Simulacrum:mangling-config, r=eddyb

Browse Source 
Add option to use the new symbol mangling in rustc/std

I don't know if this causes problems in some cases -- maybe it should be on by default for at least rustc. I've never encountered problems with it other than tools not supporting it, though.

cc @nnethercote
r? @eddyb
This commit is contained in:
bors 2020-08-16 16:58:13 +00:00
commit 009551f758
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config.toml.example
View File

@ -475,6 +475,10 @@
# This only applies from stage 1 onwards, and only for Windows targets. # This only applies from stage 1 onwards, and only for Windows targets.
#control-flow-guard = false #control-flow-guard = false
# Enable symbol-mangling-version v0. This can be helpful when profiling rustc,
# as generics will be preserved in symbols (rather than erased into opaque T).
#new-symbol-mangling = false
# ============================================================================= # =============================================================================
# Options for specific targets # Options for specific targets
# #

4
src/bootstrap/builder.rs
View File

@ -859,6 +859,10 @@ impl<'a> Builder<'a> {
rustflags.arg("--cfg=bootstrap"); rustflags.arg("--cfg=bootstrap");
} }
if self.config.rust_new_symbol_mangling {
rustflags.arg("-Zsymbol-mangling-version=v0");
}
// FIXME: It might be better to use the same value for both `RUSTFLAGS` and `RUSTDOCFLAGS`, // FIXME: It might be better to use the same value for both `RUSTFLAGS` and `RUSTDOCFLAGS`,
// but this breaks CI. At the very least, stage0 `rustdoc` needs `--cfg bootstrap`. See // but this breaks CI. At the very least, stage0 `rustdoc` needs `--cfg bootstrap`. See
// #71458. // #71458.

3
src/bootstrap/config.rs
View File

@ -112,6 +112,7 @@ pub struct Config {
pub rust_verify_llvm_ir: bool, pub rust_verify_llvm_ir: bool,
pub rust_thin_lto_import_instr_limit: Option<u32>, pub rust_thin_lto_import_instr_limit: Option<u32>,
pub rust_remap_debuginfo: bool, pub rust_remap_debuginfo: bool,
pub rust_new_symbol_mangling: bool,
pub build: TargetSelection, pub build: TargetSelection,
pub hosts: Vec<TargetSelection>, pub hosts: Vec<TargetSelection>,
@ -410,6 +411,7 @@ struct Rust {
test_compare_mode: Option<bool>, test_compare_mode: Option<bool>,
llvm_libunwind: Option<bool>, llvm_libunwind: Option<bool>,
control_flow_guard: Option<bool>, control_flow_guard: Option<bool>,
new_symbol_mangling: Option<bool>,
} }
/// TOML representation of how each build target is configured. /// TOML representation of how each build target is configured.
@ -637,6 +639,7 @@ impl Config {
debuginfo_level_tests = rust.debuginfo_level_tests; debuginfo_level_tests = rust.debuginfo_level_tests;
optimize = rust.optimize; optimize = rust.optimize;
ignore_git = rust.ignore_git; ignore_git = rust.ignore_git;
set(&mut config.rust_new_symbol_mangling, rust.new_symbol_mangling);
set(&mut config.rust_optimize_tests, rust.optimize_tests); set(&mut config.rust_optimize_tests, rust.optimize_tests);
set(&mut config.codegen_tests, rust.codegen_tests); set(&mut config.codegen_tests, rust.codegen_tests);
set(&mut config.rust_rpath, rust.rpath); set(&mut config.rust_rpath, rust.rpath);