From c3a2ebe1f7541cc35937621e08c28ff88afd0845 Mon Sep 17 00:00:00 2001 From: Chris Metcalf Date: Wed, 11 Jun 2014 15:52:53 -0400 Subject: tile: Consolidate NPTL/non versions of vfork --- ChangeLog | 8 ++++++++ sysdeps/unix/sysv/linux/tile/pt-vfork.S | 2 -- sysdeps/unix/sysv/linux/tile/pt-vfork.c | 1 + sysdeps/unix/sysv/linux/tile/vfork.S | 5 +---- 4 files changed, 10 insertions(+), 6 deletions(-) delete mode 100644 sysdeps/unix/sysv/linux/tile/pt-vfork.S create mode 100644 sysdeps/unix/sysv/linux/tile/pt-vfork.c diff --git a/ChangeLog b/ChangeLog index 82a62a0895..d86e73963d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2014-06-11 Chris Metcalf + + * sysdeps/unix/sysv/linux/tile/pt-vfork.c: New file. + * sysdeps/unix/sysv/linux/tile/pt-vfork.S: Remove file. + * sysdeps/unix/sysv/linux/tile/vfork.S (__vfork): Make PT_VFORK + conditional code always true. + (__libc_vfork): New alias. + 2014-06-11 Roland McGrath * sysdeps/tile/nptl/tls.h (TLS_DEFINE_INIT_TP): New macro. diff --git a/sysdeps/unix/sysv/linux/tile/pt-vfork.S b/sysdeps/unix/sysv/linux/tile/pt-vfork.S deleted file mode 100644 index a6ccb1f51f..0000000000 --- a/sysdeps/unix/sysv/linux/tile/pt-vfork.S +++ /dev/null @@ -1,2 +0,0 @@ -#define PT_VFORK 1 /* pid is never zero */ -#include "vfork.S" diff --git a/sysdeps/unix/sysv/linux/tile/pt-vfork.c b/sysdeps/unix/sysv/linux/tile/pt-vfork.c new file mode 100644 index 0000000000..5fbc6526aa --- /dev/null +++ b/sysdeps/unix/sysv/linux/tile/pt-vfork.c @@ -0,0 +1 @@ +#include diff --git a/sysdeps/unix/sysv/linux/tile/vfork.S b/sysdeps/unix/sysv/linux/tile/vfork.S index 014cccf7e2..bf7bdf4ac2 100644 --- a/sysdeps/unix/sysv/linux/tile/vfork.S +++ b/sysdeps/unix/sysv/linux/tile/vfork.S @@ -38,9 +38,7 @@ ENTRY (__vfork) shli r13, r13, 31 /* Build 0x80000000. */ } sub r12, zero, r12 /* Negate it. */ -#ifndef PT_VFORK CMOVEQZ r12, r12, r13 /* Replace zero pids. */ -#endif ST4 r11, r12 /* Store the temporary PID. */ { @@ -67,9 +65,7 @@ ENTRY (__vfork) CMPEQ r13, r12, r12 /* Test for that value. */ sub r12, zero, r12 /* Re-negate it. */ } -#ifndef PT_VFORK CMOVNEZ r12, r13, zero /* Replace zero pids. */ -#endif ST4 r11, r12 /* Restore the PID. */ 1: BNEZ r1, 0f @@ -78,3 +74,4 @@ PSEUDO_END (__vfork) libc_hidden_def (__vfork) weak_alias (__vfork, vfork) +strong_alias (__vfork, __libc_vfork) -- cgit v1.2.3