falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2 from queueRAM/sys_gettid 

linux-user: rename gettid() to sys_gettid() to avoid clash with glibc
This commit is contained in:
mountainflaw 2019-10-07 21:56:01 -04:00 committed by GitHub
parent 32ab296eef 939acda8af
commit 23b58bb197
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
linux-user/syscall.c
View File

@ -259,15 +259,9 @@ static inline type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5,
#define TARGET_NR__llseek TARGET_NR_llseek #define TARGET_NR__llseek TARGET_NR_llseek
#endif #endif
#ifdef __NR_gettid #define __NR_sys_gettid __NR_gettid
_syscall0(int, gettid) _syscall0(int, sys_gettid)
#else
/* This is a replacement for the host gettid() and must return a host
errno. */
static int gettid(void) {
return -ENOSYS;
}
#endif
#if defined(TARGET_NR_getdents) && defined(__NR_getdents) #if defined(TARGET_NR_getdents) && defined(__NR_getdents)
_syscall3(int, sys_getdents, uint, fd, struct linux_dirent *, dirp, uint, count); _syscall3(int, sys_getdents, uint, fd, struct linux_dirent *, dirp, uint, count);
#endif #endif
@ -6448,7 +6442,7 @@ static void *clone_func(void *arg)
cpu = ENV_GET_CPU(env); cpu = ENV_GET_CPU(env);
thread_cpu = cpu; thread_cpu = cpu;
ts = (TaskState *)cpu->opaque; ts = (TaskState *)cpu->opaque;
info->tid = gettid(); info->tid = sys_gettid();
task_settid(ts); task_settid(ts);
#ifdef TARGET_ABI_IRIX #ifdef TARGET_ABI_IRIX
/* TODO: which fields in the PRDA are filled in by the IRIX kernel? */ /* TODO: which fields in the PRDA are filled in by the IRIX kernel? */
@ -6610,9 +6604,9 @@ static int do_fork(CPUArchState *env, unsigned int flags, abi_ulong newsp,
mapping. We can't repeat the spinlock hack used above because mapping. We can't repeat the spinlock hack used above because
the child process gets its own copy of the lock. */ the child process gets its own copy of the lock. */
if (flags & CLONE_CHILD_SETTID) if (flags & CLONE_CHILD_SETTID)
put_user_u32(gettid(), child_tidptr); put_user_u32(sys_gettid(), child_tidptr);
if (flags & CLONE_PARENT_SETTID) if (flags & CLONE_PARENT_SETTID)
put_user_u32(gettid(), parent_tidptr); put_user_u32(sys_gettid(), parent_tidptr);
if (flags & CLONE_SETTLS) if (flags & CLONE_SETTLS)
cpu_set_tls (env, newtls); cpu_set_tls (env, newtls);
if (flags & CLONE_CHILD_CLEARTID) if (flags & CLONE_CHILD_CLEARTID)
@ -12589,7 +12583,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
#endif #endif
#ifdef TARGET_NR_gettid #ifdef TARGET_NR_gettid
case TARGET_NR_gettid: case TARGET_NR_gettid:
ret = get_errno(gettid()); ret = get_errno(sys_gettid());
break; break;
#endif #endif
#ifdef TARGET_NR_readahead #ifdef TARGET_NR_readahead