diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2009-04-27 21:55:49 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2009-04-27 21:55:49 +0000 |
| commit | d5c157a978000970befcfa067410896fe08a3dcc (patch) | |
| tree | 68b2f08ad5abd548bd2103047a431cca164937d3 /nptl/sysdeps/i386 | |
| parent | 6284c9f61e25a6f259d25b21b5c0ca223a3e8012 (diff) | |
| download | glibc-d5c157a978000970befcfa067410896fe08a3dcc.tar glibc-d5c157a978000970befcfa067410896fe08a3dcc.tar.gz glibc-d5c157a978000970befcfa067410896fe08a3dcc.tar.bz2 glibc-d5c157a978000970befcfa067410896fe08a3dcc.zip | |
* cancellation.c (__pthread_disable_asynccancel): Use THREAD_ATOMIC_AND
is available.
* libc-cancellation.c (__libc_disable_asynccancel): Likewise.
* sysdeps/x86_64/tls.h: Define THREAD_ATOMIC_AND.
* sysdeps/i386/tls.h: Likewise.
(tcbhead_t): Add __private_tm member.
Diffstat (limited to 'nptl/sysdeps/i386')
| -rw-r--r-- | nptl/sysdeps/i386/tls.h | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/nptl/sysdeps/i386/tls.h b/nptl/sysdeps/i386/tls.h index b5127420cf..f23977e73f 100644 --- a/nptl/sysdeps/i386/tls.h +++ b/nptl/sysdeps/i386/tls.h @@ -1,5 +1,5 @@ /* Definition for thread-local data handling. nptl/i386 version. - Copyright (C) 2002,2003,2004,2005,2006,2007 Free Software Foundation, Inc. + Copyright (C) 2002-2007, 2009 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -56,7 +56,11 @@ typedef struct int gscope_flag; #ifndef __ASSUME_PRIVATE_FUTEX int private_futex; +#else + int __unused1; #endif + /* Reservation of some values for the TM ABI. */ + void *__private_tm[5]; } tcbhead_t; # define TLS_MULTIPLE_THREADS_IN_TCB 1 @@ -394,6 +398,17 @@ union user_desc_init __ret; }) +/* Atomic logical and. */ +#define THREAD_ATOMIC_AND(descr, member, val) \ + (void) ({ if (sizeof ((descr)->member) == 4) \ + asm volatile (LOCK_PREFIX "andl %1, %%gs:%P0" \ + :: "i" (offsetof (struct pthread, member)), \ + "ir" (val)); \ + else \ + /* Not necessary for other sizes in the moment. */ \ + abort (); }) + + /* Atomic set bit. */ #define THREAD_ATOMIC_BIT_SET(descr, member, bit) \ (void) ({ if (sizeof ((descr)->member) == 4) \ |