bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rm target specific logic in link_sanitizer_runtime

Browse source
This commit is contained in:
Simonas Kazlauskas 2021-02-15 03:17:50 +02:00
parent a3c0f0a3df
commit 41875c82c7
1 changed files with 14 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

36
compiler/rustc_codegen_ssa/src/back/link.rs
View file

@ -922,28 +922,20 @@ fn link_sanitizer_runtime(sess: &Session, linker: &mut dyn Linker, name: &str) {
.map(|channel| format!("-{}", channel)) .map(|channel| format!("-{}", channel))
.unwrap_or_default(); .unwrap_or_default();
match sess.opts.target_triple.triple() { if sess.target.is_like_osx {
"aarch64-apple-darwin" | "x86_64-apple-darwin" => { // On Apple platforms, the sanitizer is always built as a dylib, and
// On Apple platforms, the sanitizer is always built as a dylib, and // LLVM will link to `@rpath/*.dylib`, so we need to specify an
// LLVM will link to `@rpath/*.dylib`, so we need to specify an // rpath to the library as well (the rpath should be absolute, see
// rpath to the library as well (the rpath should be absolute, see // PR #41352 for details).
// PR #41352 for details). let filename = format!("rustc{}_rt.{}", channel, name);
let filename = format!("rustc{}_rt.{}", channel, name); let path = find_sanitizer_runtime(&sess, &filename);
let path = find_sanitizer_runtime(&sess, &filename); let rpath = path.to_str().expect("non-utf8 component in path");
let rpath = path.to_str().expect("non-utf8 component in path"); linker.args(&["-Wl,-rpath", "-Xlinker", rpath]);
linker.args(&["-Wl,-rpath", "-Xlinker", rpath]); linker.link_dylib(Symbol::intern(&filename));
linker.link_dylib(Symbol::intern(&filename)); } else {
} let filename = format!("librustc{}_rt.{}.a", channel, name);
"aarch64-fuchsia" let path = find_sanitizer_runtime(&sess, &filename).join(&filename);
| "aarch64-unknown-linux-gnu" linker.link_whole_rlib(&path);
| "x86_64-fuchsia"
| "x86_64-unknown-freebsd"
| "x86_64-unknown-linux-gnu" => {
let filename = format!("librustc{}_rt.{}.a", channel, name);
let path = find_sanitizer_runtime(&sess, &filename).join(&filename);
linker.link_whole_rlib(&path);
}
_ => {}
} }
} }