Skip to content

Commit 8630234

Browse files
tbu-tbu-
committed
Add new {x86_64,i686}-win7-windows-gnu targets
These are in symmetry with `{x86_64,i686}-win7-windows-msvc`.
1 parent 4bc6b76 commit 8630234

File tree

8 files changed

+133
-3
lines changed

8 files changed

+133
-3
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1812,9 +1812,11 @@ supported_targets! {
18121812
("aarch64-unknown-illumos", aarch64_unknown_illumos),
18131813

18141814
("x86_64-pc-windows-gnu", x86_64_pc_windows_gnu),
1815+
("x86_64-uwp-windows-gnu", x86_64_uwp_windows_gnu),
1816+
("x86_64-win7-windows-gnu", x86_64_win7_windows_gnu),
18151817
("i686-pc-windows-gnu", i686_pc_windows_gnu),
18161818
("i686-uwp-windows-gnu", i686_uwp_windows_gnu),
1817-
("x86_64-uwp-windows-gnu", x86_64_uwp_windows_gnu),
1819+
("i686-win7-windows-gnu", i686_win7_windows_gnu),
18181820

18191821
("aarch64-pc-windows-gnullvm", aarch64_pc_windows_gnullvm),
18201822
("i686-pc-windows-gnullvm", i686_pc_windows_gnullvm),

‎compiler/rustc_target/src/spec/targets/i686_win7_windows_gnu.rs‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
use crate::spec::{Cc, FramePointer, LinkerFlavor, Lld, Target, base};
2+
3+
pub(crate) fn target() -> Target {
4+
let mut base = base::windows_gnu::opts();
5+
base.vendor = "win7".into();
6+
base.cpu = "pentium4".into();
7+
base.max_atomic_width = Some(64);
8+
base.frame_pointer = FramePointer::Always; // Required for backtraces
9+
base.linker = Some("i686-w64-mingw32-gcc".into());
10+
11+
// Mark all dynamic libraries and executables as compatible with the larger 4GiB address
12+
// space available to x86 Windows binaries on x86_64.
13+
base.add_pre_link_args(LinkerFlavor::Gnu(Cc::No, Lld::No), &[
14+
"-m",
15+
"i386pe",
16+
"--large-address-aware",
17+
]);
18+
base.add_pre_link_args(LinkerFlavor::Gnu(Cc::Yes, Lld::No), &["-Wl,--large-address-aware"]);
19+
20+
Target {
21+
llvm_target: "i686-pc-windows-gnu".into(),
22+
metadata: crate::spec::TargetMetadata {
23+
description: Some("32-bit MinGW (Windows 7+)".into()),
24+
tier: Some(3),
25+
host_tools: Some(false),
26+
std: Some(true),
27+
},
28+
pointer_width: 32,
29+
data_layout: "e-m:x-p:32:32-p270:32:32-p271:32:32-p272:64:64-\
30+
i64:64-i128:128-f80:32-n8:16:32-a:0:32-S32"
31+
.into(),
32+
arch: "x86".into(),
33+
options: base,
34+
}
35+
}

‎compiler/rustc_target/src/spec/targets/x86_64_win7_windows_gnu.rs‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
use crate::spec::{Cc, LinkerFlavor, Lld, Target, base};
2+
3+
pub(crate) fn target() -> Target {
4+
let mut base = base::windows_gnu::opts();
5+
base.vendor = "win7".into();
6+
base.cpu = "x86-64".into();
7+
base.plt_by_default = false;
8+
// Use high-entropy 64 bit address space for ASLR
9+
base.add_pre_link_args(LinkerFlavor::Gnu(Cc::No, Lld::No), &[
10+
"-m",
11+
"i386pep",
12+
"--high-entropy-va",
13+
]);
14+
base.add_pre_link_args(LinkerFlavor::Gnu(Cc::Yes, Lld::No), &["-m64", "-Wl,--high-entropy-va"]);
15+
base.max_atomic_width = Some(64);
16+
base.linker = Some("x86_64-w64-mingw32-gcc".into());
17+
18+
Target {
19+
llvm_target: "x86_64-pc-windows-gnu".into(),
20+
metadata: crate::spec::TargetMetadata {
21+
description: Some("64-bit MinGW (Windows 7+)".into()),
22+
tier: Some(3),
23+
host_tools: Some(false),
24+
std: Some(true),
25+
},
26+
pointer_width: 64,
27+
data_layout:
28+
"e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128".into(),
29+
arch: "x86_64".into(),
30+
options: base,
31+
}
32+
}

‎src/doc/rustc/src/SUMMARY.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@
9898
- [wasm32-unknown-unknown](platform-support/wasm32-unknown-unknown.md)
9999
- [wasm32v1-none](platform-support/wasm32v1-none.md)
100100
- [wasm64-unknown-unknown](platform-support/wasm64-unknown-unknown.md)
101+
- [\*-win7-windows-gnu](platform-support/win7-windows-gnu.md)
101102
- [\*-win7-windows-msvc](platform-support/win7-windows-msvc.md)
102103
- [x86_64-fortanix-unknown-sgx](platform-support/x86_64-fortanix-unknown-sgx.md)
103104
- [x86_64-pc-solaris](platform-support/solaris.md)

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,7 @@ target | std | host | notes
313313
[`i686-unknown-redox`](platform-support/redox.md) | ✓ | | i686 Redox OS
314314
`i686-uwp-windows-gnu` | ✓ | | [^x86_32-floats-return-ABI]
315315
[`i686-uwp-windows-msvc`](platform-support/uwp-windows-msvc.md) | ✓ | | [^x86_32-floats-return-ABI]
316+
[`i686-win7-windows-gnu`](platform-support/win7-windows-gnu.md) | ✓ | | 32-bit Windows 7 support [^x86_32-floats-return-ABI]
316317
[`i686-win7-windows-msvc`](platform-support/win7-windows-msvc.md) | ✓ | | 32-bit Windows 7 support [^x86_32-floats-return-ABI]
317318
[`i686-wrs-vxworks`](platform-support/vxworks.md) | ✓ | | [^x86_32-floats-return-ABI]
318319
[`loongarch64-unknown-linux-ohos`](platform-support/openharmony.md) | ✓ | | LoongArch64 OpenHarmony
@@ -410,6 +411,7 @@ target | std | host | notes
410411
[`x86_64-unknown-trusty`](platform-support/trusty.md) | ? | |
411412
`x86_64-uwp-windows-gnu` | ✓ | |
412413
[`x86_64-uwp-windows-msvc`](platform-support/uwp-windows-msvc.md) | ✓ | |
414+
[`x86_64-win7-windows-gnu`](platform-support/win7-windows-gnu.md) | ✓ | | 64-bit Windows 7 support
413415
[`x86_64-win7-windows-msvc`](platform-support/win7-windows-msvc.md) | ✓ | | 64-bit Windows 7 support
414416
[`x86_64-wrs-vxworks`](platform-support/vxworks.md) | ✓ | |
415417
[`x86_64h-apple-darwin`](platform-support/x86_64h-apple-darwin.md) | ✓ | ✓ | macOS with late-gen Intel (at least Haswell)

‎src/doc/rustc/src/platform-support/win7-windows-gnu.md‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
# \*-win7-windows-gnu
2+
3+
**Tier: 3**
4+
5+
Windows targets continuing support of Windows 7.
6+
7+
Target triples:
8+
- `i686-win7-windows-gnu`
9+
- `x86_64-win7-windows-gnu`
10+
11+
## Target maintainers
12+
13+
- @tbu-
14+
15+
## Requirements
16+
17+
This target supports all of core, alloc, std and test. Host
18+
tools may also work, though those are not currently tested.
19+
20+
Those targets follow Windows calling convention for extern "C".
21+
22+
Like any other Windows target, the created binaries are in PE format.
23+
24+
## Building the target
25+
26+
You can build Rust with support for the targets by adding it to the target list in config.toml:
27+
28+
```toml
29+
[build]
30+
build-stage = 1
31+
target = ["x86_64-win7-windows-gnu"]
32+
```
33+
34+
## Building Rust programs
35+
36+
Rust does not ship pre-compiled artifacts for this target. To compile for this
37+
target, you will either need to build Rust with the target enabled (see
38+
"Building the target" above), or build your own copy by using `build-std` or
39+
similar.
40+
41+
## Testing
42+
43+
Created binaries work fine on Windows or Wine using native hardware. Remote
44+
testing is possible using the `remote-test-server` described [here](https://rustc-dev-guide.rust-lang.org/tests/running.html#running-tests-on-a-remote-machine).
45+
46+
## Cross-compilation toolchains and C code
47+
48+
Compatible C code can be built with gcc's `{i686,x86_64}-w64-mingw32-gcc`.

‎src/doc/rustc/src/platform-support/win7-windows-msvc.md‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1-
# *-win7-windows-msvc
1+
# \*-win7-windows-msvc
22

33
**Tier: 3**
44

5-
Windows targets continuing support of windows7.
5+
Windows targets continuing support of Windows 7.
6+
7+
Target triples:
8+
- `i686-win7-windows-msvc`
9+
- `x86_64-win7-windows-msvc`
610

711
## Target maintainers
812

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@
3939
//@ revisions: i686_uwp_windows_gnu
4040
//@ [i686_uwp_windows_gnu] compile-flags: --target i686-uwp-windows-gnu
4141
//@ [i686_uwp_windows_gnu] needs-llvm-components: x86
42+
//@ revisions: i686_win7_windows_gnu
43+
//@ [i686_win7_windows_gnu] compile-flags: --target i686-win7-windows-gnu
44+
//@ [i686_win7_windows_gnu] needs-llvm-components: x86
4245
//@ revisions: i686_unknown_uefi
4346
//@ [i686_unknown_uefi] compile-flags: --target i686-unknown-uefi
4447
//@ [i686_unknown_uefi] needs-llvm-components: x86
@@ -72,6 +75,9 @@
7275
//@ revisions: x86_64_uwp_windows_gnu
7376
//@ [x86_64_uwp_windows_gnu] compile-flags: --target x86_64-uwp-windows-gnu
7477
//@ [x86_64_uwp_windows_gnu] needs-llvm-components: x86
78+
//@ revisions: x86_64_win7_windows_gnu
79+
//@ [x86_64_win7_windows_gnu] compile-flags: --target x86_64-win7-windows-gnu
80+
//@ [x86_64_win7_windows_gnu] needs-llvm-components: x86
7581
//@ revisions: x86_64_uwp_windows_msvc
7682
//@ [x86_64_uwp_windows_msvc] compile-flags: --target x86_64-uwp-windows-msvc
7783
//@ [x86_64_uwp_windows_msvc] needs-llvm-components: x86

0 commit comments

Comments
 (0)