Skip to content

Commit 8a10e9d

Browse files
authored
Unrolled build for rust-lang#120937
Rollup merge of rust-lang#120937 - ian-h-chamberlain:docs/update-3ds-links-and-info, r=JohnTitor [docs] Update armv6k-nintendo-3ds platform docs for outdated info Mostly just fixing links and references to renamed crates, but also updating a bit of outdated info as well. CC `@Meziu` `@AzureMarker`
2 parents 520b0b2 + 07afd0f commit 8a10e9d

File tree

1 file changed

+12
-14
lines changed

1 file changed

+12
-14
lines changed

src/doc/rustc/src/platform-support/armv6k-nintendo-3ds.md

+12-14
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ from nor used with any official Nintendo SDK.
1010

1111
## Target maintainers
1212

13+
This target is maintained by members of the [@rust3ds](https://github.com/rust3ds)
14+
organization:
15+
1316
- [@Meziu](https://github.com/Meziu)
1417
- [@AzureMarker](https://github.com/AzureMarker)
1518
- [@ian-h-chamberlain](https://github.com/ian-h-chamberlain)
@@ -35,8 +38,8 @@ Additionally, some helper crates provide implementations of some `libc` function
3538
use by `std` that may otherwise be missing. These, or an alternate implementation
3639
of the relevant functions, are required to use `std`:
3740

38-
- [`pthread-3ds`](https://github.com/Meziu/pthread-3ds) provides pthread APIs for `std::thread`.
39-
- [`linker-fix-3ds`](https://github.com/Meziu/rust-linker-fix-3ds) fulfills some other missing libc APIs.
41+
- [`pthread-3ds`](https://github.com/rust3ds/pthread-3ds) provides pthread APIs for `std::thread`.
42+
- [`shim-3ds`](https://github.com/rust3ds/shim-3ds) fulfills some other missing libc APIs (e.g. `getrandom`).
4043

4144
Binaries built for this target should be compatible with all variants of the
4245
3DS (and 2DS) hardware and firmware, but testing is limited and some versions may
@@ -74,32 +77,27 @@ export CFLAGS_armv6k_nintendo_3ds="-mfloat-abi=hard -mtune=mpcore -mtp=soft -mar
7477
Rust does not yet ship pre-compiled artifacts for this target.
7578

7679
The recommended way to build binaries is by using the
77-
[cargo-3ds](https://github.com/Meziu/cargo-3ds) tool, which uses `build-std`
80+
[cargo-3ds](https://github.com/rust3ds/cargo-3ds) tool, which uses `build-std`
7881
and provides commands that work like the usual `cargo run`, `cargo build`, etc.
82+
The `cargo 3ds new` will automatically set up a new project with the dependencies
83+
needed to build a simple binary.
7984

8085
You can also build Rust with the target enabled (see
8186
[Building the target](#building-the-target) above).
8287

8388
As mentioned in [Requirements](#requirements), programs that use `std` must link
8489
against both the devkitARM toolchain and libraries providing the `libc` APIs used
8590
in `std`. There is a general-purpose utility crate for working with nonstandard
86-
APIs provided by the OS: [`ctru-rs`](https://github.com/Meziu/ctru-rs).
91+
APIs provided by the OS: [`ctru-rs`](https://github.com/rust3ds/ctru-rs).
8792
Add it to Cargo.toml to use it in your program:
8893

8994
```toml
9095
[dependencies]
91-
ctru-rs = { git = "https://github.com/Meziu/ctru-rs.git" }
96+
ctru-rs = { git = "https://github.com/rust3ds/ctru-rs.git" }
9297
```
9398

94-
Using this library's `init()` function ensures the symbols needed to link
95-
against `std` are present (as mentioned in [Requirements](#requirements)
96-
above), as well as providing a runtime suitable for `std`:
97-
98-
```rust,ignore (requires-3rd-party-library)
99-
fn main() {
100-
ctru::init();
101-
}
102-
```
99+
Depending on `ctru-rs` ensures that all the necessary symbols are available at
100+
link time.
103101

104102
## Testing
105103

0 commit comments

Comments
 (0)