Skip to content

Commit c3ec9ff

Browse files
committed
Align {i686,x86_64}-win7-windows-msvc to their parent targets
There were some changes to `{i686,x86_64}-pc-windows-msvc`, include them in the backward compatibility targets as well.
1 parent 73c278f commit c3ec9ff

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

compiler/rustc_target/src/spec/targets/i686_win7_windows_msvc.rs

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
use crate::spec::{LinkerFlavor, Lld, Target, base};
1+
use crate::spec::{LinkerFlavor, Lld, SanitizerSet, Target, base};
22

33
pub(crate) fn target() -> Target {
44
let mut base = base::windows_msvc::opts();
5+
base.vendor = "win7".into();
56
base.cpu = "pentium4".into();
67
base.max_atomic_width = Some(64);
7-
base.vendor = "win7".into();
8+
base.supported_sanitizers = SanitizerSet::ADDRESS;
89

910
base.add_pre_link_args(LinkerFlavor::Msvc(Lld::No), &[
1011
// Mark all dynamic libraries and executables as compatible with the larger 4GiB address
@@ -19,7 +20,7 @@ pub(crate) fn target() -> Target {
1920
Target {
2021
llvm_target: "i686-pc-windows-msvc".into(),
2122
metadata: crate::spec::TargetMetadata {
22-
description: Some("32-bit Windows 7 support".into()),
23+
description: Some("32-bit MSVC (Windows 7+)".into()),
2324
tier: Some(3),
2425
host_tools: Some(false),
2526
std: Some(true),

compiler/rustc_target/src/spec/targets/x86_64_win7_windows_msvc.rs

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
1-
use crate::spec::{Target, base};
1+
use crate::spec::{SanitizerSet, Target, base};
22

33
pub(crate) fn target() -> Target {
44
let mut base = base::windows_msvc::opts();
5+
base.vendor = "win7".into();
56
base.cpu = "x86-64".into();
7+
base.features = "+cx16,+sse3,+sahf".into();
68
base.plt_by_default = false;
7-
base.max_atomic_width = Some(64);
8-
base.vendor = "win7".into();
9+
base.max_atomic_width = Some(128);
10+
base.supported_sanitizers = SanitizerSet::ADDRESS;
911

1012
Target {
1113
llvm_target: "x86_64-pc-windows-msvc".into(),
1214
metadata: crate::spec::TargetMetadata {
13-
description: Some("64-bit Windows 7 support".into()),
15+
description: Some("64-bit MSVC (Windows 7+)".into()),
1416
tier: Some(3),
1517
host_tools: Some(false),
1618
std: Some(true),

0 commit comments

Comments
 (0)