ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

linux-user: Remove THREAD macro 

Back when we used to support compiling either with or without
NPTL threading library support, we used a macro THREAD which would
expand either to nothing (no thread support) or to __thread (threads
supported). For a long time now we have required thread support,
so remove the macro and just use __thread directly as other parts
of QEMU do.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20180213132246.26844-1-peter.maydell@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
This commit is contained in:
Peter Maydell 2018-02-13 13:22:46 +00:00 committed by Laurent Vivier
parent 5fdefcf808
commit b44316fb36
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
linux-user/main.c
View File

@ -3835,7 +3835,7 @@ void cpu_loop(CPUHPPAState *env)
#endif /* TARGET_HPPA */ #endif /* TARGET_HPPA */
THREAD CPUState *thread_cpu; __thread CPUState *thread_cpu;
bool qemu_cpu_is_self(CPUState *cpu) bool qemu_cpu_is_self(CPUState *cpu)
{ {

4
linux-user/qemu.h
View File

@ -18,8 +18,6 @@
#include "exec/gdbstub.h" #include "exec/gdbstub.h"
#include "qemu/queue.h" #include "qemu/queue.h"
#define THREAD __thread
/* This is the size of the host kernel's sigset_t, needed where we make /* This is the size of the host kernel's sigset_t, needed where we make
* direct system calls that take a sigset_t pointer and a size. * direct system calls that take a sigset_t pointer and a size.
*/ */
@ -201,7 +199,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
abi_long arg5, abi_long arg6, abi_long arg7, abi_long arg5, abi_long arg6, abi_long arg7,
abi_long arg8); abi_long arg8);
void gemu_log(const char *fmt, ...) GCC_FMT_ATTR(1, 2); void gemu_log(const char *fmt, ...) GCC_FMT_ATTR(1, 2);
extern THREAD CPUState *thread_cpu; extern __thread CPUState *thread_cpu;
void cpu_loop(CPUArchState *env); void cpu_loop(CPUArchState *env);
const char *target_strerror(int err); const char *target_strerror(int err);
int get_osversion(void); int get_osversion(void);