bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #68473 - nopsledder:rust_sanitizer_fuchsia, r=alexcrichton

Browse source 
Enable ASan on Fuchsia

This change adds the x86_64-fuchsia and aarch64-fuchsia LLVM targets to
those allowed to invoke -Zsanitizer. Currently, the only overlap between
compiler_rt sanitizers supported by both rustc and Fuchsia is ASan.
This commit is contained in:
Tyler Mandry 2020-01-24 00:30:58 -08:00 • committed by GitHub
commit 94aa655a3c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/bootstrap/native.rs
View file

@ -659,6 +659,24 @@ fn supported_sanitizers(out_dir: &Path, target: Interned<String>) -> Vec<Sanitiz
}); });
} }
} }
"x86_64-fuchsia" => {
for s in &["asan"] {
result.push(SanitizerRuntime {
cmake_target: format!("clang_rt.{}-x86_64", s),
path: out_dir.join(&format!("build/lib/fuchsia/libclang_rt.{}-x86_64.a", s)),
name: format!("librustc_rt.{}.a", s),
});
}
}
"aarch64-fuchsia" => {
for s in &["asan"] {
result.push(SanitizerRuntime {
cmake_target: format!("clang_rt.{}-aarch64", s),
path: out_dir.join(&format!("build/lib/fuchsia/libclang_rt.{}-aarch64.a", s)),
name: format!("librustc_rt.{}.a", s),
});
}
}
_ => {} _ => {}
} }
result result

2
src/librustc_codegen_ssa/back/link.rs
View file

@ -777,7 +777,7 @@ fn link_sanitizer_runtime(sess: &Session, crate_type: config::CrateType, linker:
linker.args(&["-Wl,-rpath".into(), "-Xlinker".into(), rpath.into()]); linker.args(&["-Wl,-rpath".into(), "-Xlinker".into(), rpath.into()]);
linker.link_dylib(Symbol::intern(&libname)); linker.link_dylib(Symbol::intern(&libname));
} }
"x86_64-unknown-linux-gnu" => { "x86_64-unknown-linux-gnu" | "x86_64-fuchsia" | "aarch64-fuchsia" => {
let filename = format!("librustc_rt.{}.a", name); let filename = format!("librustc_rt.{}.a", name);
let path = default_tlib.join(&filename); let path = default_tlib.join(&filename);
linker.link_whole_rlib(&path); linker.link_whole_rlib(&path);

8
src/librustc_session/session.rs
View file

@ -1127,8 +1127,12 @@ fn validate_commandline_args_with_session_available(sess: &Session) {
// Sanitizers can only be used on some tested platforms. // Sanitizers can only be used on some tested platforms.
if let Some(ref sanitizer) = sess.opts.debugging_opts.sanitizer { if let Some(ref sanitizer) = sess.opts.debugging_opts.sanitizer {
const ASAN_SUPPORTED_TARGETS: &[&str] = const ASAN_SUPPORTED_TARGETS: &[&str] = &[
&["x86_64-unknown-linux-gnu", "x86_64-apple-darwin"]; "x86_64-unknown-linux-gnu",
"x86_64-apple-darwin",
"x86_64-fuchsia",
"aarch64-fuchsia",
];
const TSAN_SUPPORTED_TARGETS: &[&str] = const TSAN_SUPPORTED_TARGETS: &[&str] =
&["x86_64-unknown-linux-gnu", "x86_64-apple-darwin"]; &["x86_64-unknown-linux-gnu", "x86_64-apple-darwin"];
const LSAN_SUPPORTED_TARGETS: &[&str] = const LSAN_SUPPORTED_TARGETS: &[&str] =