Skip to content
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

Jump to bottom

Use GNU ld on m68k-unknown-linux-gnu #132950

Merged
merged 1 commit into from
Nov 13, 2024
Merged

Use GNU ld on m68k-unknown-linux-gnu #132950

merged 1 commit into from
Nov 13, 2024

Conversation

knickish
Copy link
Contributor

LLD does not really support the M68k architecture yet, specify m68k-linux-gnu-ld as the linker for the platform

@rustbot
Copy link
Collaborator

rustbot commented Nov 12, 2024

r? @estebank

rustbot has assigned @estebank.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Nov 12, 2024
@rustbot
Copy link
Collaborator

rustbot commented Nov 12, 2024

These commits modify compiler targets.
(See the Target Tier Policy.)

@workingjubilee
Copy link
Member

@knickish Can you, in the platform support page, update m68k with the asterisk that says it supports no_std, right now?

@workingjubilee
Copy link
Member

It currently is a question mark, which basically says "lol we're pretty sure this doesn't work", and with this it seems you've finally made it to no_std :3

@knickish
Copy link
Contributor Author

@workingjubilee Building core depends on llvm patches that aren't all backported or merged yet, does that change how you'd like that documentation updated at all?

@workingjubilee
Copy link
Member

@workingjubilee Building core depends on llvm patches that aren't all backported or merged yet, does that change how you'd like that documentation updated at all?

Ooh good point, I forgot about that.

Hmm... we'll revisit this next PR. :3

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Nov 12, 2024

📌 Commit f2617ae has been approved by workingjubilee

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 12, 2024
glaubitz
glaubitz reviewed Nov 12, 2024
View reviewed changes
compiler/rustc_target/src/spec/targets/m68k_unknown_linux_gnu.rs Outdated
@@ -12,11 +12,18 @@ pub(crate) fn target() -> Target {
description: Some("Motorola 680x0 Linux".into()),
tier: Some(3),
host_tools: Some(false),
std: None, // ?
std: Some(false), // std cannot be linked for now
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this should be a separate commit as it's an unrelated change.

Copy link
Contributor Author

@knickish knickish Nov 12, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done, just removed it for now

bjorn3
bjorn3 reviewed Nov 12, 2024
View reviewed changes
compiler/rustc_target/src/spec/targets/m68k_unknown_linux_gnu.rs Outdated
mcount: "_mcount".into(),

// LLD currently does not have support for M68k
linker: Some("m68k-linux-gnu-ld".into()),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Something like link_self_contained: LinkSelfContainedDefault::False instead may work too. This will also ensure that attempting to enable self-contained linking using lld on the cli gives an error.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, thank you!

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@knickish Can you try this?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yup, doing a build right now

Copy link
Contributor Author

@knickish knickish Nov 12, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This worked, core and everything besides std built and linked; the std link failed with the exact same error as with linker: Some("m68k-linux-gnu-ld".into()). PR is updated and uses link_self_contained: LinkSelfContainedDefault::False

@workingjubilee
Copy link
Member

@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 12, 2024
@glaubitz
Copy link
Contributor

Also, the title should be "Use GNU ld on m68k-unknown-linux-gnu" as this just applies to m68k on Linux.

@workingjubilee
Copy link
Member

we don't have any other m68k targets tho'

@knickish knickish changed the title use gnu ld for m68k target Use GNU ld on m68k-unknown-linux-gnu Nov 12, 2024
@glaubitz
Copy link
Contributor

glaubitz commented Nov 12, 2024 via email

@workingjubilee
Copy link
Member

Ah, sure then!

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Nov 12, 2024

📌 Commit d3768ea has been approved by workingjubilee

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 12, 2024
@matthiaskrgr matthiaskrgr mentioned this pull request Nov 12, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 13, 2024
@bors
Auto merge of rust-lang#132972 - matthiaskrgr:rollup-456osr7, r=matth…
242f20d 
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#132702 (CFI: Append debug location to CFI blocks)
 - rust-lang#132851 (Update the doc comment of `ASCII_CASE_MASK`)
 - rust-lang#132948 (stabilize const_unicode_case_lookup)
 - rust-lang#132950 (Use GNU ld on m68k-unknown-linux-gnu)
 - rust-lang#132962 (triagebot: add codegen reviewers)
 - rust-lang#132966 (stabilize const_option_ext)
 - rust-lang#132970 (Add tracking issue number to unsigned_nonzero_div_ceil feature)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit f7e4068 into rust-lang:master Nov 13, 2024
6 checks passed
@rustbot rustbot added this to the 1.84.0 milestone Nov 13, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Nov 13, 2024
@rust-timer
Unrolled build for rust-lang#132950
5fa3fcc 
Rollup merge of rust-lang#132950 - knickish:m68k_gnu_ld, r=workingjubilee

Use GNU ld on m68k-unknown-linux-gnu

LLD does not really support the M68k architecture yet, specify `m68k-linux-gnu-ld` as the linker for the platform
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@workingjubilee workingjubilee workingjubilee left review comments

@bjorn3 bjorn3 bjorn3 left review comments

@glaubitz glaubitz glaubitz left review comments

Assignees

@estebank estebank

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.84.0
Development

Successfully merging this pull request may close these issues.
7 participants
@knickish @rustbot @workingjubilee @bors @glaubitz @bjorn3 @estebank