aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/unix/sysv/linux
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps/unix/sysv/linux')
-rw-r--r--sysdeps/unix/sysv/linux/aarch64/sys/ucontext.h10
-rw-r--r--sysdeps/unix/sysv/linux/alpha/sys/ucontext.h10
-rw-r--r--sysdeps/unix/sysv/linux/arm/sys/ucontext.h12
-rw-r--r--sysdeps/unix/sysv/linux/hppa/sys/ucontext.h10
-rw-r--r--sysdeps/unix/sysv/linux/m68k/sys/ucontext.h8
-rw-r--r--sysdeps/unix/sysv/linux/mips/sys/ucontext.h6
-rw-r--r--sysdeps/unix/sysv/linux/nios2/sys/ucontext.h6
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/sys/ucontext.h11
-rw-r--r--sysdeps/unix/sysv/linux/s390/sys/ucontext.h6
-rw-r--r--sysdeps/unix/sysv/linux/sh/sys/ucontext.h6
-rw-r--r--sysdeps/unix/sysv/linux/sparc/sys/ucontext.h4
-rw-r--r--sysdeps/unix/sysv/linux/tile/sys/ucontext.h10
-rw-r--r--sysdeps/unix/sysv/linux/x86/sys/ucontext.h4
13 files changed, 72 insertions, 31 deletions
diff --git a/sysdeps/unix/sysv/linux/aarch64/sys/ucontext.h b/sysdeps/unix/sysv/linux/aarch64/sys/ucontext.h
index 4f602fc..62ba382 100644
--- a/sysdeps/unix/sysv/linux/aarch64/sys/ucontext.h
+++ b/sysdeps/unix/sysv/linux/aarch64/sys/ucontext.h
@@ -46,14 +46,22 @@ typedef elf_fpregset_t fpregset_t;
during non-RT signal handlers). */
typedef struct sigcontext mcontext_t;
+#ifdef __USE_MISC
+# define __ctx(fld) fld
+#else
+# define __ctx(fld) __ ## fld
+#endif
+
/* Userlevel context. */
typedef struct ucontext_t
{
- unsigned long uc_flags;
+ unsigned long __ctx(uc_flags);
struct ucontext_t *uc_link;
stack_t uc_stack;
sigset_t uc_sigmask;
mcontext_t uc_mcontext;
} ucontext_t;
+#undef __ctx
+
#endif /* sys/ucontext.h */
diff --git a/sysdeps/unix/sysv/linux/alpha/sys/ucontext.h b/sysdeps/unix/sysv/linux/alpha/sys/ucontext.h
index bf95205..af20177 100644
--- a/sysdeps/unix/sysv/linux/alpha/sys/ucontext.h
+++ b/sysdeps/unix/sysv/linux/alpha/sys/ucontext.h
@@ -53,10 +53,16 @@ typedef fpreg_t fpregset_t[__NFPREG];
/* A machine context is exactly a sigcontext. */
typedef struct sigcontext mcontext_t;
+#ifdef __USE_MISC
+# define __ctx(fld) fld
+#else
+# define __ctx(fld) __ ## fld
+#endif
+
/* Userlevel context. */
typedef struct ucontext_t
{
- unsigned long int uc_flags;
+ unsigned long int __ctx(uc_flags);
struct ucontext_t *uc_link;
unsigned long __uc_osf_sigmask;
stack_t uc_stack;
@@ -64,4 +70,6 @@ typedef struct ucontext_t
sigset_t uc_sigmask;
} ucontext_t;
+#undef __ctx
+
#endif /* sys/ucontext.h */
diff --git a/sysdeps/unix/sysv/linux/arm/sys/ucontext.h b/sysdeps/unix/sysv/linux/arm/sys/ucontext.h
index 1083d66..2abceef 100644
--- a/sysdeps/unix/sysv/linux/arm/sys/ucontext.h
+++ b/sysdeps/unix/sysv/linux/arm/sys/ucontext.h
@@ -100,15 +100,23 @@ typedef struct _libc_fpstate fpregset_t;
during non-RT signal handlers). */
typedef struct sigcontext mcontext_t;
+#ifdef __USE_MISC
+# define __ctx(fld) fld
+#else
+# define __ctx(fld) __ ## fld
+#endif
+
/* Userlevel context. */
typedef struct ucontext_t
{
- unsigned long uc_flags;
+ unsigned long __ctx(uc_flags);
struct ucontext_t *uc_link;
stack_t uc_stack;
mcontext_t uc_mcontext;
sigset_t uc_sigmask;
- unsigned long uc_regspace[128] __attribute__((__aligned__(8)));
+ unsigned long __ctx(uc_regspace)[128] __attribute__((__aligned__(8)));
} ucontext_t;
+#undef __ctx
+
#endif /* sys/ucontext.h */
diff --git a/sysdeps/unix/sysv/linux/hppa/sys/ucontext.h b/sysdeps/unix/sysv/linux/hppa/sys/ucontext.h
index 2fd7e91..91b7b16 100644
--- a/sysdeps/unix/sysv/linux/hppa/sys/ucontext.h
+++ b/sysdeps/unix/sysv/linux/hppa/sys/ucontext.h
@@ -54,14 +54,22 @@ typedef struct fpregset
/* Context to describe whole processor state. */
typedef struct sigcontext mcontext_t;
+#ifdef __USE_MISC
+# define __ctx(fld) fld
+#else
+# define __ctx(fld) __ ## fld
+#endif
+
/* Userlevel context. */
typedef struct ucontext_t
{
- unsigned long int uc_flags;
+ unsigned long int __ctx(uc_flags);
struct ucontext_t *uc_link;
stack_t uc_stack;
mcontext_t uc_mcontext;
sigset_t uc_sigmask;
} ucontext_t;
+#undef __ctx
+
#endif /* sys/ucontext.h */
diff --git a/sysdeps/unix/sysv/linux/m68k/sys/ucontext.h b/sysdeps/unix/sysv/linux/m68k/sys/ucontext.h
index 1f807b5..3d3e8d4 100644
--- a/sysdeps/unix/sysv/linux/m68k/sys/ucontext.h
+++ b/sysdeps/unix/sysv/linux/m68k/sys/ucontext.h
@@ -111,8 +111,6 @@ typedef struct
fpregset_t __ctx(fpregs);
} mcontext_t;
-#undef __ctx
-
#ifdef __USE_MISC
# define MCONTEXT_VERSION 2
#endif
@@ -120,12 +118,14 @@ typedef struct
/* Userlevel context. */
typedef struct ucontext_t
{
- unsigned long uc_flags;
+ unsigned long __ctx(uc_flags);
struct ucontext_t *uc_link;
stack_t uc_stack;
mcontext_t uc_mcontext;
- unsigned long uc_filler[80];
+ unsigned long __glibc_reserved1[80];
sigset_t uc_sigmask;
} ucontext_t;
+#undef __ctx
+
#endif /* sys/ucontext.h */
diff --git a/sysdeps/unix/sysv/linux/mips/sys/ucontext.h b/sysdeps/unix/sysv/linux/mips/sys/ucontext.h
index d17aa71..27ae9a9 100644
--- a/sysdeps/unix/sysv/linux/mips/sys/ucontext.h
+++ b/sysdeps/unix/sysv/linux/mips/sys/ucontext.h
@@ -110,16 +110,16 @@ typedef struct
} mcontext_t;
#endif
-#undef __ctx
-
/* Userlevel context. */
typedef struct ucontext_t
{
- unsigned long int uc_flags;
+ unsigned long int __ctx(uc_flags);
struct ucontext_t *uc_link;
stack_t uc_stack;
mcontext_t uc_mcontext;
sigset_t uc_sigmask;
} ucontext_t;
+#undef __ctx
+
#endif /* sys/ucontext.h */
diff --git a/sysdeps/unix/sysv/linux/nios2/sys/ucontext.h b/sysdeps/unix/sysv/linux/nios2/sys/ucontext.h
index 09e473c..b6ad1a3 100644
--- a/sysdeps/unix/sysv/linux/nios2/sys/ucontext.h
+++ b/sysdeps/unix/sysv/linux/nios2/sys/ucontext.h
@@ -47,16 +47,16 @@ typedef struct
unsigned long __ctx(regs)[32];
} mcontext_t;
-#undef __ctx
-
/* Userlevel context. */
typedef struct ucontext_t
{
- unsigned long uc_flags;
+ unsigned long __ctx(uc_flags);
struct ucontext_t *uc_link;
stack_t uc_stack;
mcontext_t uc_mcontext;
sigset_t uc_sigmask;
} ucontext_t;
+#undef __ctx
+
#endif /* sys/ucontext.h */
diff --git a/sysdeps/unix/sysv/linux/powerpc/sys/ucontext.h b/sysdeps/unix/sysv/linux/powerpc/sys/ucontext.h
index 54fe9df..3a56082 100644
--- a/sysdeps/unix/sysv/linux/powerpc/sys/ucontext.h
+++ b/sysdeps/unix/sysv/linux/powerpc/sys/ucontext.h
@@ -150,7 +150,7 @@ typedef struct {
/* Userlevel context. */
typedef struct ucontext_t
{
- unsigned long int uc_flags;
+ unsigned long int __ctx(uc_flags);
struct ucontext_t *uc_link;
stack_t uc_stack;
#if __WORDSIZE == 32
@@ -177,13 +177,14 @@ typedef struct ucontext_t
* old ucontext_t; it ensures that uc_mcontext.regs and uc_sigmask
* are at the same offset as previously.
*/
- int uc_pad[7];
- union uc_regs_ptr {
+ int __glibc_reserved1[7];
+ union __ctx(uc_regs_ptr) {
struct __ctx(pt_regs) *__ctx(regs);
- mcontext_t *uc_regs;
+ mcontext_t *__ctx(uc_regs);
} uc_mcontext;
sigset_t uc_sigmask;
- char uc_reg_space[sizeof(mcontext_t) + 12]; /* last for extensibility */
+ /* last for extensibility */
+ char __ctx(uc_reg_space)[sizeof(mcontext_t) + 12];
#else /* 64-bit */
sigset_t uc_sigmask;
mcontext_t uc_mcontext; /* last for extensibility */
diff --git a/sysdeps/unix/sysv/linux/s390/sys/ucontext.h b/sysdeps/unix/sysv/linux/s390/sys/ucontext.h
index d6bf4d8..88b74b6 100644
--- a/sysdeps/unix/sysv/linux/s390/sys/ucontext.h
+++ b/sysdeps/unix/sysv/linux/s390/sys/ucontext.h
@@ -80,17 +80,17 @@ typedef struct
fpregset_t __ctx(fpregs);
} mcontext_t;
-#undef __ctx
-
/* Userlevel context. */
typedef struct ucontext_t
{
- unsigned long int uc_flags;
+ unsigned long int __ctx(uc_flags);
struct ucontext_t *uc_link;
stack_t uc_stack;
mcontext_t uc_mcontext;
sigset_t uc_sigmask;
} ucontext_t;
+#undef __ctx
+
#endif /* sys/ucontext.h */
diff --git a/sysdeps/unix/sysv/linux/sh/sys/ucontext.h b/sysdeps/unix/sysv/linux/sh/sys/ucontext.h
index 2f42d3a..c838d80 100644
--- a/sysdeps/unix/sysv/linux/sh/sys/ucontext.h
+++ b/sysdeps/unix/sysv/linux/sh/sys/ucontext.h
@@ -112,16 +112,16 @@ typedef struct
unsigned int __ctx(ownedfp);
} mcontext_t;
-#undef __ctx
-
/* Userlevel context. */
typedef struct ucontext_t
{
- unsigned long int uc_flags;
+ unsigned long int __ctx(uc_flags);
struct ucontext_t *uc_link;
stack_t uc_stack;
mcontext_t uc_mcontext;
sigset_t uc_sigmask;
} ucontext_t;
+#undef __ctx
+
#endif /* sys/ucontext.h */
diff --git a/sysdeps/unix/sysv/linux/sparc/sys/ucontext.h b/sysdeps/unix/sysv/linux/sparc/sys/ucontext.h
index 9932ed4..9a3eacd 100644
--- a/sysdeps/unix/sysv/linux/sparc/sys/ucontext.h
+++ b/sysdeps/unix/sysv/linux/sparc/sys/ucontext.h
@@ -94,7 +94,7 @@ typedef struct {
typedef struct ucontext_t {
struct ucontext_t *uc_link;
- unsigned long uc_flags;
+ unsigned long __ctx(uc_flags);
unsigned long __uc_sigmask;
mcontext_t uc_mcontext;
stack_t uc_stack;
@@ -294,7 +294,7 @@ typedef struct
/* Userlevel context. */
typedef struct ucontext_t
{
- unsigned long uc_flags;
+ unsigned long __ctx(uc_flags);
struct ucontext_t *uc_link;
sigset_t uc_sigmask;
stack_t uc_stack;
diff --git a/sysdeps/unix/sysv/linux/tile/sys/ucontext.h b/sysdeps/unix/sysv/linux/tile/sys/ucontext.h
index fcbe3ff..b70dae7 100644
--- a/sysdeps/unix/sysv/linux/tile/sys/ucontext.h
+++ b/sysdeps/unix/sysv/linux/tile/sys/ucontext.h
@@ -59,14 +59,22 @@ enum
/* A machine context is exactly a sigcontext. */
typedef struct sigcontext mcontext_t;
+#ifdef __USE_MISC
+# define __ctx(fld) fld
+#else
+# define __ctx(fld) __ ## fld
+#endif
+
/* Userlevel context. */
typedef struct ucontext_t
{
- unsigned long int uc_flags;
+ unsigned long int __ctx(uc_flags);
struct ucontext_t *uc_link;
stack_t uc_stack;
mcontext_t uc_mcontext;
sigset_t uc_sigmask;
} ucontext_t;
+#undef __ctx
+
#endif /* sys/ucontext.h */
diff --git a/sysdeps/unix/sysv/linux/x86/sys/ucontext.h b/sysdeps/unix/sysv/linux/x86/sys/ucontext.h
index f4f5c94..6d8137e 100644
--- a/sysdeps/unix/sysv/linux/x86/sys/ucontext.h
+++ b/sysdeps/unix/sysv/linux/x86/sys/ucontext.h
@@ -141,7 +141,7 @@ typedef struct
/* Userlevel context. */
typedef struct ucontext_t
{
- unsigned long int uc_flags;
+ unsigned long int __ctx(uc_flags);
struct ucontext_t *uc_link;
stack_t uc_stack;
mcontext_t uc_mcontext;
@@ -245,7 +245,7 @@ typedef struct
/* Userlevel context. */
typedef struct ucontext_t
{
- unsigned long int uc_flags;
+ unsigned long int __ctx(uc_flags);
struct ucontext_t *uc_link;
stack_t uc_stack;
mcontext_t uc_mcontext;
generated by cgit v1.1 at 2024-11-06 13:55:48 +0000