diff options
Diffstat (limited to 'linux-user')
| -rw-r--r-- | linux-user/main.c | 6 | ||||
| -rw-r--r-- | linux-user/mmap.c | 2 | ||||
| -rw-r--r-- | linux-user/qemu.h | 8 | ||||
| -rw-r--r-- | linux-user/syscall.c | 20 |
4 files changed, 18 insertions, 18 deletions
diff --git a/linux-user/main.c b/linux-user/main.c index 4388c04c9a..20a25769f9 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -108,7 +108,7 @@ int64_t cpu_get_real_ticks(void) #endif -#if defined(USE_NPTL) +#if defined(CONFIG_USE_NPTL) /***********************************************************/ /* Helper routines for implementing atomic operations. */ @@ -222,7 +222,7 @@ void cpu_list_unlock(void) { pthread_mutex_unlock(&cpu_list_mutex); } -#else /* if !USE_NPTL */ +#else /* if !CONFIG_USE_NPTL */ /* These are no-ops because we are not threadsafe. */ static inline void cpu_exec_start(CPUState *env) { @@ -2357,7 +2357,7 @@ THREAD CPUState *thread_env; void task_settid(TaskState *ts) { if (ts->ts_tid == 0) { -#ifdef USE_NPTL +#ifdef CONFIG_USE_NPTL ts->ts_tid = (pid_t)syscall(SYS_gettid); #else /* when no threads are used, tid becomes pid */ diff --git a/linux-user/mmap.c b/linux-user/mmap.c index e05caa0a11..3d2c8b3073 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c @@ -33,7 +33,7 @@ //#define DEBUG_MMAP -#if defined(USE_NPTL) +#if defined(CONFIG_USE_NPTL) pthread_mutex_t mmap_mutex = PTHREAD_MUTEX_INITIALIZER; static int __thread mmap_lock_count; diff --git a/linux-user/qemu.h b/linux-user/qemu.h index 8e728a3d28..f0e410b261 100644 --- a/linux-user/qemu.h +++ b/linux-user/qemu.h @@ -20,7 +20,7 @@ #include "gdbstub.h" #include "sys-queue.h" -#if defined(USE_NPTL) +#if defined(CONFIG_USE_NPTL) #define THREAD __thread #else #define THREAD @@ -104,7 +104,7 @@ typedef struct TaskState { uint32_t v86flags; uint32_t v86mask; #endif -#ifdef USE_NPTL +#ifdef CONFIG_USE_NPTL abi_ulong child_tidptr; #endif #ifdef TARGET_M68K @@ -244,7 +244,7 @@ void mmap_unlock(void); abi_ulong mmap_find_vma(abi_ulong, abi_ulong); void cpu_list_lock(void); void cpu_list_unlock(void); -#if defined(USE_NPTL) +#if defined(CONFIG_USE_NPTL) void mmap_fork_start(void); void mmap_fork_end(int child); #endif @@ -441,7 +441,7 @@ static inline void *lock_user_string(abi_ulong guest_addr) #define unlock_user_struct(host_ptr, guest_addr, copy) \ unlock_user(host_ptr, guest_addr, (copy) ? sizeof(*host_ptr) : 0) -#if defined(USE_NPTL) +#if defined(CONFIG_USE_NPTL) #include <pthread.h> #endif diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 4b230ddfc9..b5f669e282 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -82,7 +82,7 @@ #include "qemu.h" #include "qemu-common.h" -#if defined(USE_NPTL) +#if defined(CONFIG_USE_NPTL) #define CLONE_NPTL_FLAGS2 (CLONE_SETTLS | \ CLONE_PARENT_SETTID | CLONE_CHILD_SETTID | CLONE_CHILD_CLEARTID) #else @@ -219,7 +219,7 @@ _syscall1(int,exit_group,int,error_code) #if defined(TARGET_NR_set_tid_address) && defined(__NR_set_tid_address) _syscall1(int,set_tid_address,int *,tidptr) #endif -#if defined(USE_NPTL) +#if defined(CONFIG_USE_NPTL) #if defined(TARGET_NR_futex) && defined(__NR_futex) _syscall6(int,sys_futex,int *,uaddr,int,op,int,val, const struct timespec *,timeout,int *,uaddr2,int,val3) @@ -3458,7 +3458,7 @@ static abi_long do_arch_prctl(CPUX86State *env, int code, abi_ulong addr) #endif /* defined(TARGET_I386) */ -#if defined(USE_NPTL) +#if defined(CONFIG_USE_NPTL) #define NEW_STACK_SIZE PTHREAD_STACK_MIN @@ -3527,7 +3527,7 @@ static int do_fork(CPUState *env, unsigned int flags, abi_ulong newsp, TaskState *ts; uint8_t *new_stack; CPUState *new_env; -#if defined(USE_NPTL) +#if defined(CONFIG_USE_NPTL) unsigned int nptl_flags; sigset_t sigmask; #endif @@ -3538,7 +3538,7 @@ static int do_fork(CPUState *env, unsigned int flags, abi_ulong newsp, if (flags & CLONE_VM) { TaskState *parent_ts = (TaskState *)env->opaque; -#if defined(USE_NPTL) +#if defined(CONFIG_USE_NPTL) new_thread_info info; pthread_attr_t attr; #endif @@ -3552,7 +3552,7 @@ static int do_fork(CPUState *env, unsigned int flags, abi_ulong newsp, new_env->opaque = ts; ts->bprm = parent_ts->bprm; ts->info = parent_ts->info; -#if defined(USE_NPTL) +#if defined(CONFIG_USE_NPTL) nptl_flags = flags; flags &= ~CLONE_NPTL_FLAGS2; @@ -3621,7 +3621,7 @@ static int do_fork(CPUState *env, unsigned int flags, abi_ulong newsp, /* Child Process. */ cpu_clone_regs(env, newsp); fork_end(1); -#if defined(USE_NPTL) +#if defined(CONFIG_USE_NPTL) /* There is a race condition here. The parent process could theoretically read the TID in the child process before the child tid is set. This would require using either ptrace @@ -4016,7 +4016,7 @@ static inline abi_long host_to_target_stat64(void *cpu_env, } #endif -#if defined(USE_NPTL) +#if defined(CONFIG_USE_NPTL) /* ??? Using host futex calls even when target atomic operations are not really atomic probably breaks things. However implementing futexes locally would make futexes shared between multiple processes @@ -4126,7 +4126,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, switch(num) { case TARGET_NR_exit: -#ifdef USE_NPTL +#ifdef CONFIG_USE_NPTL /* In old applications this may be used to implement _exit(2). However in threaded applictions it is used for thread termination, and _exit_group is used for application termination. @@ -6828,7 +6828,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, } break; #endif -#if defined(USE_NPTL) +#if defined(CONFIG_USE_NPTL) case TARGET_NR_futex: ret = do_futex(arg1, arg2, arg3, arg4, arg5, arg6); break; |