about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@suse.de>2020-02-05 17:33:30 +0100
committerAndreas Schwab <schwab@suse.de>2020-02-10 17:01:21 +0100
commit6d0d2eb1e73345abdcfa539787416dd63bffe0ab (patch)
tree8dd0174809ef2dabd7f761f7e8042e610c70fe1a
parent4970c9e0b58773566a4073852c239f3662cec0aa (diff)
downloadglibc-6d0d2eb1e73345abdcfa539787416dd63bffe0ab.tar.gz
glibc-6d0d2eb1e73345abdcfa539787416dd63bffe0ab.tar.xz
glibc-6d0d2eb1e73345abdcfa539787416dd63bffe0ab.zip
nptl: update default pthread-offsets.h
Remove unused definitions, and correct __PTHREAD_RWLOCK_FLAGS_OFFSET for
__WORDSIZE == 64.
-rw-r--r--sysdeps/nptl/pthread-offsets.h22
1 files changed, 6 insertions, 16 deletions
diff --git a/sysdeps/nptl/pthread-offsets.h b/sysdeps/nptl/pthread-offsets.h
index a399608aa1..3d9c51783d 100644
--- a/sysdeps/nptl/pthread-offsets.h
+++ b/sysdeps/nptl/pthread-offsets.h
@@ -1,26 +1,16 @@
 #include <bits/wordsize.h>
 
 /* These values are based on internal generic types from
-   mutex-internal.h and rwlock-internal.h.  */
+   bits/struct_mutex.h and bits/struct_rwlock.h.  */
 
 #if __WORDSIZE == 64
-# define __PTHREAD_MUTEX_NUSERS_OFFSET          12
-# define __PTHREAD_MUTEX_KIND_OFFSET            16
-# define __PTHREAD_MUTEX_SPINS_OFFSET           20
-# define __PTHREAD_MUTEX_LIST_OFFSET            24
+# define __PTHREAD_MUTEX_KIND_OFFSET		16
 #else
-# define __PTHREAD_MUTEX_NUSERS_OFFSET          16
-# define __PTHREAD_MUTEX_KIND_OFFSET            12
-# define __PTHREAD_MUTEX_SPINS_OFFSET           20
-# define __PTHREAD_MUTEX_LIST_OFFSET            20
+# define __PTHREAD_MUTEX_KIND_OFFSET		12
 #endif
 
-#if __WORDSIZE == 64
-# define __PTHREAD_RWLOCK_FLAGS_OFFSET          48
+#if __BYTE_ORDER == __BIG_ENDIAN
+# define __PTHREAD_RWLOCK_FLAGS_OFFSET		27
 #else
-# if __BYTE_ORDER == __BIG_ENDIAN
-#  define __PTHREAD_RWLOCK_FLAGS_OFFSET         27
-# else
-#  define __PTHREAD_RWLOCK_FLAGS_OFFSET         24
-# endif
+# define __PTHREAD_RWLOCK_FLAGS_OFFSET		24
 #endif