[roland/nptl-s390] S390: Consolidate NPTL/non versions of clone
diff mbox

Message ID 20140623180318.00BC22C3A03@topped-with-meat.com
State New
Headers show

Commit Message

Roland McGrath June 23, 2014, 6:03 p.m. UTC
Not tested at all, but this should not change anything.

OK?


Thanks,
Roland


2014-06-23  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.

Comments

Stefan Liebler June 26, 2014, 9:23 a.m. UTC | #1
OK.
Testsuite passes as before on s390/s390x.

Thanks.

On 06/23/2014 08:03 PM, Roland McGrath wrote:
> Not tested at all, but this should not change anything.
>
> OK?
>
>
> Thanks,
> Roland
>
>
> 2014-06-23  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.
>
> 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 675a997..0000000
> --- 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 675a997..0000000
> --- 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 f26c229..a5e1980 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 ee501b5..27ddf1f 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 */
>

Patch
diff mbox

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 675a997..0000000
--- 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 675a997..0000000
--- 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 f26c229..a5e1980 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 ee501b5..27ddf1f 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 */