diff options
| -rw-r--r-- | nptl/ChangeLog | 7 | ||||
| -rw-r--r-- | nptl/sysdeps/x86_64/tls.h | 10 |
2 files changed, 16 insertions, 1 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog index e502e68f9d..f5ea65ffcc 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,10 @@ +2008-12-08 Ulrich Drepper <drepper@redhat.com> + + * sysdeps/x86_64/tls.h (tcbhead_t): Add fields reserved for TM + implementation. Add necessary padding and. + * descr.h (struct pthread): Increase padding for tcbhead_t to 24 + words. + 2008-12-04 Kaz Kojima <kkojima@rr.iij4u.or.jp> * sysdeps/unix/sysv/linux/sh/lowlevellock.h: Define FUTEX_WAIT_BITSET diff --git a/nptl/sysdeps/x86_64/tls.h b/nptl/sysdeps/x86_64/tls.h index 79db61c709..172f44579b 100644 --- a/nptl/sysdeps/x86_64/tls.h +++ b/nptl/sysdeps/x86_64/tls.h @@ -1,5 +1,5 @@ /* Definition for thread-local data handling. nptl/x86_64 version. - Copyright (C) 2002,2003,2004,2005,2006,2007 Free Software Foundation, Inc. + Copyright (C) 2002-2007, 2008 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 @@ -28,6 +28,7 @@ # include <stdlib.h> # include <sysdep.h> # include <kernel-features.h> +# include <bits/wordsize.h> /* Type for the dtv. */ @@ -56,7 +57,14 @@ typedef struct unsigned long int vgetcpu_cache[2]; #ifndef __ASSUME_PRIVATE_FUTEX int private_futex; +#else + int __unused1; +#endif +#if __WORDSIZE == 64 + int __pad1; #endif + /* Reservation of some values for the TM ABI. */ + void *__private_tm[5]; } tcbhead_t; #else /* __ASSEMBLER__ */ |