Commit 0a4f5d5

committed

prepare stabilization of modern linker-flavors

fix a few comments

1 parent 27e4926 commit 0a4f5d5Copy full SHA for 0a4f5d5

File tree

2 files changed

+11

-8

lines changed

compiler
- rustc_session/src
  - config.rs
- rustc_target/src/spec
  - mod.rs

2 files changed

+11

-8

lines changed

`‎compiler/rustc_session/src/config.rs‎`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -2746,9 +2746,8 @@ pub fn build_session_options(`
`2746`	`2746`	`}`
`2747`	`2747`
`2748`	`2748`	// For testing purposes, until we have more feedback about these options: ensure `-Z
`2749`		- // unstable-options` is required when using the unstable `-C link-self-contained` options, like
`2750`		- // `-C link-self-contained=+linker`, and when using the unstable `-C linker-flavor` options, like
`2751`		- // `-C linker-flavor=gnu-lld-cc`.
	`2749`	+ // unstable-options` is required when using the unstable `-C link-self-contained` and `-C
	`2750`	+ // linker-flavor` options.
`2752`	`2751`	`if !nightly_options::is_unstable_enabled(matches) {`
`2753`	`2752`	`let uses_unstable_self_contained_option =`
`2754`	`2753`	`cg.link_self_contained.are_unstable_variants_set();`

`‎compiler/rustc_target/src/spec/mod.rs‎`

Lines changed: 9 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -162,11 +162,11 @@ pub enum LinkerFlavor {`
`162`	`162`
`163`	`163`	/// Linker flavors available externally through command line (`-Clinker-flavor`)
`164`	`164`	`/// or json target specifications.`
`165`		`-/// FIXME: This set has accumulated historically, bring it more in line with the internal`
`166`		-/// linker flavors (`LinkerFlavor`).
	`165`	`+/// This set has accumulated historically, and contains both (stable and unstable) legacy values, as`
	`166`	+/// well as modern ones matching the internal linker flavors (`LinkerFlavor`).
`167`	`167`	`#[derive(Clone, Copy, Debug, Eq, Ord, PartialEq, PartialOrd)]`
`168`	`168`	`pub enum LinkerFlavorCli {`
`169`		- // New (unstable) flavors, with direct counterparts in `LinkerFlavor`.
	`169`	+ // Modern (unstable) flavors, with direct counterparts in `LinkerFlavor`.
`170`	`170`	`Gnu(Cc, Lld),`
`171`	`171`	`Darwin(Cc, Lld),`
`172`	`172`	`WasmLld(Cc),`
`@@ -177,11 +177,13 @@ pub enum LinkerFlavorCli {`
`177`	`177`	`Bpf,`
`178`	`178`	`Ptx,`
`179`	`179`
`180`		`- // Below: the legacy stable values.`
	`180`	`+ // Legacy stable values`
`181`	`181`	`Gcc,`
`182`	`182`	`Ld,`
`183`	`183`	`Lld(LldFlavor),`
`184`	`184`	`Em,`
	`185`	`+`
	`186`	`+ // Legacy unstable values`
`185`	`187`	`BpfLinker,`
`186`	`188`	`PtxLinker,`
`187`	`189`	`}`
`@@ -509,14 +511,16 @@ linker_flavor_cli_impls! {`
`509`	`511`	`(LinkerFlavorCli::Bpf) "bpf"`
`510`	`512`	`(LinkerFlavorCli::Ptx) "ptx"`
`511`	`513`
`512`		`- // Below: legacy stable values`
	`514`	`+ // Legacy stable flavors`
`513`	`515`	`(LinkerFlavorCli::Gcc) "gcc"`
`514`	`516`	`(LinkerFlavorCli::Ld) "ld"`
`515`	`517`	`(LinkerFlavorCli::Lld(LldFlavor::Ld)) "ld.lld"`
`516`	`518`	`(LinkerFlavorCli::Lld(LldFlavor::Ld64)) "ld64.lld"`
`517`	`519`	`(LinkerFlavorCli::Lld(LldFlavor::Link)) "lld-link"`
`518`	`520`	`(LinkerFlavorCli::Lld(LldFlavor::Wasm)) "wasm-ld"`
`519`	`521`	`(LinkerFlavorCli::Em) "em"`
	`522`	`+`
	`523`	`+ // Legacy unstable flavors`
`520`	`524`	`(LinkerFlavorCli::BpfLinker) "bpf-linker"`
`521`	`525`	`(LinkerFlavorCli::PtxLinker) "ptx-linker"`
`522`	`526`	`}`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 0a4f5d5

File tree

2 files changed

2 files changed

`‎compiler/rustc_session/src/config.rs‎`

`‎compiler/rustc_target/src/spec/mod.rs‎`

0 commit comments