mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-26 04:31:03 +00:00
139904b7e4
Continuing the fixes for namespace issues in sys/ucontext.h, this patch moves various symbols into the implementation namespace in the absence of __USE_MISC. As with previous changes, it is nonexhaustive, just covering more straightforward cases. Structure fields are generally changed to have a prefix __ in the absence of __USE_MISC, via a macro __ctx (used without a space before the open parenthesis, since the result is a single identifier). Various macros such as NGREG also have leading __ added. No changes are made to structure tags (and thus to C++ name mangling), except that in the (unused) file sysdeps/i386/sys/ucontext.h, structures defined inside other structures as the type for a field have their tags removed in the non-__USE_MISC case (those structure tags would not in any case have been visible in C++, because in C++ the scope of such a tag is limited to the containing structure). No changes are made to the contents of bits/sigcontext.h, or to whether it is included. Because of remaining namespace issues, this patch does not yet fix the bug or allow any XFAILs to be removed. Tested for x86_64 and x86, and with build-many-glibcs.py. [BZ #21457] * sysdeps/arm/sys/ucontext.h (NGREG): Rename to __NGREG and define NGREG to __NGREG if [__USE_MISC]. (gregset_t): Define using __NGREG. (__ctx): New macro. (mcontext_t): Use __ctx in defining fields. * sysdeps/i386/sys/ucontext.h (NGREG): Rename to __NGREG and define NGREG to __NGREG if [__USE_MISC]. (gregset_t): Define using __NGREG. (__ctx): New macro. (__ctxt): Likewise. (fpregset_t): Use __ctx and __ctxt in defining fields. (mcontext_t): Likewise. * sysdeps/m68k/sys/ucontext.h (NGREG): Rename to __NGREG and define NGREG to __NGREG if [__USE_MISC]. (gregset_t): Define using __NGREG. (__ctx): New macro. (mcontext_t): Use __ctx in defining fields. * sysdeps/mips/sys/ucontext.h (NGREG): Rename to __NGREG and define NGREG to __NGREG if [__USE_MISC]. (gregset_t): Define using __NGREG. (__ctx): New macro. (fpregset_t): Use __ctx in defining fields. (mcontext_t): Likewise. * sysdeps/unix/sysv/linux/alpha/sys/ucontext.h (NGREG): Rename to __NGREG and define NGREG to __NGREG if [__USE_MISC]. (gregset_t): Define using __NGREG. (NFPREG): Rename to __NFPREG and define NFPREG to __NFPREG if [__USE_MISC]. (fpregset_t): Define using __NFPREG. * sysdeps/unix/sysv/linux/m68k/sys/ucontext.h (NGREG): Rename to __NGREG and define NGREG to __NGREG if [__USE_MISC]. (gregset_t): Define using __NGREG. (__ctx): New macro. (fpregset_t): Use __ctx in defining fields. (mcontext_t): Likewise. * sysdeps/unix/sysv/linux/mips/sys/ucontext.h (NGREG): Rename to __NGREG and define NGREG to __NGREG if [__USE_MISC]. (NFPREG): Rename to __NFPREG and define NFPREG to __NFPREG if [__USE_MISC]. (gregset_t): Define using __NGREG. (__ctx): New macro. (fpregset_t): Use __ctx in defining fields. (mcontext_t): Likewise. * sysdeps/unix/sysv/linux/nios2/sys/ucontext.h (__ctx): New macro. (mcontext_t): Use __ctx in defining fields. * sysdeps/unix/sysv/linux/powerpc/sys/ucontext.h (__ctx): New macro. [__WORDSIZE == 32] (NGREG): Rename to __NGREG and define NGREG to __NGREG if [__USE_MISC]. [__WORDSIZE == 32] (gregset_t): Define using __NGREG. [__WORDSIZE == 32] (fpregset_t): Use __ctx in defining fields. (mcontext_t): Likewise. [__WORDSIZE != 32] (NGREG): Rename to __NGREG and define NGREG to __NGREG if [__USE_MISC]. [__WORDSIZE != 32] (NFPREG): Rename to __NFPREG and define NFPREG to __NFPREG if [__USE_MISC]. [__WORDSIZE != 32] (NVRREG): Rename to __NVRREG and define NVRREG to __NVRREG if [__USE_MISC]. [__WORDSIZE != 32] (gregset_t): Define using __NGREG. [__WORDSIZE != 32] (fpregset_t): Define using __NFPREG. [__WORDSIZE != 32] (vscr_t): Use __ctx in defining fields. [__WORDSIZE != 32] (vrregset_t): Likewise. [__WORDSIZE != 32] (mcontext_t): Likewise. * sysdeps/unix/sysv/linux/s390/sys/ucontext.h (__ctx): New macro. (__psw_t): Use __ctx in defining fields. (NGREG): Rename to __NGREG and define NGREG to __NGREG if [__USE_MISC]. (gregset_t): Define using __NGREG. (fpreg_t): Use __ctx in defining fields. (fpregset_t): Likewise. (mcontext_t): Likewise. * sysdeps/unix/sysv/linux/sh/sys/ucontext.h (NGREG): Rename to __NGREG and define NGREG to __NGREG if [__USE_MISC]. (gregset_t): Define using __NGREG. (NFPREG): Rename to __NFPREG and define NFPREG to __NFPREG if [__USE_MISC]. (fpregset_t): Define using __NFPREG. (__ctx): New macro. (mcontext_t): Use __ctx in defining fields. * sysdeps/unix/sysv/linux/x86/sys/ucontext.h (__ctx): New macro. [__x86_64__] (NGREG): Rename to __NGREG and define NGREG to __NGREG if [__USE_MISC]. [__x86_64__] (gregset_t): Define using __NGREG. [__x86_64__] (struct _libc_fpxreg): Use __ctx in defining fields. [__x86_64__] (struct _libc_fpstate): Likewise. [__x86_64__] (mcontext_t): Likewise. [!__x86_64__] (NGREG): Rename to __NGREG and define NGREG to __NGREG if [__USE_MISC]. [!__x86_64__] (gregset_t): Define using __NGREG. [!__x86_64__] (struct _libc_fpreg): Use __ctx in defining fields. [!__x86_64__] (struct _libc_fpstate): Likewise. [!__x86_64__] (mcontext_t): Likewise. |
||
|---|---|---|
| .. | ||
| fpu | ||
| i586 | ||
| i686 | ||
| i786 | ||
| nptl | ||
| sys | ||
| ____longjmp_chk.S | ||
| __longjmp.S | ||
| abort-instr.h | ||
| add_n.S | ||
| addmul_1.S | ||
| asm-syntax.h | ||
| atomic-machine.h | ||
| backtrace.c | ||
| bcopy.S | ||
| bsd-_setjmp.S | ||
| bsd-setjmp.S | ||
| bzero.S | ||
| cacheinfo.c | ||
| configure | ||
| configure.ac | ||
| crti.S | ||
| crtn.S | ||
| dl-irel.h | ||
| dl-lookupcfg.h | ||
| dl-machine.h | ||
| dl-procinfo.c | ||
| dl-tls.h | ||
| dl-tlsdesc.h | ||
| dl-tlsdesc.S | ||
| dl-trampoline.S | ||
| ffs.c | ||
| gccframe.h | ||
| gmp-mparam.h | ||
| htonl.S | ||
| htons.S | ||
| i386-mcount.S | ||
| Implies | ||
| init-arch.h | ||
| jmpbuf-offsets.h | ||
| jmpbuf-unwind.h | ||
| ldbl2mpn.c | ||
| ldsodefs.h | ||
| link-defines.sym | ||
| lshift.S | ||
| machine-gmon.h | ||
| Makefile | ||
| memchr.S | ||
| memcmp.S | ||
| memcopy.h | ||
| memcpy_chk.S | ||
| memcpy.S | ||
| memmove_chk.S | ||
| memmove.S | ||
| mempcpy_chk.S | ||
| mempcpy.S | ||
| memset_chk.S | ||
| memset.S | ||
| memusage.h | ||
| mp_clz_tab.c | ||
| mul_1.S | ||
| preconfigure | ||
| pthread_spin_trylock.S | ||
| rawmemchr.S | ||
| rshift.S | ||
| setfpucw.c | ||
| setjmp.S | ||
| stackguard-macros.h | ||
| stackinfo.h | ||
| start.S | ||
| stpcpy.S | ||
| stpncpy.S | ||
| strcat.S | ||
| strchr.S | ||
| strchrnul.S | ||
| strcspn.S | ||
| string-inlines.c | ||
| strlen.c | ||
| strlen.S | ||
| strpbrk.S | ||
| strrchr.S | ||
| strspn.S | ||
| sub_n.S | ||
| submul_1.S | ||
| symbol-hacks.h | ||
| sysdep.h | ||
| tls-macros.h | ||
| tlsdesc.c | ||
| tlsdesc.sym | ||
| tst-audit3.c | ||
| tst-audit3.h | ||
| tst-audit.h | ||
| tst-auditmod3a.c | ||
| tst-auditmod3b.c | ||
| tst-ld-sse-use.sh | ||
| tst-stack-align.h | ||
| Versions | ||