[roland/nptl-ia64] IA64: Consolidate NPTL/non versions of clone
diff mbox

Message ID 20140527224903.588BB2C3B48@topped-with-meat.com
State New
Headers show

Commit Message

Roland McGrath May 27, 2014, 10:49 p.m. UTC
I haven't tried to compile this or anything.  Please verify it results
in no code change.

Thanks,
Roland


	* sysdeps/unix/sysv/linux/ia64/clone2.S: Deconditionalize the code
	that was previously under [RESET_PID].
	* sysdeps/unix/sysv/linux/ia64/nptl/clone2.S: File removed.

Comments

Mike Frysinger Aug. 3, 2014, 4:21 p.m. UTC | #1
On Tue 27 May 2014 15:49:03 Roland McGrath wrote:
> I haven't tried to compile this or anything.  Please verify it results
> in no code change.

works as advertised, thanks!  i guess you'll take care of merging since it's 
in your branch namespace ?

(i'm testing all the pending stuff and will follow up with the respective 
threads)
-mike
Mike Frysinger Aug. 4, 2014, 1:07 p.m. UTC | #2
On Sun 03 Aug 2014 12:21:16 Mike Frysinger wrote:
> On Tue 27 May 2014 15:49:03 Roland McGrath wrote:
> > I haven't tried to compile this or anything.  Please verify it results
> > in no code change.
> 
> works as advertised, thanks!  i guess you'll take care of merging since it's
> in your branch namespace ?

i've gone ahead and moved it to master now
-mike

Patch
diff mbox

--- a/sysdeps/unix/sysv/linux/ia64/clone2.S
+++ b/sysdeps/unix/sysv/linux/ia64/clone2.S
@@ -67,7 +67,6 @@  ENTRY(__clone2)
 (CHILD)	mov loc0=gp
 (PARENT) ret
 	;;
-#ifdef RESET_PID
 	tbit.nz p6,p0=in3,16	/* CLONE_THREAD */
 	tbit.z p7,p10=in3,8	/* CLONE_VM */
 (p6)	br.cond.dptk 1f
@@ -82,7 +81,6 @@  ENTRY(__clone2)
 	st4 [r9]=r8
 	st4 [r10]=r8
 	;;
-#endif
 1:	ld8 out1=[in0],8	/* Retrieve code pointer.	*/
 	mov out0=in4		/* Pass proper argument	to fn */
 	;;
--- a/sysdeps/unix/sysv/linux/ia64/nptl/clone2.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 <clone2.S>
-#else
-# define RESET_PID
-# include_next <clone2.S>
-#endif