AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-22 13:00:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

x86: Consolidate NPTL fork.

Browse Source
This commit is contained in:
Roland McGrath 2014-05-14 11:31:37 -07:00
parent 2fbdf5339a
commit ec136444ca
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,5 +1,11 @@
2014-05-14 Roland McGrath <roland@hack.frob.com>
* 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.

2
nptl/sysdeps/unix/sysv/linux/fork.c
View File

@ -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;

9
nptl/sysdeps/unix/sysv/linux/i386/fork.c → sysdeps/unix/sysv/linux/i386/fork.h
View File

@ -1,4 +1,5 @@
/* Copyright (C) 2002-2014 Free Software Foundation, Inc.
/* 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 <drepper@redhat.com>, 2002.
@ -17,14 +18,10 @@
<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"
#include_next <fork.h>

15
nptl/sysdeps/unix/sysv/linux/x86_64/fork.c → sysdeps/unix/sysv/linux/x86_64/fork.h
View File

@ -1,4 +1,5 @@
/* Copyright (C) 2003-2014 Free Software Foundation, Inc.
/* 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 <drepper@redhat.com>, 2003.
@ -17,14 +18,10 @@
<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)
INLINE_SYSCALL (clone, 4, \
CLONE_CHILD_SETTID | CLONE_CHILD_CLEARTID | SIGCHLD, 0, \
NULL, &THREAD_SELF->tid)
#include "../fork.c"
#include_next <fork.h>