Fix namespace violation in pthreadtypes.h (BZ #17084)

This was causing conformtest failures on i386.

diff --git a/ChangeLog b/ChangeLog
index e60ef7e23704dd66b056f89c41e3a4e6639d790e..aa98af8b163f6b96a0ee8b3ea2ec6b69fdd8de90 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-06-24  Siddhesh Poyarekar  <siddhesh@redhat.com>
+
+       [BZ #17084]
+       * sysdeps/x86/nptl/bits/pthreadtypes.h (pthread_mutex_t):
+       Rename member __data.d to __data.__elision_data.
+
 2014-06-24  Wilco  <wdijkstr@arm.com>
 
        * NEWS: Add 16918 to fixed bug list.

diff --git a/NEWS b/NEWS
index 40c4e571800b5527229f88846e48a917fc27be75..abec2196e84ef7dd6d04889ef997167ab0159202 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -21,7 +21,7 @@ Version 2.20
   16912, 16915, 16916, 16917, 16918, 16922, 16927, 16928, 16932, 16943,
   16958, 16965, 16966, 16967, 16977, 16978, 16984, 16990, 16996, 17009,
   17022, 17031, 17042, 17048, 17050, 17058, 17061, 17062, 17069, 17075,
-  17079.
+  17079, 17084.
 
 * Optimized strchr implementation for AArch64.  Contributed by ARM Ltd.
 

diff --git a/sysdeps/x86/nptl/bits/pthreadtypes.h b/sysdeps/x86/nptl/bits/pthreadtypes.h
index 7f8076b89a176929d7f68f865ff462c85eba2039..aad2e14c8de932fb286785a0f058e08c4aca34e9 100644 (file)
--- a/sysdeps/x86/nptl/bits/pthreadtypes.h
+++ b/sysdeps/x86/nptl/bits/pthreadtypes.h
@@ -115,10 +115,10 @@ typedef union
       {
        short __espins;
        short __elision;
-# define __spins d.__espins
-# define __elision d.__elision
+# define __spins __elision_data.__espins
+# define __elision __elision_data.__elision
 # define __PTHREAD_SPINS         { 0, 0 }
-      } d;
+      } __elision_data;
       __pthread_slist_t __list;
     };
 #endif