Skip to content

Use lld by default on loongarch64-unknown-linux-gnu nightly #162546

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rust-bors merged 2 commits into from
Sep 11, 2026
Merged

Use lld by default on loongarch64-unknown-linux-gnu nightly #162546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25ee3c3
Align LoongArch64 Linux segments with GNU LD
heiher Sep 8, 2026
5fc43e8
Use lld by default on loongarch64-unknown-linux-gnu nightly
heiher Sep 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion compiler/rustc_target/src/spec/targets/loongarch64_unknown_linux_gnu.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use crate::spec::{
Arch, CodeModel, LlvmAbi, SanitizerSet, Target, TargetMetadata, TargetOptions, base,
Arch, Cc, CodeModel, LinkerFlavor, Lld, LlvmAbi, SanitizerSet, Target, TargetMetadata,
TargetOptions, base,
};

pub(crate) fn target() -> Target {
Expand All @@ -21,6 +22,10 @@ pub(crate) fn target() -> Target {
llvm_abiname: LlvmAbi::Lp64d,
max_atomic_width: Some(64),
mcount: "_mcount".into(),
pre_link_args: TargetOptions::link_args(
LinkerFlavor::Gnu(Cc::Yes, Lld::No),
&["-Wl,--no-rosegment"],
),
supported_sanitizers: SanitizerSet::ADDRESS
| SanitizerSet::CFI
| SanitizerSet::LEAK
Expand Down
7 changes: 6 additions & 1 deletion compiler/rustc_target/src/spec/targets/loongarch64_unknown_linux_musl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use crate::spec::{
Arch, CodeModel, LlvmAbi, SanitizerSet, Target, TargetMetadata, TargetOptions, base,
Arch, Cc, CodeModel, LinkerFlavor, Lld, LlvmAbi, SanitizerSet, Target, TargetMetadata,
TargetOptions, base,
};

pub(crate) fn target() -> Target {
Expand All @@ -22,6 +23,10 @@ pub(crate) fn target() -> Target {
max_atomic_width: Some(64),
mcount: "_mcount".into(),
crt_static_default: false,
pre_link_args: TargetOptions::link_args(
LinkerFlavor::Gnu(Cc::Yes, Lld::No),
&["-Wl,--no-rosegment"],
),
supported_sanitizers: SanitizerSet::ADDRESS
| SanitizerSet::CFI
| SanitizerSet::LEAK
Expand Down
7 changes: 6 additions & 1 deletion compiler/rustc_target/src/spec/targets/loongarch64_unknown_linux_ohos.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use crate::spec::{
Arch, CodeModel, LlvmAbi, SanitizerSet, Target, TargetMetadata, TargetOptions, base,
Arch, Cc, CodeModel, LinkerFlavor, Lld, LlvmAbi, SanitizerSet, Target, TargetMetadata,
TargetOptions, base,
};

pub(crate) fn target() -> Target {
Expand All @@ -21,6 +22,10 @@ pub(crate) fn target() -> Target {
llvm_abiname: LlvmAbi::Lp64d,
max_atomic_width: Some(64),
mcount: "_mcount".into(),
pre_link_args: TargetOptions::link_args(
LinkerFlavor::Gnu(Cc::Yes, Lld::No),
&["-Wl,--no-rosegment"],
),
supported_sanitizers: SanitizerSet::ADDRESS
| SanitizerSet::CFI
| SanitizerSet::LEAK
Expand Down
2 changes: 1 addition & 1 deletion src/bootstrap/src/core/config/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1125,7 +1125,7 @@ impl Config {
let is_host_system_llvm =
target_config.get(&host_target).and_then(|c| c.llvm_config.as_ref()).is_some();

for (target, linker_override) in default_linux_linker_overrides() {
for (target, linker_override) in default_linux_linker_overrides(&channel) {
// If the user overrode the default Linux linker, do not apply bootstrap defaults
if targets_with_user_linker_override.contains(&target) {
continue;
Expand Down
21 changes: 17 additions & 4 deletions src/bootstrap/src/core/config/toml/target.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,9 +130,20 @@ impl<'de> Deserialize<'de> for DefaultLinuxLinkerOverride {

/// Set of linker overrides for selected Linux targets.
#[cfg(not(test))]
pub fn default_linux_linker_overrides() -> HashMap<String, DefaultLinuxLinkerOverride> {
[("x86_64-unknown-linux-gnu".to_string(), DefaultLinuxLinkerOverride::SelfContainedLldCc)]
.into()
pub fn default_linux_linker_overrides(
channel: &str,
) -> HashMap<String, DefaultLinuxLinkerOverride> {
let mut overrides = HashMap::from([(
"x86_64-unknown-linux-gnu".to_string(),
DefaultLinuxLinkerOverride::SelfContainedLldCc,
)]);
if channel == "nightly" || channel == "dev" {
overrides.insert(
"loongarch64-unknown-linux-gnu".to_string(),
DefaultLinuxLinkerOverride::SelfContainedLldCc,
);
}
overrides
}

#[cfg(test)]
Expand All @@ -141,7 +152,9 @@ thread_local! {
}

#[cfg(test)]
pub fn default_linux_linker_overrides() -> HashMap<String, DefaultLinuxLinkerOverride> {
pub fn default_linux_linker_overrides(
_channel: &str,
) -> HashMap<String, DefaultLinuxLinkerOverride> {
TEST_LINUX_LINKER_OVERRIDES.with(|cell| cell.borrow().clone()).unwrap_or_default()
}

Expand Down
Loading