-
Notifications
You must be signed in to change notification settings - Fork 12.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Auto merge of #124477 - Mark-Simulacrum:stable-next, r=Mark-Simulacrum
[stable] 1.78.0 release https://forge.rust-lang.org/release/process.html#promote-branches-t-3-days-monday This also includes a backport of: * Use raw-dylib for Windows synchronization functions #124019 r? `@Mark-Simulacrum`
- Loading branch information
Showing
4 changed files
with
172 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
37 changes: 37 additions & 0 deletions
37
...c_codegen_cranelift/patches/0030-stdlib-Revert-use-raw-dylib-for-Windows-futex-APIs.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| From 0d741cf82c3c908616abd39dc84ebf7d8702e0c3 Mon Sep 17 00:00:00 2001 | ||
| From: Chris Denton <[email protected]> | ||
| Date: Tue, 16 Apr 2024 15:51:34 +0000 | ||
| Subject: [PATCH] Revert use raw-dylib for Windows futex APIs | ||
|
|
||
| --- | ||
| library/std/src/sys/pal/windows/c.rs | 14 +------------- | ||
| 1 file changed, 1 insertion(+), 13 deletions(-) | ||
|
|
||
| diff --git a/library/std/src/sys/pal/windows/c.rs b/library/std/src/sys/pal/windows/c.rs | ||
| index 9d58ce05f01..1c828bac4b6 100644 | ||
| --- a/library/std/src/sys/pal/windows/c.rs | ||
| +++ b/library/std/src/sys/pal/windows/c.rs | ||
| @@ -357,19 +357,7 @@ pub fn GetTempPath2W(bufferlength: u32, buffer: PWSTR) -> u32 { | ||
| } | ||
|
|
||
| #[cfg(not(target_vendor = "win7"))] | ||
| -// Use raw-dylib to import synchronization functions to workaround issues with the older mingw import library. | ||
| -#[cfg_attr( | ||
| - target_arch = "x86", | ||
| - link( | ||
| - name = "api-ms-win-core-synch-l1-2-0", | ||
| - kind = "raw-dylib", | ||
| - import_name_type = "undecorated" | ||
| - ) | ||
| -)] | ||
| -#[cfg_attr( | ||
| - not(target_arch = "x86"), | ||
| - link(name = "api-ms-win-core-synch-l1-2-0", kind = "raw-dylib") | ||
| -)] | ||
| +#[link(name = "synchronization")] | ||
| extern "system" { | ||
| pub fn WaitOnAddress( | ||
| address: *const c_void, | ||
| -- | ||
| 2.42.0.windows.2 | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| beta | ||
| stable |