Skip to content

Align {i686,x86_64}-win7-windows-msvc to their parent targets #134611

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 23, 2024
Merged

Align {i686,x86_64}-win7-windows-msvc to their parent targets #134611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions compiler/rustc_target/src/spec/targets/i686_win7_windows_msvc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
use crate::spec::{LinkerFlavor, Lld, Target, base};
use crate::spec::{LinkerFlavor, Lld, SanitizerSet, Target, base};

pub(crate) fn target() -> Target {
let mut base = base::windows_msvc::opts();
base.vendor = "win7".into();
base.cpu = "pentium4".into();
base.max_atomic_width = Some(64);
base.vendor = "win7".into();
base.supported_sanitizers = SanitizerSet::ADDRESS;

base.add_pre_link_args(LinkerFlavor::Msvc(Lld::No), &[
// Mark all dynamic libraries and executables as compatible with the larger 4GiB address
Expand All @@ -19,7 +20,7 @@ pub(crate) fn target() -> Target {
Target {
llvm_target: "i686-pc-windows-msvc".into(),
metadata: crate::spec::TargetMetadata {
description: Some("32-bit Windows 7 support".into()),
description: Some("32-bit MSVC (Windows 7+)".into()),
tier: Some(3),
host_tools: Some(false),
std: Some(true),
Expand Down
7 changes: 4 additions & 3 deletions compiler/rustc_target/src/spec/targets/x86_64_win7_windows_msvc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
use crate::spec::{Target, base};
use crate::spec::{SanitizerSet, Target, base};

pub(crate) fn target() -> Target {
let mut base = base::windows_msvc::opts();
base.vendor = "win7".into();
base.cpu = "x86-64".into();
base.plt_by_default = false;
base.max_atomic_width = Some(64);
base.vendor = "win7".into();
base.supported_sanitizers = SanitizerSet::ADDRESS;

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure the sanitizers work on win7, though I guess it won't hurt to have this if they aren't used.

Target {
llvm_target: "x86_64-pc-windows-msvc".into(),
metadata: crate::spec::TargetMetadata {
description: Some("64-bit Windows 7 support".into()),
description: Some("64-bit MSVC (Windows 7+)".into()),
tier: Some(3),
host_tools: Some(false),
std: Some(true),
Expand Down
Loading