diff options
| author | Roland McGrath <roland@hack.frob.com> | 2014-05-14 11:31:37 -0700 |
|---|---|---|
| committer | Roland McGrath <roland@hack.frob.com> | 2014-05-14 11:31:37 -0700 |
| commit | ec136444ca77f7a64e2c3616fc560b6410a767d2 (patch) | |
| tree | c93f4ef9a176de7e9b7a102f3ab096769dabc94e /nptl | |
| parent | 2fbdf5339aaeaa423bd661524f7ec7af41fa2606 (diff) | |
| download | glibc-ec136444ca77f7a64e2c3616fc560b6410a767d2.tar glibc-ec136444ca77f7a64e2c3616fc560b6410a767d2.tar.gz glibc-ec136444ca77f7a64e2c3616fc560b6410a767d2.tar.bz2 glibc-ec136444ca77f7a64e2c3616fc560b6410a767d2.zip | |
x86: Consolidate NPTL fork.
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/fork.c | 2 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/i386/fork.c | 30 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/x86_64/fork.c | 30 |
3 files changed, 1 insertions, 61 deletions
diff --git a/nptl/sysdeps/unix/sysv/linux/fork.c b/nptl/sysdeps/unix/sysv/linux/fork.c index 961fc8a5ea..722ffce250 100644 --- a/nptl/sysdeps/unix/sysv/linux/fork.c +++ b/nptl/sysdeps/unix/sysv/linux/fork.c @@ -23,12 +23,12 @@ #include <sysdep.h> #include <libio/libioP.h> #include <tls.h> -#include "fork.h" #include <hp-timing.h> #include <ldsodefs.h> #include <bits/stdio-lock.h> #include <atomic.h> #include <pthreadP.h> +#include <fork.h> unsigned long int *__fork_generation_pointer; diff --git a/nptl/sysdeps/unix/sysv/linux/i386/fork.c b/nptl/sysdeps/unix/sysv/linux/i386/fork.c deleted file mode 100644 index 79ee39e1ee..0000000000 --- a/nptl/sysdeps/unix/sysv/linux/i386/fork.c +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright (C) 2002-2014 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - <http://www.gnu.org/licenses/>. */ - -#include <sched.h> -#include <signal.h> -#include <sysdep.h> -#include <tls.h> - - -#define ARCH_FORK() \ - INLINE_SYSCALL (clone, 5, \ - CLONE_CHILD_SETTID | CLONE_CHILD_CLEARTID | SIGCHLD, 0, \ - NULL, NULL, &THREAD_SELF->tid) - -#include "../fork.c" diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/fork.c b/nptl/sysdeps/unix/sysv/linux/x86_64/fork.c deleted file mode 100644 index a036b923ff..0000000000 --- a/nptl/sysdeps/unix/sysv/linux/x86_64/fork.c +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright (C) 2003-2014 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@redhat.com>, 2003. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - <http://www.gnu.org/licenses/>. */ - -#include <sched.h> -#include <signal.h> -#include <sysdep.h> -#include <tls.h> - - -#define ARCH_FORK() \ - INLINE_SYSCALL (clone, 4, \ - CLONE_CHILD_SETTID | CLONE_CHILD_CLEARTID | SIGCHLD, 0, \ - NULL, &THREAD_SELF->tid) - -#include "../fork.c" |