diff options
| author | bors <bors@rust-lang.org> | 2023-08-15 08:50:35 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-08-15 08:50:35 +0000 |
| commit | fd9525adb072543cbd9389938c1632068aa8eb9c (patch) | |
| tree | e92d818e4f5ebda66bb503ac8b6ce7048a9a73b3 | |
| parent | a32978a5e8a3c34bb5caa1175f7404c2ede019b6 (diff) | |
| parent | 815868d803a73d06516f8e35fe6e38b52b92043b (diff) | |
| download | rust-fd9525adb072543cbd9389938c1632068aa8eb9c.tar.gz rust-fd9525adb072543cbd9389938c1632068aa8eb9c.zip | |
Auto merge of #114717 - loongarch-rs:rust-lld, r=b-naber
Switch to LLD as default linker for loongarch64-unknown-none* The [LLD already supports LoongArch](https://github.com/rust-lang/llvm-project/commit/6084ee742064cf8121444febee342133b0cb7abd), it's time to switch to LLD as default linker for `loongarch64-unknown-none*`.
| -rw-r--r-- | compiler/rustc_target/src/spec/loongarch64_unknown_none.rs | 3 | ||||
| -rw-r--r-- | compiler/rustc_target/src/spec/loongarch64_unknown_none_softfloat.rs | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/compiler/rustc_target/src/spec/loongarch64_unknown_none.rs b/compiler/rustc_target/src/spec/loongarch64_unknown_none.rs index 209d481d6f8..dbc96d68eae 100644 --- a/compiler/rustc_target/src/spec/loongarch64_unknown_none.rs +++ b/compiler/rustc_target/src/spec/loongarch64_unknown_none.rs @@ -10,7 +10,8 @@ pub fn target() -> Target { options: TargetOptions { cpu: "generic".into(), features: "+f,+d".into(), - linker_flavor: LinkerFlavor::Gnu(Cc::No, Lld::No), + linker_flavor: LinkerFlavor::Gnu(Cc::No, Lld::Yes), + linker: Some("rust-lld".into()), llvm_abiname: "lp64d".into(), max_atomic_width: Some(64), relocation_model: RelocModel::Static, diff --git a/compiler/rustc_target/src/spec/loongarch64_unknown_none_softfloat.rs b/compiler/rustc_target/src/spec/loongarch64_unknown_none_softfloat.rs index f444a7f24bb..c4d5c7bc44c 100644 --- a/compiler/rustc_target/src/spec/loongarch64_unknown_none_softfloat.rs +++ b/compiler/rustc_target/src/spec/loongarch64_unknown_none_softfloat.rs @@ -11,7 +11,8 @@ pub fn target() -> Target { cpu: "generic".into(), features: "-f,-d".into(), abi: "softfloat".into(), - linker_flavor: LinkerFlavor::Gnu(Cc::No, Lld::No), + linker_flavor: LinkerFlavor::Gnu(Cc::No, Lld::Yes), + linker: Some("rust-lld".into()), llvm_abiname: "lp64s".into(), max_atomic_width: Some(64), relocation_model: RelocModel::Static, |