mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-11 13:50:06 +00:00
99c7f8700d
Handle prelinked libraries and binaries with new style PLT. 2005-06-07 Jakub Jelinek <jakub@redhat.com> * elf/elf.h (R_PPC_REL16, R_PPC_REL16_LO, R_PPC_REL16_HI, R_PPC_REL16_HA): Define. 2005-06-14 Alan Modra <amodra@bigpond.net.au> * config.h.in (HAVE_ASM_PPC_REL16): Add. * elf/elf.h (DT_PPC_GOT, DT_PPC_NUM): Define. * elf/tls-macros.h (PowerPC32): Include config.h. Add variants of TLS_IE, TLS_LD and TLS_GD for new PLT/GOT layout. * sysdeps/powerpc/powerpc32/configure.in: New file, * sysdeps/powerpc/powerpc32/dl-dtprocnum.h: New file. * sysdeps/powerpc/powerpc32/dl-machine.h (DT_PPC): Define. (ppc_got): New inline function. (elf_machine_dynamic): Use ppc_got. Add attribute const. (elf_machine_load_address): Add attribute const. Don't use int vars. Use bcl rather than bl to save trashing branch target stack. Use elf_machine_dynamic rather than duplicating code here. (elf_machine_runtime_setup): New inline function replacing define. Handle new PLT. (elf_machine_fixup_plt): Handle new PLT. (elf_machine_rela): Likewise. * sysdeps/powerpc/powerpc32/sysdep.h: Include config.h. (CALL_MCOUNT): Don't set up counter vars. * sysdeps/powerpc/powerpc32/ppc-mcount.S: Correct comment. * sysdeps/powerpc/powerpc32/elf/start.S (start_addressesp): Don't define when HAVE_ASM_PPC_REL16. (_start): Add HAVE_ASM_PPC_REL16 code. * sysdeps/powerpc/powerpc32/dl-start.S (_dl_start_user): Don't bl into the GOT when HAVE_ASM_PPC_REL16. * sysdeps/powerpc/powerpc32/memset.S (memset): Likewise. * sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S (__longjmp): Ditto. * sysdeps/powerpc/powerpc32/fpu/s_ceil.S (__ceil): Likewise. * sysdeps/powerpc/powerpc32/fpu/s_ceilf.S (__ceilf): Likewise. * sysdeps/powerpc/powerpc32/fpu/s_floor.S (__floor): Likewise. * sysdeps/powerpc/powerpc32/fpu/s_floorf.S (__floorf): Likewise. * sysdeps/powerpc/powerpc32/fpu/s_lround.S (__lround): Likewise. * sysdeps/powerpc/powerpc32/fpu/s_rint.S (__rint): Likewise. * sysdeps/powerpc/powerpc32/fpu/s_rintf.S (__rintf): Likewise. * sysdeps/powerpc/powerpc32/fpu/s_round.S (__round): Likewise. * sysdeps/powerpc/powerpc32/fpu/s_roundf.S (__roundf): Likewise. * sysdeps/powerpc/powerpc32/fpu/s_trunc.S (__trunc): Likewise. * sysdeps/powerpc/powerpc32/fpu/s_truncf.S (__truncf): Likewise. * sysdeps/powerpc/powerpc32/fpu/setjmp-common.S (__sigsetjmp): Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/brk.S (__brk): Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/getcontext.S (__getcontext): Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext.S (__setcontext): Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/swapcontext.S (__swapcontext): Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/socket.S (stackblock): Comment. (__socket): Bomb if NARGS >= 7. Invoke CGOTSETUP and CGOTRESTORE. 2005-06-17 Ulrich Drepper <drepper@redhat.com> * sysdeps/posix/sigignore.c: Include <string.h> to tell the compiler to use __GI_memset. * sysdeps/posix/signal.c: Likewise. * sysdeps/posix/sigset.c: Likewise. * sysdeps/posix/sysv_signal.c: Likewise. * sysdeps/unix/sysv/linux/sleep.c: Likewise. * sysdeps/unix/sysv/linux/sysctl.c: Likewise. * sysdeps/unix/sysv/linux/system.c: Likewise.
150 lines
4.2 KiB
C
150 lines
4.2 KiB
C
/* Implementation of the POSIX sleep function using nanosleep.
|
|
Copyright (C) 1996,1997,1998,1999,2003,2005 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA. */
|
|
|
|
#include <errno.h>
|
|
#include <time.h>
|
|
#include <signal.h>
|
|
#include <string.h> /* For the real memset prototype. */
|
|
#include <unistd.h>
|
|
#include <sys/param.h>
|
|
|
|
|
|
#if 0
|
|
static void
|
|
cl (void *arg)
|
|
{
|
|
(void) __sigprocmask (SIG_SETMASK, arg, (sigset_t *) NULL);
|
|
}
|
|
#endif
|
|
|
|
|
|
/* We are going to use the `nanosleep' syscall of the kernel. But the
|
|
kernel does not implement the stupid SysV SIGCHLD vs. SIG_IGN
|
|
behaviour for this syscall. Therefore we have to emulate it here. */
|
|
unsigned int
|
|
__sleep (unsigned int seconds)
|
|
{
|
|
const unsigned int max
|
|
= (unsigned int) (((unsigned long int) (~((time_t) 0))) >> 1);
|
|
struct timespec ts;
|
|
sigset_t set, oset;
|
|
unsigned int result;
|
|
|
|
/* This is not necessary but some buggy programs depend on this. */
|
|
if (__builtin_expect (seconds == 0, 0))
|
|
{
|
|
#ifdef CANCELLATION_P
|
|
CANCELLATION_P (THREAD_SELF);
|
|
#endif
|
|
return 0;
|
|
}
|
|
|
|
ts.tv_sec = 0;
|
|
ts.tv_nsec = 0;
|
|
again:
|
|
if (sizeof (ts.tv_sec) <= sizeof (seconds))
|
|
{
|
|
/* Since SECONDS is unsigned assigning the value to .tv_sec can
|
|
overflow it. In this case we have to wait in steps. */
|
|
ts.tv_sec += MIN (seconds, max);
|
|
seconds -= (unsigned int) ts.tv_sec;
|
|
}
|
|
else
|
|
{
|
|
ts.tv_sec = (time_t) seconds;
|
|
seconds = 0;
|
|
}
|
|
|
|
/* Linux will wake up the system call, nanosleep, when SIGCHLD
|
|
arrives even if SIGCHLD is ignored. We have to deal with it
|
|
in libc. We block SIGCHLD first. */
|
|
__sigemptyset (&set);
|
|
__sigaddset (&set, SIGCHLD);
|
|
if (__sigprocmask (SIG_BLOCK, &set, &oset))
|
|
return -1;
|
|
|
|
/* If SIGCHLD is already blocked, we don't have to do anything. */
|
|
if (!__sigismember (&oset, SIGCHLD))
|
|
{
|
|
int saved_errno;
|
|
struct sigaction oact;
|
|
|
|
__sigemptyset (&set);
|
|
__sigaddset (&set, SIGCHLD);
|
|
|
|
/* We get the signal handler for SIGCHLD. */
|
|
if (__sigaction (SIGCHLD, (struct sigaction *) NULL, &oact) < 0)
|
|
{
|
|
saved_errno = errno;
|
|
/* Restore the original signal mask. */
|
|
(void) __sigprocmask (SIG_SETMASK, &oset, (sigset_t *) NULL);
|
|
__set_errno (saved_errno);
|
|
return -1;
|
|
}
|
|
|
|
/* Note the sleep() is a cancellation point. But since we call
|
|
nanosleep() which itself is a cancellation point we do not
|
|
have to do anything here. */
|
|
if (oact.sa_handler == SIG_IGN)
|
|
{
|
|
//__libc_cleanup_push (cl, &oset);
|
|
|
|
/* We should leave SIGCHLD blocked. */
|
|
while (1)
|
|
{
|
|
result = __nanosleep (&ts, &ts);
|
|
|
|
if (result != 0 || seconds == 0)
|
|
break;
|
|
|
|
if (sizeof (ts.tv_sec) <= sizeof (seconds))
|
|
{
|
|
ts.tv_sec = MIN (seconds, max);
|
|
seconds -= (unsigned int) ts.tv_nsec;
|
|
}
|
|
}
|
|
|
|
//__libc_cleanup_pop (0);
|
|
|
|
saved_errno = errno;
|
|
/* Restore the original signal mask. */
|
|
(void) __sigprocmask (SIG_SETMASK, &oset, (sigset_t *) NULL);
|
|
__set_errno (saved_errno);
|
|
|
|
goto out;
|
|
}
|
|
|
|
/* We should unblock SIGCHLD. Restore the original signal mask. */
|
|
(void) __sigprocmask (SIG_SETMASK, &oset, (sigset_t *) NULL);
|
|
}
|
|
|
|
result = __nanosleep (&ts, &ts);
|
|
if (result == 0 && seconds != 0)
|
|
goto again;
|
|
|
|
out:
|
|
if (result != 0)
|
|
/* Round remaining time. */
|
|
result = seconds + (unsigned int) ts.tv_sec + (ts.tv_nsec >= 500000000L);
|
|
|
|
return result;
|
|
}
|
|
weak_alias (__sleep, sleep)
|