Merge pull request #3 from pricechrispy/glibc2.31-stime

glibc2.31-stime: Fix build on glibc>=2.31 by replacing stime() with c…
glibc2.31-stime: Fix build on glibc>=2.31 by replacing stime() with clock_settime().
2020-02-23 14:35:34 -05:00 · 2020-02-23 11:16:48 -08:00 · 2019-10-07 21:56:01 -04:00 · 2019-10-08 01:49:23 +00:00 · 2019-10-08 01:47:01 +00:00
1 changed files with 11 additions and 16 deletions
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@ -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
 #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)
 _syscall3(int, sys_getdents, uint, fd, struct linux_dirent *, dirp, uint, count);
 #endif
@ -6448,7 +6442,7 @@ static void *clone_func(void *arg)
    cpu = ENV_GET_CPU(env);
    thread_cpu = cpu;
    ts = (TaskState *)cpu->opaque;
-    info->tid = gettid();
+    info->tid = sys_gettid();
    task_settid(ts);
 #ifdef TARGET_ABI_IRIX
    /* 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
               the child process gets its own copy of the lock.  */
            if (flags & CLONE_CHILD_SETTID)
-                put_user_u32(gettid(), child_tidptr);
+                put_user_u32(sys_gettid(), child_tidptr);
            if (flags & CLONE_PARENT_SETTID)
-                put_user_u32(gettid(), parent_tidptr);
+                put_user_u32(sys_gettid(), parent_tidptr);
            if (flags & CLONE_SETTLS)
                cpu_set_tls (env, newtls);
            if (flags & CLONE_CHILD_CLEARTID)
@ -8867,10 +8861,11 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
 #ifdef TARGET_NR_stime /* not on alpha */
    case TARGET_NR_stime:
        {
-            time_t host_time;
+            struct timespec ts;
-            if (get_user_sal(host_time, arg1))
+            ts.tv_nsec = 0;
            if (get_user_sal(ts.tv_sec, arg1))
                goto efault;
-            ret = get_errno(stime(&host_time));
+            ret = get_errno(clock_settime(CLOCK_REALTIME, &ts));
        }
        break;
 #endif
@ -12589,7 +12584,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
 #endif
 #ifdef TARGET_NR_gettid
    case TARGET_NR_gettid:
-        ret = get_errno(gettid());
+        ret = get_errno(sys_gettid());
        break;
 #endif
 #ifdef TARGET_NR_readahead
Author	SHA1	Message	Date
Revo	6d7d1fde2f	Merge pull request #3 from pricechrispy/glibc2.31-stime glibc2.31-stime: Fix build on glibc>=2.31 by replacing stime() with c…	2020-02-23 14:35:34 -05:00
Christopher Price	364524131d	glibc2.31-stime: Fix build on glibc>=2.31 by replacing stime() with clock_settime(). The obsolete function stime is no longer available to newly linked binaries, and its declaration has been removed from <time.h>. Programs that set the system time should use clock_settime instead. https://lwn.net/Articles/811275/ https://linux.die.net/man/3/clock_settime	2020-02-23 11:16:48 -08:00
mountainflaw	23b58bb197	Merge pull request #2 from queueRAM/sys_gettid linux-user: rename gettid() to sys_gettid() to avoid clash with glibc	2019-10-07 21:56:01 -04:00
Daniel P. Berrangé	939acda8af	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é <berrange@redhat.com> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Laurent Vivier <laurent@vivier.eu> Message-Id: <20190320161842.13908-3-berrange@redhat.com> Signed-off-by: Laurent Vivier <laurent@vivier.eu>	2019-10-08 01:49:23 +00:00
Daniel P. Berrangé	d233430274	linux-user: assume __NR_gettid always exists The gettid syscall was introduced in Linux 2.4.11. This is old enough that we can assume it always exists and thus not bother with the conditional backcompat logic. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Laurent Vivier <laurent@vivier.eu> Message-Id: <20190320161842.13908-2-berrange@redhat.com> Signed-off-by: Laurent Vivier <laurent@vivier.eu>	2019-10-08 01:47:01 +00:00