-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
2 changed files
with
41 additions
and
5 deletions.
There are no files selected for viewing
31 changes: 31 additions & 0 deletions
31
mingw-w64-libgcrypt/0001-src-hwf-x86-disable-inline-assembly-CFI-directivies-.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,31 @@ | ||
From cc1d2f0148e9c9bc4f1c2eb771cb65f1d025ebbe Mon Sep 17 00:00:00 2001 | ||
From: Jussi Kivilinna <[email protected]> | ||
Date: Sat, 22 Jun 2024 15:51:06 +0300 | ||
Subject: [PATCH] src/hwf-x86: disable inline assembly CFI directivies for | ||
WIN32 | ||
|
||
* src/hwf-x86.c (CFI_ADJUST_CFA_OFFSET, CFI_PUSH4) | ||
(CFI_POP4): Define only if _WIN32 is not defined. | ||
-- | ||
|
||
Signed-off-by: Jussi Kivilinna <[email protected]> | ||
--- | ||
src/hwf-x86.c | 2 +- | ||
1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
||
diff --git a/src/hwf-x86.c b/src/hwf-x86.c | ||
index bda14d9d..d9d34c0e 100644 | ||
--- a/src/hwf-x86.c | ||
+++ b/src/hwf-x86.c | ||
@@ -39,7 +39,7 @@ | ||
#if defined (__i386__) && SIZEOF_UNSIGNED_LONG == 4 && defined (__GNUC__) | ||
# define HAS_X86_CPUID 1 | ||
|
||
-#ifdef HAVE_GCC_ASM_CFI_DIRECTIVES | ||
+#if defined(HAVE_GCC_ASM_CFI_DIRECTIVES) && !defined(_WIN32) | ||
# define CFI_ADJUST_CFA_OFFSET(off) ".cfi_adjust_cfa_offset " #off "\n\t" | ||
# define CFI_PUSH4 CFI_ADJUST_CFA_OFFSET(4) | ||
# define CFI_POP4 CFI_ADJUST_CFA_OFFSET(-4) | ||
-- | ||
2.43.0 | ||
|
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