Skip to content

Commit 63a6950

Browse files
Rollup merge of rust-lang#124019 - ChrisDenton:futex-raw-dylib, r=joboet
Use raw-dylib for Windows synchronization functions Fixes rust-lang#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.
2 parents 4660cc6 + 8b73e2e commit 63a6950

File tree

1 file changed

+13
-1
lines changed
  • std/src/sys/pal/windows

1 file changed

+13
-1
lines changed

std/src/sys/pal/windows/c.rs

+13-1
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,19 @@ compat_fn_with_fallback! {
357357
}
358358

359359
#[cfg(not(target_vendor = "win7"))]
360-
#[link(name = "synchronization")]
360+
// Use raw-dylib to import synchronization functions to workaround issues with the older mingw import library.
361+
#[cfg_attr(
362+
target_arch = "x86",
363+
link(
364+
name = "api-ms-win-core-synch-l1-2-0",
365+
kind = "raw-dylib",
366+
import_name_type = "undecorated"
367+
)
368+
)]
369+
#[cfg_attr(
370+
not(target_arch = "x86"),
371+
link(name = "api-ms-win-core-synch-l1-2-0", kind = "raw-dylib")
372+
)]
361373
extern "system" {
362374
pub fn WaitOnAddress(
363375
address: *const c_void,

0 commit comments

Comments
 (0)