Skip to content

Fix: Properly set vendor in i686-win7-windows-msvc target #119544

New issue

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

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

Already on GitHub? # to your account

Merged
merged 1 commit into from
Jan 3, 2024

Conversation

roblabla
Copy link
Contributor

@roblabla roblabla commented Jan 3, 2024

In #118150 , setting the vendor field of the i686-win7-windows-msvc target was forgotten, preventing us from easily checking the target using cfg(target_vendor).

With this PR, we set the target vendor to "win7".

@rustbot
Copy link
Collaborator

rustbot commented Jan 3, 2024

r? @wesleywiser

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jan 3, 2024
@rustbot
Copy link
Collaborator

rustbot commented Jan 3, 2024

These commits modify compiler targets.
(See the Target Tier Policy.)

@rust-log-analyzer

This comment has been minimized.

@Noratrieb
Copy link
Member

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Jan 3, 2024

📌 Commit d9d23fa has been approved by Nilstrieb

It is now in the queue for this repository.

@bors
Copy link
Collaborator

bors commented Jan 3, 2024

🌲 The tree is currently closed for pull requests below priority 100. This pull request will be tested once the tree is reopened.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 3, 2024
fmease added a commit to fmease/rust that referenced this pull request Jan 3, 2024
…rieb

Fix: Properly set vendor in i686-win7-windows-msvc target

In rust-lang#118150 , setting the `vendor` field of the `i686-win7-windows-msvc` target was forgotten, preventing us from easily checking the target using `cfg(target_vendor)`.

With this PR, we set the target vendor to "win7".
@ChrisDenton
Copy link
Member

Did i686-win7-windows-msvc make it into beta already? Should this be backported?

@roblabla
Copy link
Contributor Author

roblabla commented Jan 3, 2024

Yes, it did. A backport would be nice.

@ChrisDenton ChrisDenton added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jan 3, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 3, 2024
Rollup of 21 pull requests

Successful merges:

 - rust-lang#119086 (Query panic!() to useful diagnostic)
 - rust-lang#119239 (Remove unnecessary arm in `check_expr_yield`)
 - rust-lang#119298 (suppress change-tracker warnings in CI containers)
 - rust-lang#119319 (Document that File does not buffer reads/writes)
 - rust-lang#119434 (rc: Take *const T in is_dangling)
 - rust-lang#119444 (Rename `TyCtxt::is_closure` to `TyCtxt::is_closure_or_coroutine`)
 - rust-lang#119474 (Update tracking issue of naked_functions)
 - rust-lang#119476 (Pretty-print always-const trait predicates correctly)
 - rust-lang#119477 (rustdoc ui: adjust tooltip z-index to be above sidebar)
 - rust-lang#119479 (Remove two unused feature gates from rustc_query_impl)
 - rust-lang#119487 (Minor improvements in comment on `freshen.rs`)
 - rust-lang#119492 (Update books)
 - rust-lang#119494 (Deny defaults for higher-ranked generic parameters)
 - rust-lang#119498 (Update deadlinks of `strict_provenance` lints)
 - rust-lang#119505 (Don't synthesize host effect params for trait associated functions marked const)
 - rust-lang#119510 (Report I/O errors from rmeta encoding with emit_fatal)
 - rust-lang#119512 (Mark myself as back from leave)
 - rust-lang#119514 (coverage: Avoid a query stability hazard in `function_coverage_map`)
 - rust-lang#119523 (llvm: Allow `noundef` in codegen tests)
 - rust-lang#119534 (Update `thread_local` examples to use `local_key_cell_methods`)
 - rust-lang#119544 (Fix: Properly set vendor in i686-win7-windows-msvc target)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 9b2a44a into rust-lang:master Jan 3, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jan 3, 2024
Rollup merge of rust-lang#119544 - roblabla:new-win7-targets, r=Nilstrieb

Fix: Properly set vendor in i686-win7-windows-msvc target

In rust-lang#118150 , setting the `vendor` field of the `i686-win7-windows-msvc` target was forgotten, preventing us from easily checking the target using `cfg(target_vendor)`.

With this PR, we set the target vendor to "win7".
@rustbot rustbot added this to the 1.77.0 milestone Jan 3, 2024
@wesleywiser wesleywiser added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Jan 4, 2024
@Mark-Simulacrum Mark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jan 7, 2024
@Mark-Simulacrum Mark-Simulacrum modified the milestones: 1.77.0, 1.76.0 Jan 7, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 7, 2024
…mulacrum

[beta] backport rollup

This PR backports:

- rust-lang#119544: Fix: Properly set vendor in i686-win7-windows-msvc target
- rust-lang#118796: Exhaustiveness: Improve complexity on some wide matches
- rust-lang#119546: Temporarily disable M1 runners on GitHub Actions
- rust-lang#119584: [beta] Clippy (early) beta backport
- rust-lang#119559: [beta-1.76] Update cargo

And also:

- Bumps stage0 to released stable.

r? `@Mark-Simulacrum`
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 8, 2024
…mulacrum

[beta] backport rollup

This PR backports:

- rust-lang#119544: Fix: Properly set vendor in i686-win7-windows-msvc target
- rust-lang#118796: Exhaustiveness: Improve complexity on some wide matches
- rust-lang#119546: Temporarily disable M1 runners on GitHub Actions
- rust-lang#119584: [beta] Clippy (early) beta backport
- rust-lang#119559: [beta-1.76] Update cargo

And also:

- Bumps stage0 to released stable.

r? `@Mark-Simulacrum`
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants