|
 |
25845f |
commit 01f8eac224421f07f28f91cc05db7459ea433ea4
|
|
|
25845f |
Author: Adhemerval Zanella <azanella@linux.vnet.ibm.com>
|
|
|
25845f |
Date: Wed Mar 26 13:48:00 2014 -0500
|
|
|
25845f |
|
|
|
25845f |
Move __PTHREAD_SPINS definition to architecture specific header
|
|
|
25845f |
|
|
|
25845f |
This patch moves the __PTHREAD_SPINS definition to arch specific header
|
|
|
25845f |
since pthread_mutex_t layout is also arch specific. This leads to no
|
|
|
25845f |
need to defining __PTHREAD_MUTEX_HAVE_ELISION and thus removing of the
|
|
|
25845f |
undefined compiler warning.
|
|
|
25845f |
|
|
|
25845f |
Conflicts:
|
|
|
25845f |
nptl/sysdeps/unix/sysv/linux/x86/bits/pthreadtypes.h
|
|
|
25845f |
(Textual conflict due to glibc-rh841653-3.patch.)
|
|
|
25845f |
sysdeps/unix/sysv/linux/microblaze/nptl/bits/pthreadtypes.h
|
|
|
25845f |
(No microblaze port in our tree; file removed manually.)
|
|
|
25845f |
|
|
|
25845f |
In addition, nptl/sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h
|
|
|
25845f |
was adjusted for the separate HTM backport in glibc-rh731835-0.patch.
|
|
|
25845f |
|
|
|
25845f |
diff --git a/nptl/sysdeps/pthread/pthread.h b/nptl/sysdeps/pthread/pthread.h
|
|
|
25845f |
index 1242a9c1fd12ed3e..82994942710f3b02 100644
|
|
|
25845f |
--- a/nptl/sysdeps/pthread/pthread.h
|
|
|
25845f |
+++ b/nptl/sysdeps/pthread/pthread.h
|
|
|
25845f |
@@ -82,15 +82,6 @@ enum
|
|
|
25845f |
#endif
|
|
|
25845f |
|
|
|
25845f |
|
|
|
25845f |
-/* Mutex initializers. */
|
|
|
25845f |
-#if __PTHREAD_MUTEX_HAVE_ELISION == 1 /* 64bit layout. */
|
|
|
25845f |
-#define __PTHREAD_SPINS 0, 0
|
|
|
25845f |
-#elif __PTHREAD_MUTEX_HAVE_ELISION == 2 /* 32bit layout. */
|
|
|
25845f |
-#define __PTHREAD_SPINS { 0, 0 }
|
|
|
25845f |
-#else
|
|
|
25845f |
-#define __PTHREAD_SPINS 0
|
|
|
25845f |
-#endif
|
|
|
25845f |
-
|
|
|
25845f |
#ifdef __PTHREAD_MUTEX_HAVE_PREV
|
|
|
25845f |
# define PTHREAD_MUTEX_INITIALIZER \
|
|
|
25845f |
{ { 0, 0, 0, 0, 0, __PTHREAD_SPINS, { 0, 0 } } }
|
|
|
25845f |
diff --git a/nptl/sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h b/nptl/sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h
|
|
|
25845f |
index 1a8f45aa5286f919..64752ef8f9199f73 100644
|
|
|
25845f |
--- a/nptl/sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h
|
|
|
25845f |
+++ b/nptl/sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h
|
|
|
25845f |
@@ -95,7 +95,6 @@ typedef union
|
|
|
25845f |
__pthread_list_t __list;
|
|
|
25845f |
# define __PTHREAD_MUTEX_HAVE_PREV 1
|
|
|
25845f |
# define __PTHREAD_SPINS 0, 0
|
|
|
25845f |
-# define __PTHREAD_MUTEX_HAVE_ELISION 1
|
|
|
25845f |
#else
|
|
|
25845f |
unsigned int __nusers;
|
|
|
25845f |
__extension__ union
|
|
|
25845f |
@@ -107,7 +106,6 @@ typedef union
|
|
|
25845f |
# define __spins __elision_data.__espins
|
|
|
25845f |
# define __elision __elision_data.__elision
|
|
|
25845f |
# define __PTHREAD_SPINS { 0, 0 }
|
|
|
25845f |
-# define __PTHREAD_MUTEX_HAVE_ELISION 2
|
|
|
25845f |
} __elision_data;
|
|
|
25845f |
__pthread_slist_t __list;
|
|
|
25845f |
};
|
|
|
25845f |
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/bits/pthreadtypes.h b/nptl/sysdeps/unix/sysv/linux/s390/bits/pthreadtypes.h
|
|
|
25845f |
index 2f80fa9b69826d8b..dc4ee2ed55f10854 100644
|
|
|
25845f |
--- a/nptl/sysdeps/unix/sysv/linux/s390/bits/pthreadtypes.h
|
|
|
25845f |
+++ b/nptl/sysdeps/unix/sysv/linux/s390/bits/pthreadtypes.h
|
|
|
25845f |
@@ -105,6 +105,9 @@ typedef union
|
|
|
25845f |
long int __align;
|
|
|
25845f |
} pthread_mutex_t;
|
|
|
25845f |
|
|
|
25845f |
+/* Mutex __spins initializer used by PTHREAD_MUTEX_INITIALIZER. */
|
|
|
25845f |
+#define __PTHREAD_SPINS 0
|
|
|
25845f |
+
|
|
|
25845f |
typedef union
|
|
|
25845f |
{
|
|
|
25845f |
char __size[__SIZEOF_PTHREAD_MUTEXATTR_T];
|
|
|
25845f |
diff --git a/nptl/sysdeps/unix/sysv/linux/sh/bits/pthreadtypes.h b/nptl/sysdeps/unix/sysv/linux/sh/bits/pthreadtypes.h
|
|
|
25845f |
index ce8bd713b4adc3ce..3b73352389c1ed5b 100644
|
|
|
25845f |
--- a/nptl/sysdeps/unix/sysv/linux/sh/bits/pthreadtypes.h
|
|
|
25845f |
+++ b/nptl/sysdeps/unix/sysv/linux/sh/bits/pthreadtypes.h
|
|
|
25845f |
@@ -77,6 +77,9 @@ typedef union
|
|
|
25845f |
long int __align;
|
|
|
25845f |
} pthread_mutex_t;
|
|
|
25845f |
|
|
|
25845f |
+/* Mutex __spins initializer used by PTHREAD_MUTEX_INITIALIZER. */
|
|
|
25845f |
+#define __PTHREAD_SPINS 0
|
|
|
25845f |
+
|
|
|
25845f |
typedef union
|
|
|
25845f |
{
|
|
|
25845f |
char __size[__SIZEOF_PTHREAD_MUTEXATTR_T];
|
|
|
25845f |
diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/bits/pthreadtypes.h b/nptl/sysdeps/unix/sysv/linux/sparc/bits/pthreadtypes.h
|
|
|
25845f |
index cc95367a61158a91..52722b8890b5b356 100644
|
|
|
25845f |
--- a/nptl/sysdeps/unix/sysv/linux/sparc/bits/pthreadtypes.h
|
|
|
25845f |
+++ b/nptl/sysdeps/unix/sysv/linux/sparc/bits/pthreadtypes.h
|
|
|
25845f |
@@ -106,6 +106,9 @@ typedef union
|
|
|
25845f |
long int __align;
|
|
|
25845f |
} pthread_mutex_t;
|
|
|
25845f |
|
|
|
25845f |
+/* Mutex __spins initializer used by PTHREAD_MUTEX_INITIALIZER. */
|
|
|
25845f |
+#define __PTHREAD_SPINS 0
|
|
|
25845f |
+
|
|
|
25845f |
typedef union
|
|
|
25845f |
{
|
|
|
25845f |
char __size[__SIZEOF_PTHREAD_MUTEXATTR_T];
|
|
|
25845f |
diff --git a/nptl/sysdeps/unix/sysv/linux/x86/bits/pthreadtypes.h b/nptl/sysdeps/unix/sysv/linux/x86/bits/pthreadtypes.h
|
|
|
25845f |
index 2704fd8b75eef76b..9d0f304223929ca5 100644
|
|
|
25845f |
--- a/nptl/sysdeps/unix/sysv/linux/x86/bits/pthreadtypes.h
|
|
|
25845f |
+++ b/nptl/sysdeps/unix/sysv/linux/x86/bits/pthreadtypes.h
|
|
|
25845f |
@@ -105,7 +105,8 @@ typedef union
|
|
|
25845f |
short __elision;
|
|
|
25845f |
__pthread_list_t __list;
|
|
|
25845f |
# define __PTHREAD_MUTEX_HAVE_PREV 1
|
|
|
25845f |
-# define __PTHREAD_MUTEX_HAVE_ELISION 1
|
|
|
25845f |
+/* Mutex __spins initializer used by PTHREAD_MUTEX_INITIALIZER. */
|
|
|
25845f |
+# define __PTHREAD_SPINS 0, 0
|
|
|
25845f |
#else
|
|
|
25845f |
unsigned int __nusers;
|
|
|
25845f |
__extension__ union
|
|
|
25845f |
@@ -116,7 +117,7 @@ typedef union
|
|
|
25845f |
short __elision;
|
|
|
25845f |
# define __spins __elision_data.__espins
|
|
|
25845f |
# define __elision __elision_data.__elision
|
|
|
25845f |
-# define __PTHREAD_MUTEX_HAVE_ELISION 2
|
|
|
25845f |
+# define __PTHREAD_SPINS { 0, 0 }
|
|
|
25845f |
} __elision_data;
|
|
|
25845f |
__pthread_slist_t __list;
|
|
|
25845f |
};
|
|
|
25845f |
diff --git a/ports/sysdeps/unix/sysv/linux/hppa/nptl/bits/pthreadtypes.h b/ports/sysdeps/unix/sysv/linux/hppa/nptl/bits/pthreadtypes.h
|
|
|
25845f |
index caa9f37999dde798..bd8d41493609dcdf 100644
|
|
|
25845f |
--- a/ports/sysdeps/unix/sysv/linux/hppa/nptl/bits/pthreadtypes.h
|
|
|
25845f |
+++ b/ports/sysdeps/unix/sysv/linux/hppa/nptl/bits/pthreadtypes.h
|
|
|
25845f |
@@ -94,6 +94,9 @@ typedef union
|
|
|
25845f |
long int __align;
|
|
|
25845f |
} pthread_mutex_t;
|
|
|
25845f |
|
|
|
25845f |
+/* Mutex __spins initializer used by PTHREAD_MUTEX_INITIALIZER. */
|
|
|
25845f |
+#define __PTHREAD_SPINS 0
|
|
|
25845f |
+
|
|
|
25845f |
typedef union
|
|
|
25845f |
{
|
|
|
25845f |
char __size[__SIZEOF_PTHREAD_MUTEXATTR_T];
|
|
|
25845f |
diff --git a/sysdeps/unix/sysv/linux/aarch64/nptl/bits/pthreadtypes.h b/sysdeps/unix/sysv/linux/aarch64/nptl/bits/pthreadtypes.h
|
|
|
25845f |
index eed8365c37b20953..ca71ccc5379941e5 100644
|
|
|
25845f |
--- a/sysdeps/unix/sysv/linux/aarch64/nptl/bits/pthreadtypes.h
|
|
|
25845f |
+++ b/sysdeps/unix/sysv/linux/aarch64/nptl/bits/pthreadtypes.h
|
|
|
25845f |
@@ -74,6 +74,9 @@ typedef union
|
|
|
25845f |
long int __align;
|
|
|
25845f |
} pthread_mutex_t;
|
|
|
25845f |
|
|
|
25845f |
+/* Mutex __spins initializer used by PTHREAD_MUTEX_INITIALIZER. */
|
|
|
25845f |
+#define __PTHREAD_SPINS 0
|
|
|
25845f |
+
|
|
|
25845f |
typedef union
|
|
|
25845f |
{
|
|
|
25845f |
char __size[__SIZEOF_PTHREAD_MUTEXATTR_T];
|
|
|
25845f |
diff --git a/sysdeps/unix/sysv/linux/alpha/nptl/bits/pthreadtypes.h b/sysdeps/unix/sysv/linux/alpha/nptl/bits/pthreadtypes.h
|
|
|
25845f |
index 98479495a884da2b..fe1afc32049c70e5 100644
|
|
|
25845f |
--- a/sysdeps/unix/sysv/linux/alpha/nptl/bits/pthreadtypes.h
|
|
|
25845f |
+++ b/sysdeps/unix/sysv/linux/alpha/nptl/bits/pthreadtypes.h
|
|
|
25845f |
@@ -73,6 +73,9 @@ typedef union
|
|
|
25845f |
long int __align;
|
|
|
25845f |
} pthread_mutex_t;
|
|
|
25845f |
|
|
|
25845f |
+/* Mutex __spins initializer used by PTHREAD_MUTEX_INITIALIZER. */
|
|
|
25845f |
+#define __PTHREAD_SPINS 0
|
|
|
25845f |
+
|
|
|
25845f |
typedef union
|
|
|
25845f |
{
|
|
|
25845f |
char __size[__SIZEOF_PTHREAD_MUTEXATTR_T];
|
|
|
25845f |
diff --git a/sysdeps/unix/sysv/linux/arm/nptl/bits/pthreadtypes.h b/sysdeps/unix/sysv/linux/arm/nptl/bits/pthreadtypes.h
|
|
|
25845f |
index 5e4402088c2a5be1..0e3334fd29723b6a 100644
|
|
|
25845f |
--- a/sysdeps/unix/sysv/linux/arm/nptl/bits/pthreadtypes.h
|
|
|
25845f |
+++ b/sysdeps/unix/sysv/linux/arm/nptl/bits/pthreadtypes.h
|
|
|
25845f |
@@ -77,6 +77,9 @@ typedef union
|
|
|
25845f |
long int __align;
|
|
|
25845f |
} pthread_mutex_t;
|
|
|
25845f |
|
|
|
25845f |
+/* Mutex __spins initializer used by PTHREAD_MUTEX_INITIALIZER. */
|
|
|
25845f |
+#define __PTHREAD_SPINS 0
|
|
|
25845f |
+
|
|
|
25845f |
typedef union
|
|
|
25845f |
{
|
|
|
25845f |
char __size[__SIZEOF_PTHREAD_MUTEXATTR_T];
|
|
|
25845f |
diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/bits/pthreadtypes.h b/sysdeps/unix/sysv/linux/ia64/nptl/bits/pthreadtypes.h
|
|
|
25845f |
index 5b30713069a439d7..5bf9ff4f77c1b574 100644
|
|
|
25845f |
--- a/sysdeps/unix/sysv/linux/ia64/nptl/bits/pthreadtypes.h
|
|
|
25845f |
+++ b/sysdeps/unix/sysv/linux/ia64/nptl/bits/pthreadtypes.h
|
|
|
25845f |
@@ -74,6 +74,9 @@ typedef union
|
|
|
25845f |
long int __align;
|
|
|
25845f |
} pthread_mutex_t;
|
|
|
25845f |
|
|
|
25845f |
+/* Mutex __spins initializer used by PTHREAD_MUTEX_INITIALIZER. */
|
|
|
25845f |
+#define __PTHREAD_SPINS 0
|
|
|
25845f |
+
|
|
|
25845f |
typedef union
|
|
|
25845f |
{
|
|
|
25845f |
char __size[__SIZEOF_PTHREAD_MUTEXATTR_T];
|
|
|
25845f |
diff --git a/sysdeps/unix/sysv/linux/m68k/nptl/bits/pthreadtypes.h b/sysdeps/unix/sysv/linux/m68k/nptl/bits/pthreadtypes.h
|
|
|
25845f |
index 7bcec6a011dd6183..af9c0de441e44ede 100644
|
|
|
25845f |
--- a/sysdeps/unix/sysv/linux/m68k/nptl/bits/pthreadtypes.h
|
|
|
25845f |
+++ b/sysdeps/unix/sysv/linux/m68k/nptl/bits/pthreadtypes.h
|
|
|
25845f |
@@ -77,6 +77,9 @@ typedef union
|
|
|
25845f |
long int __align;
|
|
|
25845f |
} pthread_mutex_t;
|
|
|
25845f |
|
|
|
25845f |
+/* Mutex __spins initializer used by PTHREAD_MUTEX_INITIALIZER. */
|
|
|
25845f |
+#define __PTHREAD_SPINS 0
|
|
|
25845f |
+
|
|
|
25845f |
typedef union
|
|
|
25845f |
{
|
|
|
25845f |
char __size[__SIZEOF_PTHREAD_MUTEXATTR_T];
|
|
|
25845f |
diff --git a/sysdeps/unix/sysv/linux/mips/nptl/bits/pthreadtypes.h b/sysdeps/unix/sysv/linux/mips/nptl/bits/pthreadtypes.h
|
|
|
25845f |
index 2fda0d30cd909d67..e133abc9afbe60b2 100644
|
|
|
25845f |
--- a/sysdeps/unix/sysv/linux/mips/nptl/bits/pthreadtypes.h
|
|
|
25845f |
+++ b/sysdeps/unix/sysv/linux/mips/nptl/bits/pthreadtypes.h
|
|
|
25845f |
@@ -106,6 +106,9 @@ typedef union
|
|
|
25845f |
long int __align;
|
|
|
25845f |
} pthread_mutex_t;
|
|
|
25845f |
|
|
|
25845f |
+/* Mutex __spins initializer used by PTHREAD_MUTEX_INITIALIZER. */
|
|
|
25845f |
+#define __PTHREAD_SPINS 0
|
|
|
25845f |
+
|
|
|
25845f |
typedef union
|
|
|
25845f |
{
|
|
|
25845f |
char __size[__SIZEOF_PTHREAD_MUTEXATTR_T];
|
|
|
25845f |
diff --git a/sysdeps/unix/sysv/linux/tile/nptl/bits/pthreadtypes.h b/sysdeps/unix/sysv/linux/tile/nptl/bits/pthreadtypes.h
|
|
|
25845f |
index ac51e3b93c84c63b..4a92dd2a279fa90d 100644
|
|
|
25845f |
--- a/sysdeps/unix/sysv/linux/tile/nptl/bits/pthreadtypes.h
|
|
|
25845f |
+++ b/sysdeps/unix/sysv/linux/tile/nptl/bits/pthreadtypes.h
|
|
|
25845f |
@@ -112,6 +112,9 @@ typedef union
|
|
|
25845f |
int __align;
|
|
|
25845f |
} pthread_mutexattr_t;
|
|
|
25845f |
|
|
|
25845f |
+/* Mutex __spins initializer used by PTHREAD_MUTEX_INITIALIZER. */
|
|
|
25845f |
+#define __PTHREAD_SPINS 0
|
|
|
25845f |
+
|
|
|
25845f |
|
|
|
25845f |
/* Data structure for conditional variable handling. The structure of
|
|
|
25845f |
the attribute type is not exposed on purpose. */
|