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. --- ChangeLog | 6 ++++++ 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 ------------------------------ sysdeps/unix/sysv/linux/i386/fork.h | 27 +++++++++++++++++++++++++++ sysdeps/unix/sysv/linux/x86_64/fork.h | 27 +++++++++++++++++++++++++++ 6 files changed, 61 insertions(+), 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 create mode 100644 sysdeps/unix/sysv/linux/i386/fork.h create mode 100644 sysdeps/unix/sysv/linux/x86_64/fork.h diff --git a/ChangeLog b/ChangeLog index 5e452bd..d73d5eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2014-05-14 Roland McGrath + * nptl/sysdeps/unix/sysv/linux/fork.c: Use <> for fork.h #include. + * nptl/sysdeps/unix/sysv/linux/x86_64/fork.c: File removed. + * sysdeps/unix/sysv/linux/x86_64/fork.h: New file. + * nptl/sysdeps/unix/sysv/linux/i386/fork.c: File removed. + * sysdeps/unix/sysv/linux/i386/fork.h: New file. + * nptl/sysdeps/unix/sysv/linux/i386/not-cancel.h: Moved ... * sysdeps/unix/sysv/linux/not-cancel.h: ... here. * nptl/sysdeps/unix/sysv/linux/sparc/not-cancel.h: File removed. diff --git a/nptl/sysdeps/unix/sysv/linux/fork.c b/nptl/sysdeps/unix/sysv/linux/fork.c index 961fc8a..722ffce 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 79ee39e..0000000 --- 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 a036b92..0000000 --- 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" diff --git a/sysdeps/unix/sysv/linux/i386/fork.h b/sysdeps/unix/sysv/linux/i386/fork.h new file mode 100644 index 0000000..2919ccf --- /dev/null +++ b/sysdeps/unix/sysv/linux/i386/fork.h @@ -0,0 +1,27 @@ +/* Internal definitions for thread-friendly fork implementation. Linux/i386. + 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 + +#define ARCH_FORK() \ + INLINE_SYSCALL (clone, 5, \ + CLONE_CHILD_SETTID | CLONE_CHILD_CLEARTID | SIGCHLD, 0, \ + NULL, NULL, &THREAD_SELF->tid) + +#include_next diff --git a/sysdeps/unix/sysv/linux/x86_64/fork.h b/sysdeps/unix/sysv/linux/x86_64/fork.h new file mode 100644 index 0000000..1bd5301 --- /dev/null +++ b/sysdeps/unix/sysv/linux/x86_64/fork.h @@ -0,0 +1,27 @@ +/* Internal definitions for thread-friendly fork implementation. Linux/x86_64. + 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 + +#define ARCH_FORK() \ + INLINE_SYSCALL (clone, 4, \ + CLONE_CHILD_SETTID | CLONE_CHILD_CLEARTID | SIGCHLD, 0, \ + NULL, &THREAD_SELF->tid) + +#include_next -- cgit v1.1