projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
work around regression building for armhf with clang (compiler bug)
[musl]
/
src
/
process
/
fork.c
diff --git
a/src/process/fork.c
b/src/process/fork.c
index
fb8a430
..
b96f002
100644
(file)
--- a/
src/process/fork.c
+++ b/
src/process/fork.c
@@
-1,5
+1,6
@@
#include <unistd.h>
#include <string.h>
#include <unistd.h>
#include <string.h>
+#include <signal.h>
#include "syscall.h"
#include "libc.h"
#include "pthread_impl.h"
#include "syscall.h"
#include "libc.h"
#include "pthread_impl.h"
@@
-13,15
+14,22
@@
weak_alias(dummy, __fork_handler);
pid_t fork(void)
{
pid_t ret;
pid_t fork(void)
{
pid_t ret;
+ sigset_t set;
__fork_handler(-1);
__fork_handler(-1);
+ __block_all_sigs(&set);
+#ifdef SYS_fork
ret = syscall(SYS_fork);
ret = syscall(SYS_fork);
- if (libc.main_thread && !ret) {
+#else
+ ret = syscall(SYS_clone, SIGCHLD, 0);
+#endif
+ if (!ret) {
pthread_t self = __pthread_self();
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;
libc.threads_minus_1 = 0;
libc.threads_minus_1 = 0;
- libc.main_thread = self;
}
}
+ __restore_sigs(&set);
__fork_handler(!ret);
return ret;
}
__fork_handler(!ret);
return ret;
}