Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit ea54b5e

Browse files
jackpot51jackpot51
committed
Replace i686-unknown-redox target with i586-unknown-redox
1 parent 64e06c0 commit ea54b5e

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1797,7 +1797,7 @@ supported_targets! {
17971797
("x86_64-unknown-l4re-uclibc", x86_64_unknown_l4re_uclibc),
17981798

17991799
("aarch64-unknown-redox", aarch64_unknown_redox),
1800-
("i686-unknown-redox", i686_unknown_redox),
1800+
("i586-unknown-redox", i586_unknown_redox),
18011801
("x86_64-unknown-redox", x86_64_unknown_redox),
18021802

18031803
("i386-apple-ios", i386_apple_ios),

‎compiler/rustc_target/src/spec/targets/i686_unknown_redox.rs‎ renamed to ‎compiler/rustc_target/src/spec/targets/i586_unknown_redox.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ use crate::spec::{Cc, LinkerFlavor, Lld, StackProbeType, Target, base};
22

33
pub(crate) fn target() -> Target {
44
let mut base = base::redox::opts();
5-
base.cpu = "pentiumpro".into();
5+
base.cpu = "pentium".into();
66
base.plt_by_default = false;
77
base.max_atomic_width = Some(64);
88
base.add_pre_link_args(LinkerFlavor::Gnu(Cc::Yes, Lld::No), &["-m32"]);
99
// don't use probe-stack=inline-asm until rust#83139 and rust#84667 are resolved
1010
base.stack_probes = StackProbeType::Call;
1111

1212
Target {
13-
llvm_target: "i686-unknown-redox".into(),
13+
llvm_target: "i586-unknown-redox".into(),
1414
metadata: crate::spec::TargetMetadata {
1515
description: None,
1616
tier: None,

‎src/doc/rustc/src/platform-support.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,12 +310,12 @@ target | std | host | notes
310310
[`i386-apple-ios`](platform-support/apple-ios.md) | ✓ | | 32-bit x86 iOS (Penryn) [^x86_32-floats-return-ABI]
311311
[`i586-pc-nto-qnx700`](platform-support/nto-qnx.md) | * | | 32-bit x86 QNX Neutrino 7.0 RTOS (Pentium 4) [^x86_32-floats-return-ABI]
312312
[`i586-unknown-netbsd`](platform-support/netbsd.md) | ✓ | | 32-bit x86 (original Pentium) [^x86_32-floats-x87]
313+
[`i586-unknown-redox`](platform-support/redox.md) | ✓ | | 32-bit x86 Redox OS (original Pentium) [^x86_32-floats-x87]
313314
[`i686-apple-darwin`](platform-support/apple-darwin.md) | ✓ | ✓ | 32-bit macOS (10.12+, Sierra+, Penryn) [^x86_32-floats-return-ABI]
314315
`i686-unknown-haiku` | ✓ | ✓ | 32-bit Haiku (Pentium 4) [^x86_32-floats-return-ABI]
315316
[`i686-unknown-hurd-gnu`](platform-support/hurd.md) | ✓ | ✓ | 32-bit GNU/Hurd (PentiumPro) [^x86_32-floats-x87]
316317
[`i686-unknown-netbsd`](platform-support/netbsd.md) | ✓ | ✓ | NetBSD/i386 (Pentium 4) [^x86_32-floats-return-ABI]
317318
[`i686-unknown-openbsd`](platform-support/openbsd.md) | ✓ | ✓ | 32-bit OpenBSD (Pentium 4) [^x86_32-floats-return-ABI]
318-
[`i686-unknown-redox`](platform-support/redox.md) | ✓ | | i686 Redox OS (PentiumPro) [^x86_32-floats-x87]
319319
`i686-uwp-windows-gnu` | ✓ | | [^x86_32-floats-return-ABI]
320320
[`i686-uwp-windows-msvc`](platform-support/uwp-windows-msvc.md) | ✓ | | [^x86_32-floats-return-ABI]
321321
[`i686-win7-windows-gnu`](platform-support/win7-windows-gnu.md) | ✓ | | 32-bit Windows 7 support [^x86_32-floats-return-ABI]

‎src/doc/rustc/src/platform-support/redox.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Target triplets available so far:
99

1010
- `x86_64-unknown-redox` (tier 2)
1111
- `aarch64-unknown-redox` (tier 3)
12-
- `i686-unknown-redox` (tier 3)
12+
- `i586-unknown-redox` (tier 3)
1313

1414
## Target maintainers
1515

@@ -36,7 +36,7 @@ target = [
3636
"<HOST_TARGET>",
3737
"x86_64-unknown-redox",
3838
"aarch64-unknown-redox",
39-
"i686-unknown-redox",
39+
"i586-unknown-redox",
4040
]
4141
```
4242

‎src/tools/build-manifest/src/main.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ static TARGETS: &[&str] = &[
9999
"i586-pc-windows-msvc",
100100
"i586-unknown-linux-gnu",
101101
"i586-unknown-linux-musl",
102+
"i586-unknown-redox",
102103
"i686-apple-darwin",
103104
"i686-linux-android",
104105
"i686-pc-windows-gnu",
@@ -107,7 +108,6 @@ static TARGETS: &[&str] = &[
107108
"i686-unknown-freebsd",
108109
"i686-unknown-linux-gnu",
109110
"i686-unknown-linux-musl",
110-
"i686-unknown-redox",
111111
"i686-unknown-uefi",
112112
"loongarch64-unknown-linux-gnu",
113113
"loongarch64-unknown-linux-musl",

‎tests/assembly/targets/targets-elf.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,9 @@
228228
//@ revisions: i586_unknown_netbsd
229229
//@ [i586_unknown_netbsd] compile-flags: --target i586-unknown-netbsd
230230
//@ [i586_unknown_netbsd] needs-llvm-components: x86
231+
//@ revisions: i586_unknown_redox
232+
//@ [i586_unknown_redox] compile-flags: --target i586-unknown-redox
233+
//@ [i586_unknown_redox] needs-llvm-components: x86
231234
//@ revisions: i686_linux_android
232235
//@ [i686_linux_android] compile-flags: --target i686-linux-android
233236
//@ [i686_linux_android] needs-llvm-components: x86
@@ -252,9 +255,6 @@
252255
//@ revisions: i686_unknown_openbsd
253256
//@ [i686_unknown_openbsd] compile-flags: --target i686-unknown-openbsd
254257
//@ [i686_unknown_openbsd] needs-llvm-components: x86
255-
//@ revisions: i686_unknown_redox
256-
//@ [i686_unknown_redox] compile-flags: --target i686-unknown-redox
257-
//@ [i686_unknown_redox] needs-llvm-components: x86
258258
//@ revisions: i686_wrs_vxworks
259259
//@ [i686_wrs_vxworks] compile-flags: --target i686-wrs-vxworks
260260
//@ [i686_wrs_vxworks] needs-llvm-components: x86

0 commit comments

Comments
 (0)