diff options
| author | Roland McGrath <roland@hack.frob.com> | 2014-06-26 09:30:33 -0700 |
|---|---|---|
| committer | Roland McGrath <roland@hack.frob.com> | 2014-06-26 09:30:33 -0700 |
| commit | e549ee56584d0c25e1f9dfcb6b05947fb3950447 (patch) | |
| tree | 56daf0d3b63362d6dc4da7b4114f0be268059bb1 | |
| parent | 6ad2df0bda76b97b9953f674877b672f1ee99030 (diff) | |
| download | glibc-e549ee56584d0c25e1f9dfcb6b05947fb3950447.tar.gz glibc-e549ee56584d0c25e1f9dfcb6b05947fb3950447.tar.xz glibc-e549ee56584d0c25e1f9dfcb6b05947fb3950447.zip | |
S390: Consolidate NPTL/non versions of clone
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/s390/s390-32/clone.S | 9 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/s390/s390-64/clone.S | 9 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/s390/s390-32/clone.S | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/s390/s390-64/clone.S | 2 |
5 files changed, 6 insertions, 22 deletions
diff --git a/ChangeLog b/ChangeLog index ed1ede4fae..4d88bf9577 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 ... diff --git a/nptl/sysdeps/unix/sysv/linux/s390/s390-32/clone.S b/nptl/sysdeps/unix/sysv/linux/s390/s390-32/clone.S deleted file mode 100644 index 675a997e97..0000000000 --- a/nptl/sysdeps/unix/sysv/linux/s390/s390-32/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/nptl/sysdeps/unix/sysv/linux/s390/s390-64/clone.S b/nptl/sysdeps/unix/sysv/linux/s390/s390-64/clone.S deleted file mode 100644 index 675a997e97..0000000000 --- a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/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/s390/s390-32/clone.S b/sysdeps/unix/sysv/linux/s390/s390-32/clone.S index f26c22936a..a5e1980b14 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/clone.S +++ b/sysdeps/unix/sysv/linux/s390/s390-32/clone.S @@ -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 */ diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/clone.S b/sysdeps/unix/sysv/linux/s390/s390-64/clone.S index ee501b5252..27ddf1f5af 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/clone.S +++ b/sysdeps/unix/sysv/linux/s390/s390-64/clone.S @@ -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 */ |