This is the mail archive of the libc-alpha@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: [PATCH 1/7] Fix __PTHREAD_MUTEX_HAVE_ELISION -Wundef warning


On 17-03-2014 09:23, Will Newton wrote:
> ChangeLog:
>
> 2014-03-17  Will Newton  <will.newton@linaro.org>
>
> 	* nptl/sysdeps/pthread/pthread.h: Check
> 	__PTHREAD_MUTEX_HAVE_ELISION is defined before testing
> 	its value.
> ---
>  nptl/sysdeps/pthread/pthread.h | 14 +++++++++-----
>  1 file changed, 9 insertions(+), 5 deletions(-)
>
> diff --git a/nptl/sysdeps/pthread/pthread.h b/nptl/sysdeps/pthread/pthread.h
> index 1e0c5dc..142da63 100644
> --- a/nptl/sysdeps/pthread/pthread.h
> +++ b/nptl/sysdeps/pthread/pthread.h
> @@ -83,12 +83,16 @@ enum
>
>
>  /* Mutex initializers.  */
> -#if __PTHREAD_MUTEX_HAVE_ELISION == 1 /* 64bit layout.  */
> -#define __PTHREAD_SPINS 0, 0
> -#elif __PTHREAD_MUTEX_HAVE_ELISION == 2 /* 32bit layout.  */
> -#define __PTHREAD_SPINS { 0, 0 }
> +#ifdef __PTHREAD_MUTEX_HAVE_ELISION
> +# if __PTHREAD_MUTEX_HAVE_ELISION == 1 /* 64bit layout.  */
> +#  define __PTHREAD_SPINS 0, 0
> +# elif __PTHREAD_MUTEX_HAVE_ELISION == 2 /* 32bit layout.  */
> +#  define __PTHREAD_SPINS { 0, 0 }
> +# else
> +#  error "Unknown value of __PTHREAD_MUTEX_HAVE_ELISION"
> +# endif
>  #else
> -#define __PTHREAD_SPINS 0
> +# define __PTHREAD_SPINS 0
>  #endif
>
>  #ifdef __PTHREAD_MUTEX_HAVE_PREV

Hi Will, I'm ok with this patch (I did the same on ppc builds).


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]