This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch roland/nptl-ia64 created. glibc-2.19-534-gbc73918


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, roland/nptl-ia64 has been created
        at  bc7391811542289d482d2f9a8650b6ca83db28de (commit)

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=bc7391811542289d482d2f9a8650b6ca83db28de

commit bc7391811542289d482d2f9a8650b6ca83db28de
Author: Roland McGrath <roland@hack.frob.com>
Date:   Thu Jun 5 11:50:54 2014 -0700

    IA64: Consolidate NPTL/non versions of clone

diff --git a/ChangeLog b/ChangeLog
index 17f0c83..3033c03 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-06-05  Roland McGrath  <roland@hack.frob.com>
+
+	* 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.
+
 2014-06-05  OndÅ?ej Bílka  <neleai@seznam.cz>
 
 	[BZ #15698]
diff --git a/sysdeps/unix/sysv/linux/ia64/clone2.S b/sysdeps/unix/sysv/linux/ia64/clone2.S
index 6198018..1490a46 100644
--- 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 */
 	;;
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/clone2.S b/sysdeps/unix/sysv/linux/ia64/nptl/clone2.S
deleted file mode 100644
index 91f28ba..0000000
--- 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

-----------------------------------------------------------------------


hooks/post-receive
-- 
GNU C Library master sources


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]