From 5f9f21e87c04233c8d917cd280c4f07208667b36 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Wed, 18 Jan 2006 08:41:47 +0000 Subject: [PATCH] [BZ #2167] * sysdeps/unix/sysv/linux/mips/bits/pthreadtypes.h (pthread_mutex_t): Follow changes for other archs. Based on patch by Jim Gifford . 2006-01-18 Andreas Jaeger [BZ #838] * sysdeps/unix/sysv/linux/mips/bits/pthreadtypes.h (pthread_mutex_t): Follow changes for other archs. Based on patch by Jim Gifford . --- nptl/ChangeLog | 7 +++++++ nptl/sysdeps/unix/sysv/linux/mips/bits/pthreadtypes.h | 17 +++++++++++++---- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 10855a4..23951bd 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,10 @@ +2006-01-18 Andreas Jaeger + + [BZ #838] + * sysdeps/unix/sysv/linux/mips/bits/pthreadtypes.h + (pthread_mutex_t): Follow changes for other archs. Based on patch + by Jim Gifford . + 2006-01-13 Richard Henderson * sysdeps/alpha/tls.h (tcbhead_t): Rename member to __private. diff --git a/nptl/sysdeps/unix/sysv/linux/mips/bits/pthreadtypes.h b/nptl/sysdeps/unix/sysv/linux/mips/bits/pthreadtypes.h index e14a487..d5e89a9 100644 --- a/nptl/sysdeps/unix/sysv/linux/mips/bits/pthreadtypes.h +++ b/nptl/sysdeps/unix/sysv/linux/mips/bits/pthreadtypes.h @@ -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 @@ typedef union type is deliberately not exposed. */ typedef union { - struct + struct __pthread_mutex_s { int __lock; unsigned int __count; @@ -70,10 +70,19 @@ typedef union /* 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_s *__next; + struct __pthread_mutex_s *__prev; +# define __PTHREAD_MUTEX_HAVE_PREV 1 +#else unsigned int __nusers; + __extension__ union + { + int __spins; + struct __pthread_mutex_s *__next; + }; #endif - int __spins; } __data; char __size[__SIZEOF_PTHREAD_MUTEX_T]; long int __align; -- 2.7.4