Skip to content

Commit 967072f

Browse files
berrangepeng-hui
authored andcommitted
linux-user: rename gettid() to sys_gettid() to avoid clash with glibc
The glibc-2.29.9000-6.fc31.x86_64 package finally includes the gettid() function as part of unistd.h when __USE_GNU is defined. This clashes with linux-user code which unconditionally defines this function name itself. /home/berrange/src/virt/qemu/linux-user/syscall.c:253:16: error: static declaration of ‘gettid’ follows non-static declaration 253 | _syscall0(int, gettid) | ^~~~~~ /home/berrange/src/virt/qemu/linux-user/syscall.c:184:13: note: in definition of macro ‘_syscall0’ 184 | static type name (void) \ | ^~~~ In file included from /usr/include/unistd.h:1170, from /home/berrange/src/virt/qemu/include/qemu/osdep.h:107, from /home/berrange/src/virt/qemu/linux-user/syscall.c:20: /usr/include/bits/unistd_ext.h:34:16: note: previous declaration of ‘gettid’ was here 34 | extern __pid_t gettid (void) __THROW; | ^~~~~~ CC aarch64-linux-user/linux-user/signal.o make[1]: *** [/home/berrange/src/virt/qemu/rules.mak:69: linux-user/syscall.o] Error 1 make[1]: *** Waiting for unfinished jobs.... make: *** [Makefile:449: subdir-aarch64-linux-user] Error 2 While we could make our definition conditional and rely on glibc's impl, this patch simply renames our definition to sys_gettid() which is a common pattern in this file. Signed-off-by: Daniel P. Berrangé <[email protected]> Reviewed-by: Richard Henderson <[email protected]> Reviewed-by: Laurent Vivier <[email protected]> Message-Id: <[email protected]> Signed-off-by: Laurent Vivier <[email protected]>
1 parent 4b85b35 commit 967072f

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

linux-user/syscall.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,8 @@ static type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5, \
250250
#define TARGET_NR__llseek TARGET_NR_llseek
251251
#endif
252252

253-
_syscall0(int, gettid)
253+
#define __NR_sys_gettid __NR_gettid
254+
_syscall0(int, sys_gettid)
254255

255256
/* For the 64-bit guest on 32-bit host case we must emulate
256257
* getdents using getdents64, because otherwise the host
@@ -6376,7 +6377,7 @@ static void *clone_func(void *arg)
63766377
cpu = ENV_GET_CPU(env);
63776378
thread_cpu = cpu;
63786379
ts = (TaskState *)cpu->opaque;
6379-
info->tid = gettid();
6380+
info->tid = sys_gettid();
63806381
task_settid(ts);
63816382
if (info->child_tidptr)
63826383
put_user_u32(info->tid, info->child_tidptr);
@@ -6521,9 +6522,9 @@ static int do_fork(CPUArchState *env, unsigned int flags, abi_ulong newsp,
65216522
mapping. We can't repeat the spinlock hack used above because
65226523
the child process gets its own copy of the lock. */
65236524
if (flags & CLONE_CHILD_SETTID)
6524-
put_user_u32(gettid(), child_tidptr);
6525+
put_user_u32(sys_gettid(), child_tidptr);
65256526
if (flags & CLONE_PARENT_SETTID)
6526-
put_user_u32(gettid(), parent_tidptr);
6527+
put_user_u32(sys_gettid(), parent_tidptr);
65276528
ts = (TaskState *)cpu->opaque;
65286529
if (flags & CLONE_SETTLS)
65296530
cpu_set_tls (env, newtls);
@@ -11795,7 +11796,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
1179511796
break;
1179611797
#endif
1179711798
case TARGET_NR_gettid:
11798-
ret = get_errno(gettid());
11799+
ret = get_errno(sys_gettid());
1179911800
break;
1180011801
#ifdef TARGET_NR_readahead
1180111802
case TARGET_NR_readahead:

0 commit comments

Comments
 (0)