Skip to content

W
wine-winehq
Commit 05806e0e authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard
Browse files
Options

msvcrt: Use GCC-style assembly on Clang MSVC target.

Signed-off-by: 's avatarJacek Caban <jacek@codeweavers.com> Signed-off-by: 's avatarPiotr Caban <piotr@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent e8936e79
Show whitespace changes
Inline Side-by-side
Showing with 10 additions and 10 deletions
dlls/msvcrt/math.c
View file @ 05806e0e
...@@ -1297,7 +1297,7 @@ double CDECL tanh( double x ) ...@@ -1297,7 +1297,7 @@ double CDECL tanh( double x )
} }
#if defined(__GNUC__) && defined(__i386__) #if (defined(__GNUC__) || defined(__clang__)) && defined(__i386__)
#define CREATE_FPU_FUNC1(name, call) \ #define CREATE_FPU_FUNC1(name, call) \
__ASM_GLOBAL_FUNC(name, \ __ASM_GLOBAL_FUNC(name, \
...@@ -1411,7 +1411,7 @@ __ASM_GLOBAL_FUNC(_ftol, ...@@ -1411,7 +1411,7 @@ __ASM_GLOBAL_FUNC(_ftol,
__ASM_CFI(".cfi_same_value %ebp\n\t") __ASM_CFI(".cfi_same_value %ebp\n\t")
"ret") "ret")
#endif /* defined(__GNUC__) && defined(__i386__) */ #endif /* (defined(__GNUC__) || defined(__clang__)) && defined(__i386__) */
/********************************************************************* /*********************************************************************
* _fpclass (MSVCRT.@) * _fpclass (MSVCRT.@)
...@@ -1638,7 +1638,7 @@ double CDECL modf( double x, double *iptr ) ...@@ -1638,7 +1638,7 @@ double CDECL modf( double x, double *iptr )
#if defined(__i386__) || defined(__x86_64__) #if defined(__i386__) || defined(__x86_64__)
void CDECL _statusfp2( unsigned int *x86_sw, unsigned int *sse2_sw ) void CDECL _statusfp2( unsigned int *x86_sw, unsigned int *sse2_sw )
{ {
#ifdef __GNUC__ #if defined(__GNUC__) || defined(__clang__)
unsigned int flags; unsigned int flags;
unsigned long fpword; unsigned long fpword;
...@@ -1710,7 +1710,7 @@ unsigned int CDECL _statusfp(void) ...@@ -1710,7 +1710,7 @@ unsigned int CDECL _statusfp(void)
unsigned int CDECL _clearfp(void) unsigned int CDECL _clearfp(void)
{ {
unsigned int flags = 0; unsigned int flags = 0;
#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) #if (defined(__GNUC__) || defined(__clang__)) && (defined(__i386__) || defined(__x86_64__))
unsigned long fpword; unsigned long fpword;
__asm__ __volatile__( "fnstsw %0; fnclex" : "=m" (fpword) ); __asm__ __volatile__( "fnstsw %0; fnclex" : "=m" (fpword) );
...@@ -1802,7 +1802,7 @@ double CDECL _chgsign(double num) ...@@ -1802,7 +1802,7 @@ double CDECL _chgsign(double num)
int CDECL __control87_2( unsigned int newval, unsigned int mask, int CDECL __control87_2( unsigned int newval, unsigned int mask,
unsigned int *x86_cw, unsigned int *sse2_cw ) unsigned int *x86_cw, unsigned int *sse2_cw )
{ {
#ifdef __GNUC__ #if defined(__GNUC__) || defined(__clang__)
unsigned long fpword; unsigned long fpword;
unsigned int flags; unsigned int flags;
unsigned int old_flags; unsigned int old_flags;
...@@ -2152,7 +2152,7 @@ int CDECL _finite(double num) ...@@ -2152,7 +2152,7 @@ int CDECL _finite(double num)
*/ */
void CDECL _fpreset(void) void CDECL _fpreset(void)
{ {
#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) #if (defined(__GNUC__) || defined(__clang__)) && (defined(__i386__) || defined(__x86_64__))
const unsigned int x86_cw = 0x27f; const unsigned int x86_cw = 0x27f;
__asm__ __volatile__( "fninit; fldcw %0" : : "m" (x86_cw) ); __asm__ __volatile__( "fninit; fldcw %0" : : "m" (x86_cw) );
if (sse2_supported) if (sse2_supported)
...@@ -2171,7 +2171,7 @@ void CDECL _fpreset(void) ...@@ -2171,7 +2171,7 @@ void CDECL _fpreset(void)
*/ */
int CDECL fesetenv(const fenv_t *env) int CDECL fesetenv(const fenv_t *env)
{ {
#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) #if (defined(__GNUC__) || defined(__clang__)) && (defined(__i386__) || defined(__x86_64__))
struct { struct {
WORD control_word; WORD control_word;
WORD unused1; WORD unused1;
......
dlls/msvcrt/misc.c
View file @ 05806e0e
...@@ -213,7 +213,7 @@ void* CDECL bsearch(const void *key, const void *base, size_t nmemb, ...@@ -213,7 +213,7 @@ void* CDECL bsearch(const void *key, const void *base, size_t nmemb,
*/ */
#ifdef __i386__ #ifdef __i386__
# ifdef __GNUC__ # if defined(__GNUC__) || defined(__clang__)
__ASM_GLOBAL_FUNC(_chkesp, __ASM_GLOBAL_FUNC(_chkesp,
"jnz 1f\n\t" "jnz 1f\n\t"
...@@ -242,7 +242,7 @@ void CDECL DECLSPEC_HIDDEN chkesp_fail(void) ...@@ -242,7 +242,7 @@ void CDECL DECLSPEC_HIDDEN chkesp_fail(void)
DebugBreak(); DebugBreak();
} }
# else /* __GNUC__ */ # else /* __GNUC__ || __clang__ */
/**********************************************************************/ /**********************************************************************/
...@@ -250,7 +250,7 @@ void CDECL _chkesp(void) ...@@ -250,7 +250,7 @@ void CDECL _chkesp(void)
{ {
} }
# endif /* __GNUC__ */ # endif /* __GNUC__ || __clang__ */
#endif /* __i386__ */ #endif /* __i386__ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment