diff options
| author | Jubilee <46493976+workingjubilee@users.noreply.github.com> | 2024-04-18 21:38:56 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-18 21:38:56 -0700 |
| commit | 55c35dd22ecc072410799927fb4d5ad168bbdd96 (patch) | |
| tree | 793b2d3d72ba78cb18965a34ab1086968cb6cb4a /library/std/src/sys | |
| parent | 2b94e027370f21267d27ed431c8cfc7d2804257f (diff) | |
| parent | 5b024d6550c5c43848386df52f455da13ca79dea (diff) | |
| download | rust-55c35dd22ecc072410799927fb4d5ad168bbdd96.tar.gz rust-55c35dd22ecc072410799927fb4d5ad168bbdd96.zip | |
Rollup merge of #124019 - ChrisDenton:futex-raw-dylib, r=joboet
Use raw-dylib for Windows synchronization functions Fixes #123999 by using the raw-dylib feature to specify the DLL to load the Windows futex functions from (e.g. [`WaitOnAddress`](https://learn.microsoft.com/en-us/windows/win32/api/synchapi/nf-synchapi-waitonaddress)). This avoids reliance on the import library causing that issue. With apologies to ``@bjorn3,`` as it's currently necessary to revert this for cranelift.
Diffstat (limited to 'library/std/src/sys')
| -rw-r--r-- | library/std/src/sys/pal/windows/c.rs | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/library/std/src/sys/pal/windows/c.rs b/library/std/src/sys/pal/windows/c.rs index 1c828bac4b6..9d58ce05f01 100644 --- a/library/std/src/sys/pal/windows/c.rs +++ b/library/std/src/sys/pal/windows/c.rs @@ -357,7 +357,19 @@ compat_fn_with_fallback! { } #[cfg(not(target_vendor = "win7"))] -#[link(name = "synchronization")] +// 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") +)] extern "system" { pub fn WaitOnAddress( address: *const c_void, |