bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Explain why libatomic is not needed on FreeBSD riscv64

Browse source 
From Jessica Clarke (jrtc27@)
This commit is contained in:
Tobias Kortkamp 2021-12-03 18:48:53 +01:00
parent 47474f1055
commit e24045e587
No known key found for this signature in database
GPG key ID: F4815C5F893E655D
2 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compiler/rustc_llvm/build.rs
View file

@ -276,7 +276,10 @@ fn main() {
"stdc++" "stdc++"
}; };
// RISC-V requires libatomic for sub-word atomic operations // RISC-V GCC erroneously requires libatomic for sub-word
// atomic operations. FreeBSD uses Clang as its system
// compiler and provides no libatomic in its base system so
// does not want this.
if !target.contains("freebsd") && target.starts_with("riscv") { if !target.contains("freebsd") && target.starts_with("riscv") {
println!("cargo:rustc-link-lib=atomic"); println!("cargo:rustc-link-lib=atomic");
} }

9
src/bootstrap/native.rs
View file

@ -250,8 +250,13 @@ impl Step for Llvm {
} }
if !target.contains("freebsd") && target.starts_with("riscv") { if !target.contains("freebsd") && target.starts_with("riscv") {
// In RISC-V, using C++ atomics require linking to `libatomic` but the LLVM build // RISC-V GCC erroneously requires linking against
// system check cannot detect this. Therefore it is set manually here. // `libatomic` when using 1-byte and 2-byte C++
// atomics but the LLVM build system check cannot
// detect this. Therefore it is set manually here.
// FreeBSD uses Clang as its system compiler and
// provides no libatomic in its base system so does
// not want this.
if !builder.config.llvm_tools_enabled { if !builder.config.llvm_tools_enabled {
cfg.define("CMAKE_EXE_LINKER_FLAGS", "-latomic"); cfg.define("CMAKE_EXE_LINKER_FLAGS", "-latomic");
} else { } else {