r1333 - in trunk: . glibc

jim at linuxfromscratch.org jim at linuxfromscratch.org
Mon Jan 9 21:18:49 PST 2006


Author: jim
Date: 2006-01-09 22:18:48 -0700 (Mon, 09 Jan 2006)
New Revision: 1333

Added:
   trunk/glibc/glibc-20060109-pthreadtypes_fix-1.patch
Modified:
   trunk/
Log:
 r1655 at server:  jim | 2006-01-09 21:18:32 -0800
 Added: glibc-20060109-pthreadtypes_fix-1.patch



Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - cc2644d5-6cf8-0310-b111-c40428001e49:/patches:1652
   + cc2644d5-6cf8-0310-b111-c40428001e49:/patches:1655

Added: trunk/glibc/glibc-20060109-pthreadtypes_fix-1.patch
===================================================================
--- trunk/glibc/glibc-20060109-pthreadtypes_fix-1.patch	2006-01-09 23:21:14 UTC (rev 1332)
+++ trunk/glibc/glibc-20060109-pthreadtypes_fix-1.patch	2006-01-10 05:18:48 UTC (rev 1333)
@@ -0,0 +1,139 @@
+Submitted By: Jim Gifford (patches at jg555 dot com)
+Date: 2006-01-09
+Initial Package Version: Snapshot
+Origin: Glibc CVS and Jim Gifford
+Upstream Status: Already Applied
+Description: Fixed pthreadtypes for 20060109 snapshot of glibc
+ 
+diff -Naur glibc-20060109.orig/nptl/sysdeps/unix/sysv/linux/alpha/bits/pthreadtypes.h glibc-20060109/nptl/sysdeps/unix/sysv/linux/alpha/bits/pthreadtypes.h
+--- glibc-20060109.orig/nptl/sysdeps/unix/sysv/linux/alpha/bits/pthreadtypes.h	2005-12-27 15:08:35.000000000 +0000
++++ glibc-20060109/nptl/sysdeps/unix/sysv/linux/alpha/bits/pthreadtypes.h	2006-01-10 04:38:55.000000000 +0000
+@@ -1,5 +1,5 @@
+ /* Machine-specific pthread type layouts.  Alpha version.
+-   Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
++   Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -45,9 +45,9 @@
+ 
+ /* Data structures for mutex handling.  The structure of the attribute
+    type is deliberately not exposed.  */
+-typedef union __pthread_mutex_u
++typedef union
+ {
+-  struct
++  struct __pthread_mutex_s
+   {
+     int __lock;
+     unsigned int __count;
+@@ -57,8 +57,8 @@
+        binary compatibility.  */
+     int __kind;
+     int __spins;
+-    union __pthread_mutex_u *__next;
+-    union __pthread_mutex_u *__prev;
++    struct __pthread_mutex_s *__next;
++    struct __pthread_mutex_s *__prev;
+ #define __PTHREAD_MUTEX_HAVE_PREV	1
+   } __data;
+   char __size[__SIZEOF_PTHREAD_MUTEX_T];
+diff -Naur glibc-20060109.orig/nptl/sysdeps/unix/sysv/linux/mips/bits/pthreadtypes.h glibc-20060109/nptl/sysdeps/unix/sysv/linux/mips/bits/pthreadtypes.h
+--- glibc-20060109.orig/nptl/sysdeps/unix/sysv/linux/mips/bits/pthreadtypes.h	2005-03-29 19:56:26.000000000 +0000
++++ glibc-20060109/nptl/sysdeps/unix/sysv/linux/mips/bits/pthreadtypes.h	2006-01-10 05:15:57.000000000 +0000
+@@ -1,5 +1,5 @@
+ /* Machine-specific pthread type layouts.  MIPS version.
+-   Copyright (C) 2005 Free Software Foundation, Inc.
++   Copyright (C) 2005 2006 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -59,7 +59,7 @@
+    type is deliberately not exposed.  */
+ typedef union
+ {
+-  struct
++  struct  __pthread_mutex_s
+   {
+     int __lock;
+     unsigned int __count;
+@@ -70,10 +70,19 @@
+     /* KIND must stay at this position in the structure to maintain
+        binary compatibility.  */
+     int __kind;
+-#if _MIPS_SIM != _ABI64
++#if _MIPS_SIM == _ABI64
++    int __spins;
++    struct __pthread_mutex_u *__next;
++    struct __pthread_mutex_u *__prev;
++# define __PTHREAD_MUTEX_HAVE_PREV      1
++#else
+     unsigned int __nusers;
++    union
++    {
++      int __spins;
++      struct __pthread_mutex_u *__next;
++    };
+ #endif
+-    int __spins;
+   } __data;
+   char __size[__SIZEOF_PTHREAD_MUTEX_T];
+   long int __align;
+diff -Naur glibc-20060109.orig/nptl/sysdeps/unix/sysv/linux/sh/bits/pthreadtypes.h glibc-20060109/nptl/sysdeps/unix/sysv/linux/sh/bits/pthreadtypes.h
+--- glibc-20060109.orig/nptl/sysdeps/unix/sysv/linux/sh/bits/pthreadtypes.h	2005-12-27 15:08:35.000000000 +0000
++++ glibc-20060109/nptl/sysdeps/unix/sysv/linux/sh/bits/pthreadtypes.h	2006-01-10 04:38:55.000000000 +0000
+@@ -46,9 +46,9 @@
+ 
+ /* Data structures for mutex handling.  The structure of the attribute
+    type is not exposed on purpose.  */
+-typedef union __pthread_mutex_u
++typedef union
+ {
+-  struct
++  struct __pthread_mutex_s
+   {
+     int __lock;
+     unsigned int __count;
+@@ -60,7 +60,7 @@
+     union
+     {
+       int __spins;
+-      union __pthread_mutex_u *__next;
++      struct __pthread_mutex_s *__next;
+     };
+   } __data;
+   char __size[__SIZEOF_PTHREAD_MUTEX_T];
+diff -Naur glibc-20060109.orig/nptl/sysdeps/unix/sysv/linux/sparc/bits/pthreadtypes.h glibc-20060109/nptl/sysdeps/unix/sysv/linux/sparc/bits/pthreadtypes.h
+--- glibc-20060109.orig/nptl/sysdeps/unix/sysv/linux/sparc/bits/pthreadtypes.h	2005-12-27 15:08:35.000000000 +0000
++++ glibc-20060109/nptl/sysdeps/unix/sysv/linux/sparc/bits/pthreadtypes.h	2006-01-10 04:41:09.000000000 +0000
+@@ -60,9 +60,9 @@
+ 
+ /* Data structures for mutex handling.  The structure of the attribute
+    type is deliberately not exposed.  */
+-typedef union __pthread_mutex_u
++typedef union
+ {
+-  struct
++  struct __pthread_mutex_s
+   {
+     int __lock;
+     unsigned int __count;
+@@ -75,15 +75,15 @@
+     int __kind;
+ #if __WORDSIZE == 64
+     int __spins;
+-    union __pthread_mutex_u *__next;
+-    union __pthread_mutex_u *__prev;
++    struct __pthread_mutex_u *__next;
++    struct __pthread_mutex_u *__prev;
+ # define __PTHREAD_MUTEX_HAVE_PREV	1
+ #else
+     unsigned int __nusers;
+     union
+     {
+       int __spins;
+-      union __pthread_mutex_u *__next;
++      struct __pthread_mutex_u *__next;
+     };
+ #endif
+   } __data;




More information about the patches mailing list