fix MSVC MzCOM build
This commit is contained in:
parent
d4fb5ecec5
commit
a98947e81e
|
@ -1,13 +1,18 @@
|
||||||
#ifdef IMPLEMENT_THREAD_LOCAL_VIA_WIN_TLS
|
#ifdef IMPLEMENT_THREAD_LOCAL_VIA_WIN_TLS
|
||||||
|
|
||||||
|
# ifndef NO_TLS_INDEX_FOR_WIN_TLS
|
||||||
extern intptr_t _tls_index;
|
extern intptr_t _tls_index;
|
||||||
|
# define REGISTER_TLS_INDEX_ARG _tls_index
|
||||||
|
# else
|
||||||
|
# define REGISTER_TLS_INDEX_ARG 0
|
||||||
|
# endif
|
||||||
|
|
||||||
# ifdef __MINGW32__
|
# ifdef __MINGW32__
|
||||||
static __thread void *tls_space;
|
static __thread void *tls_space;
|
||||||
# else
|
# else
|
||||||
static __declspec(thread) void *tls_space;
|
static __declspec(thread) void *tls_space;
|
||||||
# endif
|
# endif
|
||||||
#endif
|
|
||||||
|
|
||||||
# ifdef IMPLEMENT_THREAD_LOCAL_VIA_WIN_TLS
|
|
||||||
static void register_win_tls()
|
static void register_win_tls()
|
||||||
{
|
{
|
||||||
# ifdef __MINGW32__
|
# ifdef __MINGW32__
|
||||||
|
@ -22,12 +27,13 @@ static void register_win_tls()
|
||||||
# else
|
# else
|
||||||
asm("mov %%fs:(0x2C), %0;" :"=r"(base));
|
asm("mov %%fs:(0x2C), %0;" :"=r"(base));
|
||||||
# endif
|
# endif
|
||||||
scheme_register_tls_space(*base, _tls_index);
|
scheme_register_tls_space(*base, REGISTER_TLS_INDEX_ARG);
|
||||||
}
|
}
|
||||||
# else
|
# else
|
||||||
scheme_register_tls_space(&tls_space, _tls_index);
|
scheme_register_tls_space(&tls_space, REGISTER_TLS_INDEX_ARG);
|
||||||
# endif
|
# endif
|
||||||
}
|
}
|
||||||
# else
|
|
||||||
|
#else
|
||||||
static void register_win_tls() {}
|
static void register_win_tls() {}
|
||||||
# endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue
Block a user