fix arm __tlsdesc_dynamic when built as thumb code without __ARM_ARCH>=5

[musl] / src / process / fork.c

diff --git a/src/process/fork.c b/src/process/fork.c
index f8cf21e..fb42478 100644 (file)
--- a/src/process/fork.c
+++ b/src/process/fork.c
@@ -18,17 +18,20 @@ pid_t fork(void)
        __fork_handler(-1);
        __block_all_sigs(&set);
 #ifdef SYS_fork
-       ret = syscall(SYS_fork);
+       ret = __syscall(SYS_fork);
 #else
-       ret = syscall(SYS_clone, SIGCHLD, 0);
+       ret = __syscall(SYS_clone, SIGCHLD, 0);
 #endif
-       if (libc.has_thread_pointer && !ret) {
+       if (!ret) {
                pthread_t self = __pthread_self();
-               self->tid = self->pid = __syscall(SYS_getpid);
-               memset(&self->robust_list, 0, sizeof self->robust_list);
+               self->tid = __syscall(SYS_gettid);
+               self->robust_list.off = 0;
+               self->robust_list.pending = 0;
+               self->next = self->prev = self;
+               __thread_list_lock = 0;
                libc.threads_minus_1 = 0;
        }
        __restore_sigs(&set);
        __fork_handler(!ret);
-       return ret;
+       return __syscall_ret(ret);
 }