This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch roland/nptl-sh created. glibc-2.19-493-gfb3e82d
- From: roland at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 27 May 2014 22:27:16 -0000
- Subject: GNU C Library master sources branch roland/nptl-sh created. glibc-2.19-493-gfb3e82d
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, roland/nptl-sh has been created
at fb3e82da0fa7342eb01f8e499a23293722ab7537 (commit)
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=fb3e82da0fa7342eb01f8e499a23293722ab7537
commit fb3e82da0fa7342eb01f8e499a23293722ab7537
Author: Roland McGrath <roland@hack.frob.com>
Date: Tue May 27 15:23:09 2014 -0700
SH: Consolidate NPTL/non versions of clone
diff --git a/ChangeLog b/ChangeLog
index 3d11ba1..3439ad1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2014-05-27 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/sh/arch-fork.h: New file.
* nptl/sysdeps/unix/sysv/linux/sh/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)
-----------------------------------------------------------------------
hooks/post-receive
--
GNU C Library master sources