about summary refs log tree commit diff
diff options
context:
space:
mode:
authorWill Newton <will.newton@linaro.org>2014-03-17 20:40:33 +0000
committerWill Newton <will.newton@linaro.org>2014-03-17 20:40:33 +0000
commit04ec140a2e250a616794285e19d481cf3fa4e790 (patch)
treeb3702865ea0186d3eb1cbd71a943cc77dc355b67
parent7579d8d5cbe81f1eb8e99c5956ed5c9ff4006d4e (diff)
downloadglibc-04ec140a2e250a616794285e19d481cf3fa4e790.tar.gz
glibc-04ec140a2e250a616794285e19d481cf3fa4e790.tar.xz
glibc-04ec140a2e250a616794285e19d481cf3fa4e790.zip
Revert "Fix __PTHREAD_MUTEX_HAVE_ELISION -Wundef warning"
This reverts commit 788bba368c2eaf8aa3fd2ca18d269395d6bc8afb.
-rw-r--r--ChangeLog3
-rw-r--r--nptl/sysdeps/pthread/pthread.h14
2 files changed, 8 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 77c55d5cde..d6d30e9754 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2014-03-17  Will Newton  <will.newton@linaro.org>
 
+	* nptl/sysdeps/pthread/pthread.h: Revert previous
+	change.
+
 	* sysdeps/generic/ldsodefs.h: Revert previous
 	change.
 
diff --git a/nptl/sysdeps/pthread/pthread.h b/nptl/sysdeps/pthread/pthread.h
index 142da639e4..1e0c5dc937 100644
--- a/nptl/sysdeps/pthread/pthread.h
+++ b/nptl/sysdeps/pthread/pthread.h
@@ -83,16 +83,12 @@ enum
 
 
 /* Mutex initializers.  */
-#ifdef __PTHREAD_MUTEX_HAVE_ELISION
-# if __PTHREAD_MUTEX_HAVE_ELISION == 1 /* 64bit layout.  */
-#  define __PTHREAD_SPINS 0, 0
-# elif __PTHREAD_MUTEX_HAVE_ELISION == 2 /* 32bit layout.  */
-#  define __PTHREAD_SPINS { 0, 0 }
-# else
-#  error "Unknown value of __PTHREAD_MUTEX_HAVE_ELISION"
-# endif
+#if __PTHREAD_MUTEX_HAVE_ELISION == 1 /* 64bit layout.  */
+#define __PTHREAD_SPINS 0, 0
+#elif __PTHREAD_MUTEX_HAVE_ELISION == 2 /* 32bit layout.  */
+#define __PTHREAD_SPINS { 0, 0 }
 #else
-# define __PTHREAD_SPINS 0
+#define __PTHREAD_SPINS 0
 #endif
 
 #ifdef __PTHREAD_MUTEX_HAVE_PREV