]> git.ipfire.org Git - thirdparty/glibc.git/commitdiff
S390: Consolidate NPTL/non versions of clone
authorRoland McGrath <roland@hack.frob.com>
Thu, 26 Jun 2014 16:30:33 +0000 (09:30 -0700)
committerRoland McGrath <roland@hack.frob.com>
Thu, 26 Jun 2014 16:30:33 +0000 (09:30 -0700)
ChangeLog
nptl/sysdeps/unix/sysv/linux/s390/s390-32/clone.S [deleted file]
nptl/sysdeps/unix/sysv/linux/s390/s390-64/clone.S [deleted file]
sysdeps/unix/sysv/linux/s390/s390-32/clone.S
sysdeps/unix/sysv/linux/s390/s390-64/clone.S

index ed1ede4fae7f6f781ca3b51f124dfe5d3e70bb7a..4d88bf95771a33cfaa2267e081f8da352a3db3ff 100644 (file)
--- 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 (file)
index 675a997..0000000
+++ /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 (file)
index 675a997..0000000
+++ /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
index f26c22936a201d251b0f51766c75cd5f079409a7..a5e1980b14a5aa497cc6394023c9e73aa28af501 100644 (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 */
index ee501b5252424624e888caae9ea88ae71a4c1e0f..27ddf1f5af49588473e8e55b7e12ef736ee3c6db 100644 (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 */