From: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Tue, 24 Jun 2014 17:10:07 +0000 (+0530)
Subject: Fix namespace violation in pthreadtypes.h (BZ #17084)
X-Git-Tag: glibc-2.20~248
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2307e1261e7ee784afd424a46ad08d3fbed33ba3;p=thirdparty%2Fglibc.git

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

This was causing conformtest failures on i386.
---

diff --git a/ChangeLog b/ChangeLog
index e60ef7e2370..aa98af8b163 100644
--- 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 40c4e571800..abec2196e84 100644
--- 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 7f8076b89a1..aad2e14c8de 100644
--- 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