mirrors/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-05 07:33:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

S390: Consolidate NPTL/non versions of clone

Browse Source
This commit is contained in:
Roland McGrath 2014-06-26 09:30:33 -07:00
parent 6ad2df0bda
commit e549ee5658
5 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,5 +1,11 @@
2014-06-26 Roland McGrath <roland@hack.frob.com>
* sysdeps/unix/sysv/linux/s390/s390-32/clone.S: Deconditionalize the
code that was previously under [RESET_PID].
* sysdeps/unix/sysv/linux/s390/s390-64/clone.S: Likewise.
* nptl/sysdeps/unix/sysv/linux/s390/s390-32/clone.S: File removed.
* nptl/sysdeps/unix/sysv/linux/s390/s390-64/clone.S: File removed.
* sysdeps/unix/sysv/linux/aarch64/nptl/bits/pthreadtypes.h: Moved ...
* sysdeps/aarch64/nptl/bits/pthreadtypes.h: ... here.
* sysdeps/unix/sysv/linux/aarch64/nptl/bits/semaphore.h: Moved ...

9
nptl/sysdeps/unix/sysv/linux/s390/s390-32/clone.S
View File

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

9
nptl/sysdeps/unix/sysv/linux/s390/s390-64/clone.S
View File

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

2
sysdeps/unix/sysv/linux/s390/s390-32/clone.S
View File

@ -54,7 +54,6 @@ error:
PSEUDO_END (__clone)
thread_start:
#ifdef RESET_PID
tmh %r3,1 /* CLONE_THREAD == 0x00010000 */
jne 1f
lhi %r2,-1
@ -65,7 +64,6 @@ thread_start:
st %r2,PID(%r3)
st %r2,TID(%r3)
1:
#endif
/* fn is in gpr 1, arg in gpr 0 */
lr %r2,%r0 /* set first parameter to void *arg */
ahi %r15,-96 /* make room on the stack for the save area */

2
sysdeps/unix/sysv/linux/s390/s390-64/clone.S
View File

@ -55,7 +55,6 @@ error:
PSEUDO_END (__clone)
thread_start:
#ifdef RESET_PID
tmh %r3,1 /* CLONE_THREAD == 0x00010000 */
jne 1f
lhi %r2,-1
@ -68,7 +67,6 @@ thread_start:
st %r2,PID(%r3)
st %r2,TID(%r3)
1:
#endif
/* fn is in gpr 1, arg in gpr 0 */
lgr %r2,%r0 /* set first parameter to void *arg */
aghi %r15,-160 /* make room on the stack for the save area */