[glibc/vineet/arc-glibc-2.30-time_t-32-bit] atomics: use default values for __PTHREAD_MUTEX_*

[glibc/vineet/arc-glibc-2.30-time_t-32-bit] atomics: use default values for __PTHREAD_MUTEX_*

[Vineet Gupta]

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=e8d28fb62972cc4655a6733a322321396b5ec451

commit e8d28fb62972cc4655a6733a322321396b5ec451
Author: Vineet Gupta <vgupta@synopsys.com>
Date:   Wed Jan 30 10:52:19 2019 -0800

    atomics: use default values for __PTHREAD_MUTEX_*

Diff:
---
 sysdeps/arc/nptl/bits/pthreadtypes-arch.h | 25 ++++++++++++-------------
 sysdeps/arc/nptl/pthread-offsets.h        |  7 +++----
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/sysdeps/arc/nptl/bits/pthreadtypes-arch.h b/sysdeps/arc/nptl/bits/pthreadtypes-arch.h
index cd91785a33..eae884f61c 100644
--- a/sysdeps/arc/nptl/bits/pthreadtypes-arch.h
+++ b/sysdeps/arc/nptl/bits/pthreadtypes-arch.h
@@ -21,22 +21,21 @@
 
 #include <endian.h>
 
-#define __SIZEOF_PTHREAD_ATTR_T 36
-#define __SIZEOF_PTHREAD_MUTEX_T 24
-#define __SIZEOF_PTHREAD_MUTEXATTR_T 4
-#define __SIZEOF_PTHREAD_COND_T 48
-#define __SIZEOF_PTHREAD_CONDATTR_T 4
-#define __SIZEOF_PTHREAD_RWLOCK_T 32
-#define __SIZEOF_PTHREAD_RWLOCKATTR_T 8
-#define __SIZEOF_PTHREAD_BARRIER_T 20
-#define __SIZEOF_PTHREAD_BARRIERATTR_T 4
+#define __SIZEOF_PTHREAD_ATTR_T		32
+#define __SIZEOF_PTHREAD_MUTEX_T	32
+#define __SIZEOF_PTHREAD_MUTEXATTR_T	4
+#define __SIZEOF_PTHREAD_COND_T		48
+#define __SIZEOF_PTHREAD_CONDATTR_T	4
+#define __SIZEOF_PTHREAD_RWLOCK_T	32
+#define __SIZEOF_PTHREAD_RWLOCKATTR_T	8
+#define __SIZEOF_PTHREAD_BARRIER_T	20
+#define __SIZEOF_PTHREAD_BARRIERATTR_T	4
 
-/* Data structure for mutex handling.  */
 #define __PTHREAD_COMPAT_PADDING_MID
 #define __PTHREAD_COMPAT_PADDING_END
-#define __PTHREAD_MUTEX_LOCK_ELISION    0
-#define __PTHREAD_MUTEX_NUSERS_AFTER_KIND  1
-#define __PTHREAD_MUTEX_USE_UNION          1
+#define __PTHREAD_MUTEX_LOCK_ELISION       0
+#define __PTHREAD_MUTEX_NUSERS_AFTER_KIND  0
+#define __PTHREAD_MUTEX_USE_UNION          0
 
 #define __LOCK_ALIGNMENT
 #define __ONCE_ALIGNMENT
diff --git a/sysdeps/arc/nptl/pthread-offsets.h b/sysdeps/arc/nptl/pthread-offsets.h
index 9617354dc7..c363e8cda8 100644
--- a/sysdeps/arc/nptl/pthread-offsets.h
+++ b/sysdeps/arc/nptl/pthread-offsets.h
@@ -1,5 +1,4 @@
-#define __PTHREAD_MUTEX_NUSERS_OFFSET   16
-#define __PTHREAD_MUTEX_KIND_OFFSET     12
+#define __PTHREAD_MUTEX_NUSERS_OFFSET   12
+#define __PTHREAD_MUTEX_KIND_OFFSET     16
 #define __PTHREAD_MUTEX_SPINS_OFFSET    20
-#define __PTHREAD_MUTEX_ELISION_OFFSET  22
-#define __PTHREAD_MUTEX_LIST_OFFSET     20
+#define __PTHREAD_MUTEX_LIST_OFFSET     24