aboutsummaryrefslogtreecommitdiff
path: root/nptl/descr.h
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-04-12 08:38:14 +0000
committerUlrich Drepper <drepper@redhat.com>2003-04-12 08:38:14 +0000
commit68107ec092e7cc3fcd1f56edf9da8085cffed00d (patch)
tree4297addf21ce4bc6d324a145ecacaf7920b336d4 /nptl/descr.h
parent09d65ff393e9183eecba1e5cb877e95dbdd3d4a4 (diff)
downloadglibc-68107ec092e7cc3fcd1f56edf9da8085cffed00d.zip
glibc-68107ec092e7cc3fcd1f56edf9da8085cffed00d.tar.gz
glibc-68107ec092e7cc3fcd1f56edf9da8085cffed00d.tar.bz2
Update.
* sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h: Likewise.
Diffstat (limited to 'nptl/descr.h')
-rw-r--r--nptl/descr.h24
1 files changed, 12 insertions, 12 deletions
diff --git a/nptl/descr.h b/nptl/descr.h
index 28b7afa..efb25c7 100644
--- a/nptl/descr.h
+++ b/nptl/descr.h
@@ -63,18 +63,19 @@
information. */
struct pthread_unwind_buf
{
+ struct
+ {
+ __jmp_buf jmp_buf;
+ int mask_was_saved;
+ } cancel_jmp_buf[1];
+
union
{
/* This is the placeholder of the public version. */
- void *pad[16];
+ void *pad[4];
struct
{
-#ifdef HAVE_FORCED_UNWIND
- /* First the machine-specific unwind info. */
- struct _Unwind_Exception exc;
-#endif
-
/* Pointer to the previous cleanup buffer. */
__pthread_unwind_buf_t *prev;
@@ -87,12 +88,6 @@ struct pthread_unwind_buf
int canceltype;
} data;
} priv;
-
- struct
- {
- __jmp_buf jmp_buf;
- int mask_was_saved;
- } cancel_jmp_buf[1];
};
@@ -226,6 +221,11 @@ struct pthread
/* Next descriptor with a pending event. */
struct pthread *nextevent;
+#ifdef HAVE_FORCED_UNWIND
+ /* Machine-specific unwind info. */
+ struct _Unwind_Exception exc;
+#endif
+
/* If nonzero pointer to area allocated for the stack and its
size. */
void *stackblock;