[PATCH 1/1] include: Emit CFI directives when building on Mac with gcc.

Stefan Dösinger wine at gitlab.winehq.org
Wed Jun 15 06:09:08 CDT 2022


From: Stefan Dösinger <stefan at codeweavers.com>

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53157

Building with FSF gcc on mac is possible and the only way to get a
--without-mingw build since clang does not support -mabi=ms. (Some
hacks are needed to build winemac.drv.so though.)

Signed-off-by: Stefan Dösinger <stefan at codeweavers.com>

---

No, FSF gcc on macos does not define __GCC_HAVE_DWARF2_CFI_ASM.
---
 include/wine/asm.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/wine/asm.h b/include/wine/asm.h
index 0547ee94b19..2c996ccd86b 100644
--- a/include/wine/asm.h
+++ b/include/wine/asm.h
@@ -35,7 +35,7 @@
 # define __ASM_FASTCALL(name,args) __ASM_NAME("__fastcall_" name)
 #endif
 
-#if defined(__GCC_HAVE_DWARF2_CFI_ASM) || (defined(__clang__) && defined(__GNUC__) && !defined(__SEH__))
+#if defined(__GCC_HAVE_DWARF2_CFI_ASM) || ((defined(__APPLE__) || defined(__clang__)) && defined(__GNUC__) && !defined(__SEH__))
 # define __ASM_CFI(str) str
 #else
 # define __ASM_CFI(str)
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/249



More information about the wine-devel mailing list