lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-05 19:35:52 +03:00
Code Activity

Use __glibc_reserved convention in mcontext, sigcontext (bug 21457).

Browse Source 
This patch implements the most straightforward part of fixing
namespace issues for sys/ucontext.h and related headers: where fields
in sys/ucontext.h or bits/sigcontext.h are named "reserved", "padding"
or similar, they are renamed to use the __glibc_reserved* naming
convention.  It does not change fields with a leading underscore, or
even those with a prefix such as uc_ or sc_.  It only fixes a small
part of bug 21457, so no XFAILs are removed.

Tested for x86_64 and x86, and with build-many-glibcs.py.

	[BZ #21457]
	* sysdeps/unix/sysv/linux/mips/sys/ucontext.h
	[_MIPS_SIM != _ABIO32] (mcontext_t): Rename field reserved to
	__glibc_reserved1.
	* sysdeps/unix/sysv/linux/x86/bits/sigcontext.h
	(struct _fpx_sw_bytes): Rename field padding to __glibc_reserved1.
	(struct _fpxreg): Likewise.
	[!__x86_64__] (struct _fpstate): Rename field reserved to
	__glibc_reserved1.  Rename field padding to __glibc_reserved2.
	[__x86_64__] (struct _fpstate): Rename field padding to
	__glibc_reserved1.
	(struct _xsave_hdr): Rename field reserved1 to __glibc_reserved1.
	Rename field reserved2 to __glibc_reserved2.
	* sysdeps/unix/sysv/linux/x86/sys/ucontext.h
	[__x86_64__] (struct _libc_fpxreg): Rename field padding to
	__glibc_reserved1.
	[__x86_64__] (struct _libc_fpstate): Rename field padding to
	__glibc_reserved1.
This commit is contained in:
Joseph Myers
2017-05-04 11:26:33 +00:00
parent 808befbf9e
commit fd9f30f6f9
4 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
ChangeLog
View File

@@ -1,3 +1,24 @@
2017-05-04 Joseph Myers <joseph@codesourcery.com>
[BZ #21457]
* sysdeps/unix/sysv/linux/mips/sys/ucontext.h
[_MIPS_SIM != _ABIO32] (mcontext_t): Rename field reserved to
__glibc_reserved1.
* sysdeps/unix/sysv/linux/x86/bits/sigcontext.h
(struct _fpx_sw_bytes): Rename field padding to __glibc_reserved1.
(struct _fpxreg): Likewise.
[!__x86_64__] (struct _fpstate): Rename field reserved to
__glibc_reserved1. Rename field padding to __glibc_reserved2.
[__x86_64__] (struct _fpstate): Rename field padding to
__glibc_reserved1.
(struct _xsave_hdr): Rename field reserved1 to __glibc_reserved1.
Rename field reserved2 to __glibc_reserved2.
* sysdeps/unix/sysv/linux/x86/sys/ucontext.h
[__x86_64__] (struct _libc_fpxreg): Rename field padding to
__glibc_reserved1.
[__x86_64__] (struct _libc_fpstate): Rename field padding to
__glibc_reserved1.
2017-05-03 Rajalakshmi Srinivasaraghavan <raji@linux.vnet.ibm.com> 2017-05-03 Rajalakshmi Srinivasaraghavan <raji@linux.vnet.ibm.com>
* sysdeps/powerpc/powerpc64/multiarch/strncat.c: Correct hwcap * sysdeps/powerpc/powerpc64/multiarch/strncat.c: Correct hwcap

2
sysdeps/unix/sysv/linux/mips/sys/ucontext.h
View File

@@ -98,7 +98,7 @@ typedef struct
unsigned int fpc_csr; unsigned int fpc_csr;
unsigned int used_math; unsigned int used_math;
unsigned int dsp; unsigned int dsp;
unsigned int reserved; unsigned int __glibc_reserved1;
} mcontext_t; } mcontext_t;
#endif #endif

14
sysdeps/unix/sysv/linux/x86/bits/sigcontext.h
View File

@@ -32,7 +32,7 @@ struct _fpx_sw_bytes
__uint32_t extended_size; __uint32_t extended_size;
__uint64_t xstate_bv; __uint64_t xstate_bv;
__uint32_t xstate_size; __uint32_t xstate_size;
__uint32_t padding[7]; __uint32_t __glibc_reserved1[7];
}; };
struct _fpreg struct _fpreg
@@ -45,7 +45,7 @@ struct _fpxreg
{ {
unsigned short significand[4]; unsigned short significand[4];
unsigned short exponent; unsigned short exponent;
unsigned short padding[3]; unsigned short __glibc_reserved1[3];
}; };
struct _xmmreg struct _xmmreg
@@ -74,10 +74,10 @@ struct _fpstate
/* FXSR FPU environment. */ /* FXSR FPU environment. */
__uint32_t _fxsr_env[6]; __uint32_t _fxsr_env[6];
__uint32_t mxcsr; __uint32_t mxcsr;
__uint32_t reserved; __uint32_t __glibc_reserved1;
struct _fpxreg _fxsr_st[8]; struct _fpxreg _fxsr_st[8];
struct _xmmreg _xmm[8]; struct _xmmreg _xmm[8];
__uint32_t padding[56]; __uint32_t __glibc_reserved2[56];
}; };
#ifndef sigcontext_struct #ifndef sigcontext_struct
@@ -131,7 +131,7 @@ struct _fpstate
__uint32_t mxcr_mask; __uint32_t mxcr_mask;
struct _fpxreg _st[8]; struct _fpxreg _st[8];
struct _xmmreg _xmm[16]; struct _xmmreg _xmm[16];
__uint32_t padding[24]; __uint32_t __glibc_reserved1[24];
}; };
struct sigcontext struct sigcontext
@@ -175,8 +175,8 @@ struct sigcontext
struct _xsave_hdr struct _xsave_hdr
{ {
__uint64_t xstate_bv; __uint64_t xstate_bv;
__uint64_t reserved1[2]; __uint64_t __glibc_reserved1[2];
__uint64_t reserved2[5]; __uint64_t __glibc_reserved2[5];
}; };
struct _ymmh_state struct _ymmh_state

4
sysdeps/unix/sysv/linux/x86/sys/ucontext.h
View File

@@ -95,7 +95,7 @@ struct _libc_fpxreg
{ {
unsigned short int significand[4]; unsigned short int significand[4];
unsigned short int exponent; unsigned short int exponent;
unsigned short int padding[3]; unsigned short int __glibc_reserved1[3];
}; };
struct _libc_xmmreg struct _libc_xmmreg
@@ -116,7 +116,7 @@ struct _libc_fpstate
__uint32_t mxcr_mask; __uint32_t mxcr_mask;
struct _libc_fpxreg _st[8]; struct _libc_fpxreg _st[8];
struct _libc_xmmreg _xmm[16]; struct _libc_xmmreg _xmm[16];
__uint32_t padding[24]; __uint32_t __glibc_reserved1[24];
}; };
/* Structure to describe FPU registers. */ /* Structure to describe FPU registers. */