bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #131168 - madsmtm:target-info-psx-os, r=davidtwco

Browse source 
Fix `target_os` for `mipsel-sony-psx`

Previously set to `target_os = "none"` and `target_env = "psx"` in [the PR introducing the target](https://github.com/rust-lang/rust/pull/102689/), but although the Playstation 1 is _close_ to a bare metal target in some regards, it's still very much an operating system, so we should instead set `target_os = "psx"`.

This also matches the `mipsel-sony-psp` target, which sets `target_os = "psp"`.

CC target maintainer ``@ayrtonm.``

If there's any code out there that uses `cfg(target_env = "psx")`, they can use `cfg(any(target_os = "psx", target_env = "psx"))` until they bump their MSRV to a version where this is fully fixed.
This commit is contained in:
Jubilee 2024-10-31 17:50:40 -07:00 • committed by GitHub
commit a43492b884
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
compiler/rustc_target/src/spec/targets/mipsel_sony_psx.rs
View file

@ -14,8 +14,11 @@ pub(crate) fn target() -> Target {
arch: "mips".into(),
options: TargetOptions {
os: "none".into(),
env: "psx".into(),
// The Playstation 1 is mostly bare-metal, but the BIOS does provide some a slight bit
// of functionality post load, so we still declare it as `cfg!(target_os = "psx")`.
//
// See <https://github.com/rust-lang/rust/pull/131168> for details.
os: "psx".into(),
vendor: "sony".into(),
linker_flavor: LinkerFlavor::Gnu(Cc::No, Lld::Yes),
cpu: "mips1".into(),