mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-19 09:20:07 +00:00
4fa9b3bfe6
This patch completes the ucontext.h namespace fixes by fixing issues related to the use of struct sigcontext as mcontext_t, and inclusion of <bits/sigcontext.h> even when struct sigcontext is not so used. Inclusion of <bits/sigcontext.h> by <sys/ucontext.h> is removed; the way to get the sigcontext structure is by including <signal.h> (in a context where __USE_MISC is defined); the sysdeps/generic version of sys/ucontext.h keeps the inclusion by necessity, with a comment about how this is not namespace-clean, but the only configuration that used it, MicroBlaze, gets its own version of the header in this patch. Where mcontext_t was typedefed to struct sigcontext, the contents of struct sigcontext are inserted (with appropriate namespace handling to prefix fields with __ when __USE_MISC is not defined); review should check that this has been done correctly in each case, whether the definition of struct sigcontext comes from glibc headers or from the Linux kernel. This changes C++ name mangling on affected architectures (which do not include x86_64/x86). Tested for x86_64, and with build-many-glibcs.py. 2017-08-14 Joseph Myers <joseph@codesourcery.com> [BZ #21457] * sysdeps/arm/sys/ucontext.h: Do not include <bits/sigcontext.h>. * sysdeps/generic/sys/ucontext.h: Add comment about use of struct sigcontext and namespace requirements. * sysdeps/i386/sys/ucontext.h: Do not include <bits/sigcontext.h>. * sysdeps/m68k/sys/ucontext.h: Likewise. * sysdeps/mips/sys/ucontext.h: Likewise. Include <bits/types.h>. * sysdeps/unix/sysv/linux/aarch64/sys/ucontext.h: Do not include <bits/sigcontext.h>. (__ctx): Define earlier. (mcontext_t): Define structure contents rather than using struct sigcontext. * sysdeps/unix/sysv/linux/aarch64/ucontext_i.sym (oEXTENSION): Use __glibc_reserved1 instead of __reserved. * sysdeps/unix/sysv/linux/alpha/sys/ucontext.h: Do not include <bits/sigcontext.h>. (__ctx): Define earlier. (mcontext_t): Define structure contents rather than using struct sigcontext. * sysdeps/unix/sysv/linux/alpha/ucontext-offsets.sym: Use mcontext_t instead of struct sigcontext. * sysdeps/unix/sysv/linux/arm/sys/ucontext.h: Do not include <bits/sigcontext.h>. (__ctx): Define earlier. (mcontext_t): Define structure contents rather than using struct sigcontext. * sysdeps/unix/sysv/linux/hppa/sys/ucontext.h: Do not include <bits/sigcontext.h>. (__ctx): Define earlier. (mcontext_t): Define structure contents rather than using struct sigcontext. * sysdeps/unix/sysv/linux/ia64/makecontext.c (__makecontext): Use mcontext_t instead of struct sigcontext. * sysdeps/unix/sysv/linux/ia64/sigcontext-offsets.sym: Use mcontext_t instead of struct sigcontext. * sysdeps/unix/sysv/linux/ia64/sys/ucontext.h: Do not include <bits/sigcontext.h>. (__ctx): New macro. (struct __ia64_fpreg_mcontext): New type. (mcontext_t): Define structure contents rather than using struct sigcontext. (_SC_GR0_OFFSET): Use mcontext_t instead of struct sigcontext. (uc_sigmask): Define using __ctx. (uc_stack): Likewise. * sysdeps/unix/sysv/linux/ia64/sys/procfs.h: Include <bits/sigcontext.h>. * sysdeps/unix/sysv/linux/ia64/sys/ptrace.h: Likewise. * sysdeps/unix/sysv/linux/m68k/sys/ucontext.h: Do not include <bits/sigcontext.h>. * sysdeps/unix/sysv/linux/microblaze/sys/ucontext.h: New file. * sysdeps/unix/sysv/linux/mips/sys/ucontext.h: Do not include <bits/sigcontext.h>. * sysdeps/unix/sysv/linux/nios2/sys/ucontext.h: Do not include <bits/sigcontext.h>. * sysdeps/unix/sysv/linux/powerpc/sys/ucontext.h: Do not include <bits/sigcontext.h>. * sysdeps/unix/sysv/linux/s390/sys/ucontext.h: Do not include <bits/sigcontext.h>. * sysdeps/unix/sysv/linux/sh/sys/ucontext.h: Do not include <bits/sigcontext.h>. * sysdeps/unix/sysv/linux/sparc/sys/ucontext.h: Do not include <bits/sigcontext.h>. * sysdeps/unix/sysv/linux/tile/sys/ucontext.h: Do not include <bits/sigcontext.h>. (__ctx): Define earlier. (mcontext_t): Define structure contents rather than using struct sigcontext. * sysdeps/unix/sysv/linux/x86/sys/ucontext.h: Do not include <bits/sigcontext.h>. Include <bits/types.h>. * conform/Makefile (test-xfail-XPG42/signal.h/conform): Remove. (test-xfail-XPG42/sys/wait.h/conform): Likewise. (test-xfail-XPG42/ucontext.h/conform): Likewise. (test-xfail-UNIX98/signal.h/conform): Likewise. (test-xfail-UNIX98/sys/wait.h/conform): Likewise. (test-xfail-UNIX98/ucontext.h/conform): Likewise. (test-xfail-XOPEN2K/signal.h/conform): Likewise. (test-xfail-XOPEN2K/sys/wait.h/conform): Likewise. (test-xfail-XOPEN2K/ucontext.h/conform): Likewise. (test-xfail-POSIX2008/signal.h/conform): Likewise. (test-xfail-POSIX2008/sys/wait.h/conform): Likewise. (test-xfail-XOPEN2K8/signal.h/conform): Likewise. (test-xfail-XOPEN2K8/sys/wait.h/conform): Likewise.
89 lines
2.6 KiB
C
89 lines
2.6 KiB
C
/* Copyright (C) 2001-2017 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by David Mosberger-Tang <davidm@hpl.hp.com>.
|
|
|
|
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, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include <libintl.h>
|
|
#include <stdarg.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <ucontext.h>
|
|
#include <sys/rse.h>
|
|
#include <link.h>
|
|
#include <dl-fptr.h>
|
|
|
|
|
|
#define PUSH(val) \
|
|
do { \
|
|
if (ia64_rse_is_rnat_slot (rbs)) \
|
|
*rbs++ = 0; \
|
|
*rbs++ = (val); \
|
|
} while (0)
|
|
|
|
|
|
/* This implementation can handle an ARGC value of at most 8 and
|
|
values can be passed only in integer registers (r32-r39). */
|
|
|
|
void
|
|
__makecontext (ucontext_t *ucp, void (*func) (void), int argc, ...)
|
|
{
|
|
mcontext_t *sc = &ucp->uc_mcontext;
|
|
extern void __start_context (ucontext_t *link, long gp, ...);
|
|
unsigned long stack_start, stack_end;
|
|
va_list ap;
|
|
unsigned long *rbs;
|
|
int i;
|
|
|
|
stack_start = (long) sc->sc_stack.ss_sp;
|
|
stack_end = (long) sc->sc_stack.ss_sp + sc->sc_stack.ss_size;
|
|
|
|
stack_start = (stack_start + 7) & -8;
|
|
stack_end = stack_end & -16;
|
|
|
|
if (argc > 8)
|
|
{
|
|
fprintf (stderr, _("\
|
|
makecontext: does not know how to handle more than 8 arguments\n"));
|
|
exit (-1);
|
|
}
|
|
|
|
/* set the entry point and global pointer: */
|
|
sc->sc_br[0] = ELF_PTR_TO_FDESC (&__start_context)->ip;
|
|
sc->sc_br[1] = ELF_PTR_TO_FDESC (func)->ip;
|
|
sc->sc_gr[1] = ELF_PTR_TO_FDESC (func)->gp;
|
|
|
|
/* set up the call frame: */
|
|
sc->sc_ar_pfs = ((sc->sc_ar_pfs & ~0x3fffffffffUL)
|
|
| (argc + 2) | ((argc + 2) << 7));
|
|
rbs = (unsigned long *) stack_start;
|
|
PUSH((long) ucp->uc_link);
|
|
PUSH(ELF_PTR_TO_FDESC (&__start_context)->gp);
|
|
va_start (ap, argc);
|
|
for (i = 0; i < argc; ++i)
|
|
PUSH(va_arg (ap, long));
|
|
va_end (ap);
|
|
|
|
/* set the memory and register stack pointers: */
|
|
sc->sc_ar_bsp = (long) rbs;
|
|
sc->sc_gr[12] = stack_end - 16;
|
|
|
|
/* clear the NaT bits for r1 and r12: */
|
|
sc->sc_nat &= ~((1 << 1) | (1 << 12));
|
|
sc->sc_ar_rnat = 0;
|
|
}
|
|
|
|
weak_alias (__makecontext, makecontext)
|