mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-25 06:20:06 +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. |
||
|---|---|---|
| .. | ||
| net | ||
| netinet | ||
| nfs | ||
| sys | ||
| _G_config.h | ||
| _itoa.h | ||
| a.out.h | ||
| abort-instr.h | ||
| aio_misc.h | ||
| allocalim.h | ||
| asm-syntax.h | ||
| atomic-machine.h | ||
| c++-types.data | ||
| confstr.h | ||
| device-nrs.h | ||
| dirstream.h | ||
| dl-cache.h | ||
| dl-dtprocnum.h | ||
| dl-dtv.h | ||
| dl-fcntl.h | ||
| dl-fileid.h | ||
| dl-fptr.h | ||
| dl-hash.h | ||
| dl-irel.h | ||
| dl-librecon.h | ||
| dl-lookupcfg.h | ||
| dl-machine.h | ||
| dl-mman.h | ||
| dl-osinfo.h | ||
| dl-procinfo.c | ||
| dl-procinfo.h | ||
| dl-sysdep.h | ||
| dl-tls.h | ||
| dl-unistd.h | ||
| dwarf2.h | ||
| elide.h | ||
| eloop-threshold.h | ||
| entry.h | ||
| errqueue.h | ||
| exit-thread.h | ||
| fd_to_filename.h | ||
| fips-private.h | ||
| fix-fp-int-compare-invalid.h | ||
| fix-fp-int-convert-overflow.h | ||
| fix-int-fp-convert-zero.h | ||
| fork.h | ||
| fpu_control.h | ||
| frame.h | ||
| framestate.c | ||
| gcc-compat.h | ||
| gccframe.h | ||
| get-rounding-mode.h | ||
| gmp-mparam.h | ||
| hp-timing-common.h | ||
| hp-timing.h | ||
| ifreq.h | ||
| ifunc-sel.h | ||
| intr-msg.h | ||
| inttypes.h | ||
| ld.abilist | ||
| ldconfig.h | ||
| ldsodefs.h | ||
| libanl.abilist | ||
| libBrokenLocale.abilist | ||
| libc-lock.h | ||
| libc-mmap.h | ||
| libc-start.h | ||
| libc-tsd.h | ||
| libc.abilist | ||
| libcidn.abilist | ||
| libcrypt.abilist | ||
| libdl.abilist | ||
| libm-test-ulps | ||
| libm-test-ulps-name | ||
| libm.abilist | ||
| libnsl.abilist | ||
| libnss_compat.abilist | ||
| libnss_db.abilist | ||
| libnss_dns.abilist | ||
| libnss_files.abilist | ||
| libnss_hesiod.abilist | ||
| libnss_nis.abilist | ||
| libnss_nisplus.abilist | ||
| libpthread.abilist | ||
| libresolv.abilist | ||
| librt.abilist | ||
| libutil.abilist | ||
| linkmap.h | ||
| local-setxid.h | ||
| localplt.data | ||
| machine-gmon.h | ||
| machine-lock.h | ||
| machine-sp.h | ||
| Makefile | ||
| malloc-alignment.h | ||
| malloc-machine.h | ||
| malloc-sysdep.h | ||
| math_ldbl_opt.h | ||
| math_ldbl.h | ||
| math_private_calls.h | ||
| math_private.h | ||
| math-tests-arch.h | ||
| math-tests.h | ||
| math-type-macros-double.h | ||
| math-type-macros-float128.h | ||
| math-type-macros-float.h | ||
| math-type-macros-ldouble.h | ||
| math-type-macros.h | ||
| memcopy.h | ||
| memusage.h | ||
| nan-high-order-bit.h | ||
| not-cancel.h | ||
| not-errno.h | ||
| nscd-types.h | ||
| pagecopy.h | ||
| paths.h | ||
| profil-counter.h | ||
| pty-private.h | ||
| register-dump.h | ||
| rtld-lowlevel.h | ||
| safe-fatal.h | ||
| sigcontextinfo.h | ||
| siglist.h | ||
| sigset-cvt-mask.h | ||
| sigsetops.h | ||
| stackguard-macros.h | ||
| stackinfo.h | ||
| startup.h | ||
| stdint.h | ||
| stdio-lock.h | ||
| string_private.h | ||
| symbol-hacks.h | ||
| sysdep-cancel.h | ||
| sysdep.h | ||
| thread_state.h | ||
| tininess.h | ||
| tls-macros.h | ||
| tls.h | ||
| tst-audit.h | ||
| tst-stack-align.h | ||
| unsecvars.h | ||
| unwind-dw2-fde-glibc.c | ||
| unwind-dw2-fde.c | ||
| unwind-dw2-fde.h | ||
| unwind-dw2.c | ||
| unwind-pe.c | ||
| unwind-pe.h | ||
| unwind-resume.h | ||
| unwind.h | ||
| utmp-equal.h | ||