This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch roland/nptl-ia64 created. glibc-2.19-494-g4f45f33
- From: roland at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 27 May 2014 22:48:29 -0000
- Subject: GNU C Library master sources branch roland/nptl-ia64 created. glibc-2.19-494-g4f45f33
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 4f45f338b113a85ca8d8bf29f5dd04fd63aa8fb2 (commit)
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=4f45f338b113a85ca8d8bf29f5dd04fd63aa8fb2
commit 4f45f338b113a85ca8d8bf29f5dd04fd63aa8fb2
Author: Roland McGrath <roland@hack.frob.com>
Date: Tue May 27 15:47:49 2014 -0700
IA64: Consolidate NPTL/non versions of clone
diff --git a/ChangeLog b/ChangeLog
index a76d4b5..da42dee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2014-05-27 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.
+
* sysdeps/unix/sysv/linux/ia64/arch-fork.h: New file.
* sysdeps/unix/sysv/linux/sh/arch-fork.h: New file.
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