2013-10-22  Cesar Philippidis  <cesar@codesourcery.com>

	nptl/
	[BZ #15790]
	* pthread_mutexattr_gettype.c: Mask out internal references
	to PTHREAD_MUTEX_NO_ELISON_NP.

Index: nptl/pthread_mutexattr_gettype.c
===================================================================
--- nptl/pthread_mutexattr_gettype.c	(revision 422428)
+++ nptl/pthread_mutexattr_gettype.c	(working copy)
@@ -30,6 +30,10 @@ pthread_mutexattr_gettype (attr, kind)
 
   *kind = iattr->mutexkind & ~PTHREAD_MUTEXATTR_FLAG_BITS;
 
+  /* Cannot distinguish between DEFAULT and NORMAL. So any settype
+     call disables elision for now. This accounts for that. */
+  *kind &= ~PTHREAD_MUTEX_NO_ELISION_NP;
+
   return 0;
 }
 weak_alias (pthread_mutexattr_gettype, pthread_mutexattr_getkind_np)