81 lines
4.0 KiB
Diff
81 lines
4.0 KiB
Diff
From 687112c89c9058ef1e79f1c3a974940b1ae43ea3 Mon Sep 17 00:00:00 2001
|
|
From: Josh Stone <jistone@redhat.com>
|
|
Date: Fri, 16 Aug 2024 10:12:58 -0700
|
|
Subject: [PATCH] Use lld provided by system
|
|
|
|
---
|
|
compiler/rustc_target/src/spec/base/wasm.rs | 3 +--
|
|
.../src/spec/targets/aarch64_unknown_none_softfloat.rs | 2 +-
|
|
compiler/rustc_target/src/spec/targets/aarch64_unknown_uefi.rs | 1 +
|
|
compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs | 2 +-
|
|
compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs | 1 +
|
|
5 files changed, 5 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/compiler/rustc_target/src/spec/base/wasm.rs b/compiler/rustc_target/src/spec/base/wasm.rs
|
|
index 81b96cd39ffa..4c9916af826b 100644
|
|
--- a/compiler/rustc_target/src/spec/base/wasm.rs
|
|
+++ b/compiler/rustc_target/src/spec/base/wasm.rs
|
|
@@ -85,8 +85,7 @@ macro_rules! args {
|
|
// arguments just yet
|
|
limit_rdylib_exports: false,
|
|
|
|
- // we use the LLD shipped with the Rust toolchain by default
|
|
- linker: Some("rust-lld".into()),
|
|
+ linker: Some("lld".into()),
|
|
linker_flavor: LinkerFlavor::WasmLld(Cc::No),
|
|
|
|
pre_link_args,
|
|
diff --git a/compiler/rustc_target/src/spec/targets/aarch64_unknown_none_softfloat.rs b/compiler/rustc_target/src/spec/targets/aarch64_unknown_none_softfloat.rs
|
|
index 3b719ebaf07e..8b4fecee68f0 100644
|
|
--- a/compiler/rustc_target/src/spec/targets/aarch64_unknown_none_softfloat.rs
|
|
+++ b/compiler/rustc_target/src/spec/targets/aarch64_unknown_none_softfloat.rs
|
|
@@ -15,7 +15,7 @@ pub(crate) fn target() -> Target {
|
|
let opts = TargetOptions {
|
|
abi: "softfloat".into(),
|
|
linker_flavor: LinkerFlavor::Gnu(Cc::No, Lld::Yes),
|
|
- linker: Some("rust-lld".into()),
|
|
+ linker: Some("lld".into()),
|
|
features: "+v8a,+strict-align,-neon,-fp-armv8".into(),
|
|
relocation_model: RelocModel::Static,
|
|
disable_redzone: true,
|
|
diff --git a/compiler/rustc_target/src/spec/targets/aarch64_unknown_uefi.rs b/compiler/rustc_target/src/spec/targets/aarch64_unknown_uefi.rs
|
|
index 9656024ddaa1..2099fa17229f 100644
|
|
--- a/compiler/rustc_target/src/spec/targets/aarch64_unknown_uefi.rs
|
|
+++ b/compiler/rustc_target/src/spec/targets/aarch64_unknown_uefi.rs
|
|
@@ -9,6 +9,7 @@ pub(crate) fn target() -> Target {
|
|
base.max_atomic_width = Some(128);
|
|
base.add_pre_link_args(LinkerFlavor::Msvc(Lld::No), &["/machine:arm64"]);
|
|
base.features = "+v8a".into();
|
|
+ base.linker = Some("lld".into());
|
|
|
|
Target {
|
|
llvm_target: "aarch64-unknown-windows".into(),
|
|
diff --git a/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs
|
|
index e14a36735894..b493d7d98b46 100644
|
|
--- a/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs
|
|
+++ b/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs
|
|
@@ -19,7 +19,7 @@ pub(crate) fn target() -> Target {
|
|
static_position_independent_executables: true,
|
|
relro_level: RelroLevel::Full,
|
|
linker_flavor: LinkerFlavor::Gnu(Cc::No, Lld::Yes),
|
|
- linker: Some("rust-lld".into()),
|
|
+ linker: Some("lld".into()),
|
|
rustc_abi: Some(RustcAbi::X86Softfloat),
|
|
features: "-mmx,-sse,-sse2,-sse3,-ssse3,-sse4.1,-sse4.2,-avx,-avx2,+soft-float".into(),
|
|
supported_sanitizers: SanitizerSet::KCFI | SanitizerSet::KERNELADDRESS,
|
|
diff --git a/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs
|
|
index bce6aa0ebc6b..7fa1148a1de7 100644
|
|
--- a/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs
|
|
+++ b/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs
|
|
@@ -14,6 +14,7 @@ pub(crate) fn target() -> Target {
|
|
base.plt_by_default = false;
|
|
base.max_atomic_width = Some(64);
|
|
base.entry_abi = Conv::X86_64Win64;
|
|
+ base.linker = Some("lld".into());
|
|
|
|
// We disable MMX and SSE for now, even though UEFI allows using them. Problem is, you have to
|
|
// enable these CPU features explicitly before their first use, otherwise their instructions
|
|
--
|
|
2.48.1
|
|
|