diff options
| author | Chris Denton <chris@chrisdenton.dev> | 2024-04-16 15:53:09 +0000 |
|---|---|---|
| committer | Chris Denton <chris@chrisdenton.dev> | 2024-04-16 15:53:35 +0000 |
| commit | fbac8ef01c6a43b44500111cde136d7ac09097f4 (patch) | |
| tree | 6ee92eeea4fc69127affaa8ca5d7c47fc87246fd | |
| parent | e243f8d0e3af98e3689e7e38b6ac0a83100d000f (diff) | |
| download | rust-fbac8ef01c6a43b44500111cde136d7ac09097f4.tar.gz rust-fbac8ef01c6a43b44500111cde136d7ac09097f4.zip | |
Cranelift: Revert raw-dylib for Windows futex APIs
| -rw-r--r-- | patches/0030-stdlib-Revert-use-raw-dylib-for-Windows-futex-APIs.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/patches/0030-stdlib-Revert-use-raw-dylib-for-Windows-futex-APIs.patch b/patches/0030-stdlib-Revert-use-raw-dylib-for-Windows-futex-APIs.patch new file mode 100644 index 00000000000..21f5ee9cc6e --- /dev/null +++ b/patches/0030-stdlib-Revert-use-raw-dylib-for-Windows-futex-APIs.patch @@ -0,0 +1,37 @@ +From 0d741cf82c3c908616abd39dc84ebf7d8702e0c3 Mon Sep 17 00:00:00 2001 +From: Chris Denton <chris@chrisdenton.dev> +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 + |