diff options
| author | bors <bors@rust-lang.org> | 2021-08-01 14:16:37 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-08-01 14:16:37 +0000 |
| commit | 2e9c8705e94826da6aebe46512b4e3bbfc9e008f (patch) | |
| tree | 6f424dfb2c1060a7e552a4da02f0d8854ea2a150 | |
| parent | 8d57c0ab2b2e1aae07c1b8638358fb7a909940bc (diff) | |
| parent | 4258e937f671fbabbc11d55505388f220a7a21ab (diff) | |
| download | rust-2e9c8705e94826da6aebe46512b4e3bbfc9e008f.tar.gz rust-2e9c8705e94826da6aebe46512b4e3bbfc9e008f.zip | |
Auto merge of #87664 - devnexen:netbsd_sanitizers_support, r=nagisa
netbsd x86_64 arch enable supported sanitizers.
| -rw-r--r-- | compiler/rustc_target/src/spec/x86_64_unknown_netbsd.rs | 4 | ||||
| -rw-r--r-- | src/bootstrap/native.rs | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/compiler/rustc_target/src/spec/x86_64_unknown_netbsd.rs b/compiler/rustc_target/src/spec/x86_64_unknown_netbsd.rs index 0269c7afe55..9ba86280d51 100644 --- a/compiler/rustc_target/src/spec/x86_64_unknown_netbsd.rs +++ b/compiler/rustc_target/src/spec/x86_64_unknown_netbsd.rs @@ -1,4 +1,4 @@ -use crate::spec::{LinkerFlavor, StackProbeType, Target, TargetOptions}; +use crate::spec::{LinkerFlavor, SanitizerSet, StackProbeType, Target, TargetOptions}; pub fn target() -> Target { let mut base = super::netbsd_base::opts(); @@ -7,6 +7,8 @@ pub fn target() -> Target { base.pre_link_args.entry(LinkerFlavor::Gcc).or_default().push("-m64".to_string()); // don't use probe-stack=inline-asm until rust#83139 and rust#84667 are resolved base.stack_probes = StackProbeType::Call; + base.supported_sanitizers = + SanitizerSet::ADDRESS | SanitizerSet::LEAK | SanitizerSet::MEMORY | SanitizerSet::THREAD; Target { llvm_target: "x86_64-unknown-netbsd".to_string(), diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs index b8a1513f2a6..4d1ced1e249 100644 --- a/src/bootstrap/native.rs +++ b/src/bootstrap/native.rs @@ -821,6 +821,9 @@ fn supported_sanitizers( "x86_64-apple-darwin" => darwin_libs("osx", &["asan", "lsan", "tsan"]), "x86_64-fuchsia" => common_libs("fuchsia", "x86_64", &["asan"]), "x86_64-unknown-freebsd" => common_libs("freebsd", "x86_64", &["asan", "msan", "tsan"]), + "x86_64-unknown-netbsd" => { + common_libs("netbsd", "x86_64", &["asan", "lsan", "msan", "tsan"]) + } "x86_64-unknown-linux-gnu" => { common_libs("linux", "x86_64", &["asan", "lsan", "msan", "tsan"]) } |