From: Roland McGrath <roland@hack.frob.com>
Date: Thu, 26 Jun 2014 16:30:33 +0000 (-0700)
Subject: S390: Consolidate NPTL/non versions of clone
X-Git-Tag: glibc-2.20~223
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e549ee56584d0c25e1f9dfcb6b05947fb3950447;p=thirdparty%2Fglibc.git

S390: Consolidate NPTL/non versions of clone
---

diff --git a/ChangeLog b/ChangeLog
index ed1ede4fae7..4d88bf95771 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 675a997e977..00000000000
--- 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 675a997e977..00000000000
--- 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 f26c22936a2..a5e1980b14a 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 ee501b52524..27ddf1f5af4 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 */