Skip to content

Commit 939acda

Browse files
berrangequeueRAM
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 d233430 commit 939acda

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
@@ -259,7 +259,8 @@ static inline type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5,
259259
#define TARGET_NR__llseek TARGET_NR_llseek
260260
#endif
261261

262-
_syscall0(int, gettid)
262+
#define __NR_sys_gettid __NR_gettid
263+
_syscall0(int, sys_gettid)
263264

264265
#if defined(TARGET_NR_getdents) && defined(__NR_getdents)
265266
_syscall3(int, sys_getdents, uint, fd, struct linux_dirent *, dirp, uint, count);
@@ -6441,7 +6442,7 @@ static void *clone_func(void *arg)
64416442
cpu = ENV_GET_CPU(env);
64426443
thread_cpu = cpu;
64436444
ts = (TaskState *)cpu->opaque;
6444-
info->tid = gettid();
6445+
info->tid = sys_gettid();
64456446
task_settid(ts);
64466447
#ifdef TARGET_ABI_IRIX
64476448
/* TODO: which fields in the PRDA are filled in by the IRIX kernel? */
@@ -6603,9 +6604,9 @@ static int do_fork(CPUArchState *env, unsigned int flags, abi_ulong newsp,
66036604
mapping. We can't repeat the spinlock hack used above because
66046605
the child process gets its own copy of the lock. */
66056606
if (flags & CLONE_CHILD_SETTID)
6606-
put_user_u32(gettid(), child_tidptr);
6607+
put_user_u32(sys_gettid(), child_tidptr);
66076608
if (flags & CLONE_PARENT_SETTID)
6608-
put_user_u32(gettid(), parent_tidptr);
6609+
put_user_u32(sys_gettid(), parent_tidptr);
66096610
if (flags & CLONE_SETTLS)
66106611
cpu_set_tls (env, newtls);
66116612
if (flags & CLONE_CHILD_CLEARTID)
@@ -12582,7 +12583,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
1258212583
#endif
1258312584
#ifdef TARGET_NR_gettid
1258412585
case TARGET_NR_gettid:
12585-
ret = get_errno(gettid());
12586+
ret = get_errno(sys_gettid());
1258612587
break;
1258712588
#endif
1258812589
#ifdef TARGET_NR_readahead

0 commit comments

Comments
 (0)