This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.19-495-g0d3b7a1
- From: roland at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 29 May 2014 00:23:48 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.19-495-g0d3b7a1
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 0d3b7a190c3abbdce27d4b0b9f16517bf5664099 (commit)
from 1efe2bd9dcde62506e5ce4f7f8494dfaa1fdf012 (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=0d3b7a190c3abbdce27d4b0b9f16517bf5664099
commit 0d3b7a190c3abbdce27d4b0b9f16517bf5664099
Author: Roland McGrath <roland@hack.frob.com>
Date: Wed May 28 17:23:19 2014 -0700
SH: Consolidate NPTL/non versions of clone
diff --git a/ChangeLog b/ChangeLog
index 35c3a0b..8ffe903 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2014-05-28 Roland McGrath <roland@hack.frob.com>
+ * sysdeps/unix/sysv/linux/sh/clone.S: Deconditionalize the code
+ that was previously under [RESET_PID].
+ * nptl/sysdeps/unix/sysv/linux/sh/clone.S: File removed.
+
* sysdeps/unix/sysv/linux/tile/arch-fork.h: New file.
* sysdeps/unix/sysv/linux/tile/nptl/fork.c: File removed.
diff --git a/nptl/sysdeps/unix/sysv/linux/sh/clone.S b/nptl/sysdeps/unix/sysv/linux/sh/clone.S
deleted file mode 100644
index 675a997..0000000
--- a/nptl/sysdeps/unix/sysv/linux/sh/clone.S
+++ /dev/null
@@ -1,9 +0,0 @@
-/* We want an #include_next, but we are the main source file.
- So, #include ourselves and in that incarnation we can use #include_next. */
-#ifndef INCLUDED_SELF
-# define INCLUDED_SELF
-# include <clone.S>
-#else
-# define RESET_PID
-# include_next <clone.S>
-#endif
diff --git a/sysdeps/unix/sysv/linux/sh/clone.S b/sysdeps/unix/sysv/linux/sh/clone.S
index b7d6101..4188826 100644
--- a/sysdeps/unix/sysv/linux/sh/clone.S
+++ b/sysdeps/unix/sysv/linux/sh/clone.S
@@ -21,9 +21,8 @@
#include <sysdep.h>
#define _ERRNO_H 1
#include <bits/errno.h>
-#ifdef RESET_PID
#include <tcb-offsets.h>
-#endif
+
/* int clone(int (*fn)(void *arg), void *child_stack, int flags, void *arg,
pid_t *ptid, void *tls, pid_t *ctid); */
@@ -67,7 +66,6 @@ ENTRY(__clone)
2:
/* terminate the stack frame */
mov #0, r14
-#ifdef RESET_PID
mov r4, r0
shlr16 r0
tst #1, r0 // CLONE_THREAD = (1 << 16)
@@ -89,7 +87,6 @@ ENTRY(__clone)
add r1, r2
mov.l r0, @r2
4:
-#endif
/* thread starts */
mov.l @r15, r1
jsr @r1
@@ -120,12 +117,10 @@ ENTRY(__clone)
.long _GLOBAL_OFFSET_TABLE_
.L3:
.long PLTJMP(C_SYMBOL_NAME(_exit))
-#ifdef RESET_PID
.Lpidoff:
.word PID - TLS_PRE_TCB_SIZE
.Ltidoff:
.word TID - TLS_PRE_TCB_SIZE
-#endif
PSEUDO_END (__clone)
weak_alias (__clone, clone)
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 4 ++++
nptl/sysdeps/unix/sysv/linux/sh/clone.S | 9 ---------
sysdeps/unix/sysv/linux/sh/clone.S | 7 +------
3 files changed, 5 insertions(+), 15 deletions(-)
delete mode 100644 nptl/sysdeps/unix/sysv/linux/sh/clone.S
hooks/post-receive
--
GNU C Library master sources