Martin Storsjo : wine/asm.h: Don't define __ASM_CFI when using clang as cross compiler.

Alexandre Julliard julliard at winehq.org
Fri May 29 15:22:56 CDT 2020


Module: wine
Branch: master
Commit: 264bd4fc84020f217807f1e59d3bfa9302e5110c
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=264bd4fc84020f217807f1e59d3bfa9302e5110c

Author: Martin Storsjo <martin at martin.st>
Date:   Fri May 29 13:51:04 2020 +0300

wine/asm.h: Don't define __ASM_CFI when using clang as cross compiler.

Consolidate the existing checks for __APPLE__ and __clang__ into one,
but only use it as long as __GNUC__ is defined (clang operating in
gcc compatible mode, as opposed to MSVC compatible mode) and as
long as __SEH__ isn't defined (which it is while cross compiling
targeting windows, when SEH is used as unwind format).

Signed-off-by: Martin Storsjo <martin at martin.st>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 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 7650d84a79..592f638306 100644
--- a/include/wine/asm.h
+++ b/include/wine/asm.h
@@ -33,7 +33,7 @@
 # define __ASM_STDCALL(name,args) __ASM_NAME(name)
 #endif
 
-#if defined(__GCC_HAVE_DWARF2_CFI_ASM) || defined(__APPLE__) || defined(__clang__)
+#if defined(__GCC_HAVE_DWARF2_CFI_ASM) || (defined(__clang__) && defined(__GNUC__) && !defined(__SEH__))
 # define __ASM_CFI(str) str
 #else
 # define __ASM_CFI(str)




More information about the wine-cvs mailing list