diff options
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/fork.c | 1 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/arch-fork.h (renamed from sysdeps/unix/sysv/linux/i386/fork.h) | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/mips/arch-fork.h | 1 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/mips/fork.h | 1 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/powerpc/arch-fork.h | 1 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/powerpc/fork.h | 1 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/arch-fork.h (renamed from sysdeps/unix/sysv/linux/x86_64/fork.h) | 4 |
8 files changed, 20 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index 4d286ebd0c..0fd2758a3a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2014-05-16 Roland McGrath <roland@hack.frob.com> + + * sysdeps/unix/sysv/linux/i386/fork.h: Moved ... + * sysdeps/unix/sysv/linux/i386/arch-fork.h: ... here. + Don't do #include_next. + * sysdeps/unix/sysv/linux/x86_64/fork.h: Moved ... + * sysdeps/unix/sysv/linux/x86_64/arch-fork.h: ... here. + Don't do #include_next. + * sysdeps/unix/sysv/linux/mips/arch-fork.h: New file. + * sysdeps/unix/sysv/linux/mips/fork.h: File removed. + * sysdeps/unix/sysv/linux/powerpc/arch-fork.h: New file. + * sysdeps/unix/sysv/linux/powerpc/fork.h: File removed. + 2014-05-16 Allan McRae <allan@archlinux.org> * po/sv.po: Update Swedish translation from translation project. diff --git a/nptl/sysdeps/unix/sysv/linux/fork.c b/nptl/sysdeps/unix/sysv/linux/fork.c index 722ffce250..70201a294c 100644 --- a/nptl/sysdeps/unix/sysv/linux/fork.c +++ b/nptl/sysdeps/unix/sysv/linux/fork.c @@ -29,6 +29,7 @@ #include <atomic.h> #include <pthreadP.h> #include <fork.h> +#include <arch-fork.h> unsigned long int *__fork_generation_pointer; diff --git a/sysdeps/unix/sysv/linux/i386/fork.h b/sysdeps/unix/sysv/linux/i386/arch-fork.h index 2919ccfcb3..70f1b19472 100644 --- a/sysdeps/unix/sysv/linux/i386/fork.h +++ b/sysdeps/unix/sysv/linux/i386/arch-fork.h @@ -18,10 +18,10 @@ <http://www.gnu.org/licenses/>. */ #include <sched.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_next <fork.h> diff --git a/sysdeps/unix/sysv/linux/mips/arch-fork.h b/sysdeps/unix/sysv/linux/mips/arch-fork.h new file mode 100644 index 0000000000..5f945378ee --- /dev/null +++ b/sysdeps/unix/sysv/linux/mips/arch-fork.h @@ -0,0 +1 @@ +#include <sysdeps/unix/sysv/linux/i386/arch-fork.h> diff --git a/sysdeps/unix/sysv/linux/mips/fork.h b/sysdeps/unix/sysv/linux/mips/fork.h deleted file mode 100644 index 14b238ad34..0000000000 --- a/sysdeps/unix/sysv/linux/mips/fork.h +++ /dev/null @@ -1 +0,0 @@ -#include <sysdeps/unix/sysv/linux/i386/fork.h> diff --git a/sysdeps/unix/sysv/linux/powerpc/arch-fork.h b/sysdeps/unix/sysv/linux/powerpc/arch-fork.h new file mode 100644 index 0000000000..5f945378ee --- /dev/null +++ b/sysdeps/unix/sysv/linux/powerpc/arch-fork.h @@ -0,0 +1 @@ +#include <sysdeps/unix/sysv/linux/i386/arch-fork.h> diff --git a/sysdeps/unix/sysv/linux/powerpc/fork.h b/sysdeps/unix/sysv/linux/powerpc/fork.h deleted file mode 100644 index 14b238ad34..0000000000 --- a/sysdeps/unix/sysv/linux/powerpc/fork.h +++ /dev/null @@ -1 +0,0 @@ -#include <sysdeps/unix/sysv/linux/i386/fork.h> diff --git a/sysdeps/unix/sysv/linux/x86_64/fork.h b/sysdeps/unix/sysv/linux/x86_64/arch-fork.h index 1bd5301ebd..97b866bc2e 100644 --- a/sysdeps/unix/sysv/linux/x86_64/fork.h +++ b/sysdeps/unix/sysv/linux/x86_64/arch-fork.h @@ -18,10 +18,10 @@ <http://www.gnu.org/licenses/>. */ #include <sched.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_next <fork.h> |