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 master updated. glibc-2.19-856-ge641054


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, master has been updated
       via  e641054cd8a362a904b6ca898ef00e64ce42df29 (commit)
      from  dacdc867174924621311e79b78d4c887092d1291 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

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

commit e641054cd8a362a904b6ca898ef00e64ce42df29
Author: Roland McGrath <roland@hack.frob.com>
Date:   Thu Jul 3 21:50:50 2014 -0700

    IA64: Consolidate NPTL/non versions of clone

diff --git a/ChangeLog b/ChangeLog
index 290d87d..f5861ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-08-04  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-08-04  Andreas Schwab  <schwab@suse.de>
 
 	* sysdeps/ieee754/ldbl-96/s_fma.c: Include <math_private.h>.
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

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

Summary of changes:
 ChangeLog                                  |    6 ++++++
 sysdeps/unix/sysv/linux/ia64/clone2.S      |    2 --
 sysdeps/unix/sysv/linux/ia64/nptl/clone2.S |    9 ---------
 3 files changed, 6 insertions(+), 11 deletions(-)
 delete mode 100644 sysdeps/unix/sysv/linux/ia64/nptl/clone2.S


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]