GNU C Library master sources branch master updated. glibc-2.19-410-gec13644

[roland at sourceware dot org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  ec136444ca77f7a64e2c3616fc560b6410a767d2 (commit)
      from  2fbdf5339aaeaa423bd661524f7ec7af41fa2606 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=ec136444ca77f7a64e2c3616fc560b6410a767d2

commit ec136444ca77f7a64e2c3616fc560b6410a767d2
Author: Roland McGrath <roland@hack.frob.com>
Date:   Wed May 14 11:31:37 2014 -0700

    x86: Consolidate NPTL fork.

diff --git a/ChangeLog b/ChangeLog
index 5e452bd..d73d5eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
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 <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/sysdeps/unix/sysv/linux/i386/fork.h
similarity index 86%
rename from nptl/sysdeps/unix/sysv/linux/i386/fork.c
rename to sysdeps/unix/sysv/linux/i386/fork.h
index 79ee39e..2919ccf 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/fork.c
+++ b/sysdeps/unix/sysv/linux/i386/fork.h
@@ -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>
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/fork.c b/sysdeps/unix/sysv/linux/x86_64/fork.h
similarity index 69%
rename from nptl/sysdeps/unix/sysv/linux/x86_64/fork.c
rename to sysdeps/unix/sysv/linux/x86_64/fork.h
index a036b92..1bd5301 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/fork.c
+++ b/sysdeps/unix/sysv/linux/x86_64/fork.h
@@ -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>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                                          |    6 ++++++
 nptl/sysdeps/unix/sysv/linux/fork.c                |    2 +-
 .../fork.c => sysdeps/unix/sysv/linux/i386/fork.h  |    9 +++------
 .../unix/sysv/linux/x86_64/fork.h                  |   15 ++++++---------
 4 files changed, 16 insertions(+), 16 deletions(-)
 rename nptl/sysdeps/unix/sysv/linux/i386/fork.c => sysdeps/unix/sysv/linux/i386/fork.h (86%)
 rename nptl/sysdeps/unix/sysv/linux/x86_64/fork.c => sysdeps/unix/sysv/linux/x86_64/fork.h (69%)


hooks/post-receive
-- 
GNU C Library master sources