diff options
| author | Roland McGrath <roland@hack.frob.com> | 2014-07-03 21:50:50 -0700 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2014-08-04 09:06:51 -0400 |
| commit | e641054cd8a362a904b6ca898ef00e64ce42df29 (patch) | |
| tree | dd2576831053d5b5bfa0993b8fd251fbaa382b06 | |
| parent | dacdc867174924621311e79b78d4c887092d1291 (diff) | |
| download | glibc-e641054cd8a362a904b6ca898ef00e64ce42df29.tar.gz glibc-e641054cd8a362a904b6ca898ef00e64ce42df29.tar.xz glibc-e641054cd8a362a904b6ca898ef00e64ce42df29.zip | |
IA64: Consolidate NPTL/non versions of clone
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/ia64/clone2.S | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/ia64/nptl/clone2.S | 9 |
3 files changed, 6 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog index 290d87d8e3..f5861bad62 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 61980187e2..1490a4692c 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 91f28bab37..0000000000 --- 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 |