+2014-03-17 Will Newton <will.newton@linaro.org>
+
+ * nptl/sysdeps/pthread/pthread.h: Check
+ __PTHREAD_MUTEX_HAVE_ELISION is defined before testing
+ its value.
+
2014-03-17 Siddhesh Poyarekar <siddhesh@redhat.com>
* libio/iofdopen.c (_IO_new_fdopen): Seek to end only if
/* Mutex initializers. */
-#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 }
+#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
#else
-#define __PTHREAD_SPINS 0
+# define __PTHREAD_SPINS 0
#endif
#ifdef __PTHREAD_MUTEX_HAVE_PREV