From ec136444ca77f7a64e2c3616fc560b6410a767d2 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Wed, 14 May 2014 11:31:37 -0700 Subject: x86: Consolidate NPTL fork. --- nptl/sysdeps/unix/sysv/linux/fork.c | 2 +- nptl/sysdeps/unix/sysv/linux/i386/fork.c | 30 ------------------------------ nptl/sysdeps/unix/sysv/linux/x86_64/fork.c | 30 ------------------------------ 3 files changed, 1 insertion(+), 61 deletions(-) delete mode 100644 nptl/sysdeps/unix/sysv/linux/i386/fork.c delete mode 100644 nptl/sysdeps/unix/sysv/linux/x86_64/fork.c (limited to 'nptl') 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 #include #include -#include "fork.h" #include #include #include #include #include +#include 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 , 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 - . */ - -#include -#include -#include -#include - - -#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 , 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 - . */ - -#include -#include -#include -#include - - -#define ARCH_FORK() \ - INLINE_SYSCALL (clone, 4, \ - CLONE_CHILD_SETTID | CLONE_CHILD_CLEARTID | SIGCHLD, 0, \ - NULL, &THREAD_SELF->tid) - -#include "../fork.c" -- cgit 1.4.1