--- /dev/null
+#include <unistd.h>
+#include <string.h>
+#include <signal.h>
+#include "syscall.h"
+#include "libc.h"
+#include "lock.h"
+#include "pthread_impl.h"
+
+static void dummy(int x)
+{
+}
+
+weak_alias(dummy, __fork_handler);
+weak_alias(dummy, __aio_atfork);
+
+pid_t fork(void)
+{
+ pid_t ret;
+ sigset_t set;
+ __fork_handler(-1);
+ __block_all_sigs(&set);
+ __aio_atfork(-1);
+ LOCK(__abort_lock);
+#ifdef SYS_fork
+ ret = __syscall(SYS_fork);
+#else
+ ret = __syscall(SYS_clone, SIGCHLD, 0);
+#endif
+ if (!ret) {
+ pthread_t self = __pthread_self();
+ 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;
+ if (libc.need_locks) libc.need_locks = -1;
+ }
+ UNLOCK(__abort_lock);
+ __aio_atfork(!ret);
+ __restore_sigs(&set);
+ __fork_handler(!ret);
+ return __syscall_ret(ret);
+}
+++ /dev/null
-#include <unistd.h>
-#include <string.h>
-#include <signal.h>
-#include "syscall.h"
-#include "libc.h"
-#include "lock.h"
-#include "pthread_impl.h"
-
-static void dummy(int x)
-{
-}
-
-weak_alias(dummy, __fork_handler);
-weak_alias(dummy, __aio_atfork);
-
-pid_t fork(void)
-{
- pid_t ret;
- sigset_t set;
- __fork_handler(-1);
- __block_all_sigs(&set);
- __aio_atfork(-1);
- LOCK(__abort_lock);
-#ifdef SYS_fork
- ret = __syscall(SYS_fork);
-#else
- ret = __syscall(SYS_clone, SIGCHLD, 0);
-#endif
- if (!ret) {
- pthread_t self = __pthread_self();
- 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;
- if (libc.need_locks) libc.need_locks = -1;
- }
- UNLOCK(__abort_lock);
- __aio_atfork(!ret);
- __restore_sigs(&set);
- __fork_handler(!ret);
- return __syscall_ret(ret);
-}