diff options
Diffstat (limited to 'libpthread/nptl/sysdeps/unix/sysv/linux')
13 files changed, 17 insertions, 14 deletions
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/alpha/vfork.S b/libpthread/nptl/sysdeps/unix/sysv/linux/alpha/vfork.S index f4ed9311b..f0c39982c 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/alpha/vfork.S +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/alpha/vfork.S @@ -42,5 +42,5 @@ PSEUDO (__vfork, vfork, 0) 1: ret PSEUDO_END (__vfork) -libc_hidden_def (__vfork) +hidden_def (__vfork) weak_alias (__vfork, vfork) diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/fork.c b/libpthread/nptl/sysdeps/unix/sysv/linux/fork.c index f62e4b919..fd137c752 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/fork.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/fork.c @@ -67,7 +67,7 @@ fresetlockfiles (void) pid_t -__libc_fork_nptl (void) +__libc_fork (void) { pid_t pid; struct used_handler @@ -251,3 +251,6 @@ __libc_fork_nptl (void) return pid; } +weak_alias (__libc_fork, __fork) +hidden_def (__fork) +weak_alias (__libc_fork, fork) diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/libc_pthread_init.c b/libpthread/nptl/sysdeps/unix/sysv/linux/libc_pthread_init.c index cf5150341..f337816cf 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/libc_pthread_init.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/libc_pthread_init.c @@ -48,7 +48,7 @@ __libc_pthread_init (ptr, reclaim, functions) /* We copy the content of the variable pointed to by the FUNCTIONS parameter to one in libc.so since this means access to the array can be done with one memory access instead of two. */ - memcpy (&__libc_pthread_functions, functions, + __memcpy (&__libc_pthread_functions, functions, sizeof (__libc_pthread_functions)); #endif diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/mips/Makefile.arch b/libpthread/nptl/sysdeps/unix/sysv/linux/mips/Makefile.arch index 76d79be29..cef63bfae 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/mips/Makefile.arch +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/mips/Makefile.arch @@ -8,10 +8,10 @@ libpthread_SSRC = pt-vfork.S #clone.S libpthread_CSRC = pthread_once.c -libc_a_CSRC = fork-nptl.c +libc_a_CSRC = fork.c ifeq ($(UCLIBC_HAS_STDIO_FUTEXES),y) -CFLAGS-fork-nptl.c = -D__USE_STDIO_FUTEXES__ +CFLAGS-fork.c = -D__USE_STDIO_FUTEXES__ endif CFLAGS-pthread_once.c = -DNOT_IN_libc=1 -DIS_IN_libpthread=1 diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc32/vfork.S b/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc32/vfork.S index 4b035a61f..61a712e44 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc32/vfork.S +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc32/vfork.S @@ -53,5 +53,5 @@ ENTRY (__vfork) PSEUDO_RET PSEUDO_END (__vfork) -libc_hidden_def (__vfork) +hidden_def (__vfork) weak_alias (__vfork, vfork) diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/vfork.S b/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/vfork.S index 793762270..ca054bce6 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/vfork.S +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/vfork.S @@ -51,5 +51,5 @@ ENTRY (__vfork) PSEUDO_RET PSEUDO_END (__vfork) -libc_hidden_def (__vfork) +hidden_def (__vfork) weak_alias (__vfork, vfork) diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/pt-fork.c b/libpthread/nptl/sysdeps/unix/sysv/linux/pt-fork.c index 5315b0564..a1e228ee2 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/pt-fork.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/pt-fork.c @@ -19,9 +19,10 @@ #include <unistd.h> + pid_t __fork (void) { - return __libc_fork_nptl (); + return __libc_fork (); } strong_alias (__fork, fork) diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/raise.c b/libpthread/nptl/sysdeps/unix/sysv/linux/raise.c index 29b1cd6b9..0669cab78 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/raise.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/raise.c @@ -71,5 +71,5 @@ raise (sig) return INLINE_SYSCALL (tkill, 2, selftid, sig); #endif } -libc_hidden_def (raise) +hidden_def (raise) weak_alias (raise, gsignal) diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/register-atfork.c b/libpthread/nptl/sysdeps/unix/sysv/linux/register-atfork.c index a73f6c421..a3bb3c34c 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/register-atfork.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/register-atfork.c @@ -106,7 +106,7 @@ __register_atfork (prepare, parent, child, dso_handle) return newp == NULL ? ENOMEM : 0; } -libc_hidden_def (__register_atfork) +hidden_def (__register_atfork) #ifndef __UCLIBC__ diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pt-vfork.S b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pt-vfork.S index 2d1148daa..54f2281d7 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pt-vfork.S +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/pt-vfork.S @@ -61,6 +61,5 @@ ENTRY (__vfork) .word PID - TLS_PRE_TCB_SIZE PSEUDO_END (__vfork) -libc_hidden_def (__vfork) weak_alias (__vfork, vfork) diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/vfork.S b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/vfork.S index 5433eacbe..b5f5d86dd 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/vfork.S +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/vfork.S @@ -66,6 +66,6 @@ ENTRY (__vfork) .word PID - TLS_PRE_TCB_SIZE .align 2 PSEUDO_END (__vfork) -libc_hidden_def (__vfork) +hidden_def (__vfork) weak_alias (__vfork, vfork) diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S b/libpthread/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S index 722960814..d804f0c4b 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S @@ -42,5 +42,5 @@ ENTRY(__vfork) nop PSEUDO_END (__vfork) -libc_hidden_def (__vfork) +hidden_def (__vfork) weak_alias (__vfork, vfork) diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S b/libpthread/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S index d6b2455d4..8de9863e7 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S @@ -42,5 +42,5 @@ ENTRY(__vfork) nop PSEUDO_END (__vfork) -libc_hidden_def (__vfork) +hidden_def (__vfork) weak_alias (__vfork, vfork) |