Skip to content

Commit fe16de2

Browse files
authored
Unrolled build for rust-lang#136698
Rollup merge of rust-lang#136698 - jackpot51:i586-redox, r=RalfJung Replace i686-unknown-redox target with i586-unknown-redox This change is related to rust-lang#136495
2 parents 021fb9c + 54c15eb commit fe16de2

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

compiler/rustc_target/src/spec/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1790,7 +1790,7 @@ supported_targets! {
17901790
("x86_64-unknown-l4re-uclibc", x86_64_unknown_l4re_uclibc),
17911791

17921792
("aarch64-unknown-redox", aarch64_unknown_redox),
1793-
("i686-unknown-redox", i686_unknown_redox),
1793+
("i586-unknown-redox", i586_unknown_redox),
17941794
("x86_64-unknown-redox", x86_64_unknown_redox),
17951795

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

compiler/rustc_target/src/spec/targets/i686_unknown_redox.rs compiler/rustc_target/src/spec/targets/i586_unknown_redox.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ pub(crate) fn target() -> Target {
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

+1-1
Original file line numberDiff line numberDiff line change
@@ -311,12 +311,12 @@ target | std | host | notes
311311
[`i386-apple-ios`](platform-support/apple-ios.md) | ✓ | | 32-bit x86 iOS (Penryn) [^x86_32-floats-return-ABI]
312312
[`i586-pc-nto-qnx700`](platform-support/nto-qnx.md) | * | | 32-bit x86 QNX Neutrino 7.0 RTOS (Pentium 4) [^x86_32-floats-return-ABI]
313313
[`i586-unknown-netbsd`](platform-support/netbsd.md) | ✓ | | 32-bit x86 (original Pentium) [^x86_32-floats-x87]
314+
[`i586-unknown-redox`](platform-support/redox.md) | ✓ | | 32-bit x86 Redox OS (PentiumPro) [^x86_32-floats-x87]
314315
[`i686-apple-darwin`](platform-support/apple-darwin.md) | ✓ | ✓ | 32-bit macOS (10.12+, Sierra+, Penryn) [^x86_32-floats-return-ABI]
315316
`i686-unknown-haiku` | ✓ | ✓ | 32-bit Haiku (Pentium 4) [^x86_32-floats-return-ABI]
316317
[`i686-unknown-hurd-gnu`](platform-support/hurd.md) | ✓ | ✓ | 32-bit GNU/Hurd (Pentium 4) [^x86_32-floats-return-ABI]
317318
[`i686-unknown-netbsd`](platform-support/netbsd.md) | ✓ | ✓ | NetBSD/i386 (Pentium 4) [^x86_32-floats-return-ABI]
318319
[`i686-unknown-openbsd`](platform-support/openbsd.md) | ✓ | ✓ | 32-bit OpenBSD (Pentium 4) [^x86_32-floats-return-ABI]
319-
[`i686-unknown-redox`](platform-support/redox.md) | ✓ | | i686 Redox OS (PentiumPro) [^x86_32-floats-x87]
320320
`i686-uwp-windows-gnu` | ✓ | | [^x86_32-floats-return-ABI]
321321
[`i686-uwp-windows-msvc`](platform-support/uwp-windows-msvc.md) | ✓ | | [^x86_32-floats-return-ABI]
322322
[`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

+2-2
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

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ static TARGETS: &[&str] = &[
100100
"i586-pc-windows-msvc",
101101
"i586-unknown-linux-gnu",
102102
"i586-unknown-linux-musl",
103+
"i586-unknown-redox",
103104
"i686-apple-darwin",
104105
"i686-linux-android",
105106
"i686-pc-windows-gnu",
@@ -108,7 +109,6 @@ static TARGETS: &[&str] = &[
108109
"i686-unknown-freebsd",
109110
"i686-unknown-linux-gnu",
110111
"i686-unknown-linux-musl",
111-
"i686-unknown-redox",
112112
"i686-unknown-uefi",
113113
"loongarch64-unknown-linux-gnu",
114114
"loongarch64-unknown-linux-musl",

tests/assembly/targets/targets-elf.rs

+3-3
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)