diff options
| author | bors <bors@rust-lang.org> | 2021-02-13 02:46:57 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-02-13 02:46:57 +0000 |
| commit | 21cbbdc44de84e3ea99bca239091e5d1c49af654 (patch) | |
| tree | c971608c75fc98dd65787e909375c93744b563da /compiler/rustc_codegen_ssa/src/back | |
| parent | 3f5aee2d5241139d808f4fdece0026603489afd1 (diff) | |
| parent | 1ef566fc7c72a5e15ffd54334c744b6638b24374 (diff) | |
| download | rust-21cbbdc44de84e3ea99bca239091e5d1c49af654.tar.gz rust-21cbbdc44de84e3ea99bca239091e5d1c49af654.zip | |
Auto merge of #82045 - Dylan-DPC:rollup-244l0sb, r=Dylan-DPC
Rollup of 10 pull requests Successful merges: - #79775 (Fix injected errors when running doctests on a crate named after a keyword) - #81012 (Stabilize the partition_point feature) - #81479 (Allow casting mut array ref to mut ptr) - #81506 (HWAddressSanitizer support) - #81741 (Increment `self.index` before calling `Iterator::self.a.__iterator_ge…) - #81850 (use RWlock when accessing os::env) - #81911 (GAT/const_generics: Allow with_opt_const_param to return GAT param def_id) - #82022 (Push a `char` instead of a `str` with len one into a String) - #82023 (Remove unnecessary lint allow attrs on example) - #82030 (Use `Iterator::all` instead of open-coding it) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_ssa/src/back')
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/back/link.rs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs index 8bc4e644223..6c58417590e 100644 --- a/compiler/rustc_codegen_ssa/src/back/link.rs +++ b/compiler/rustc_codegen_ssa/src/back/link.rs @@ -893,6 +893,9 @@ fn link_sanitizers(sess: &Session, crate_type: CrateType, linker: &mut dyn Linke if sanitizer.contains(SanitizerSet::THREAD) { link_sanitizer_runtime(sess, linker, "tsan"); } + if sanitizer.contains(SanitizerSet::HWADDRESS) { + link_sanitizer_runtime(sess, linker, "hwasan"); + } } fn link_sanitizer_runtime(sess: &Session, linker: &mut dyn Linker, name: &str) { |