From patchwork Mon Mar 17 12:23:18 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Newton X-Patchwork-Id: 103 Return-Path: X-Original-To: siddhesh@wilcox.dreamhost.com Delivered-To: siddhesh@wilcox.dreamhost.com Received: from homiemail-mx21.g.dreamhost.com (caibbdcaaahb.dreamhost.com [208.113.200.71]) by wilcox.dreamhost.com (Postfix) with ESMTP id 9FEC83600B0 for ; Mon, 17 Mar 2014 05:23:42 -0700 (PDT) Received: by homiemail-mx21.g.dreamhost.com (Postfix, from userid 14307373) id 4D67C1F5E232; Mon, 17 Mar 2014 05:23:42 -0700 (PDT) X-Original-To: glibc@patchwork.siddhesh.in Delivered-To: x14307373@homiemail-mx21.g.dreamhost.com Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by homiemail-mx21.g.dreamhost.com (Postfix) with ESMTPS id 21C261F5E209 for ; Mon, 17 Mar 2014 05:23:42 -0700 (PDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id; q=dns; s= default; b=d7HZBjvHUyUO2txDSvWkt+r+UgrUEv8LJeTcFD3GbdBdKobEVy8RC ufax7nYv3nssOOsVQI8+zTB2iCtQpmJb2WjfPIJgrtomAjTQVygXSDgwHcnQBZ1J Ba96P4l4az83YPadBHezONKrFUVD3DmKFX6Ayd68M2As7mRPKZOKto= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id; s=default; bh=kHsvWvMTVUg7PZ1JGB0owZwo4mw=; b=b3ZudW2/Iu4ibxH1awBmMS/Y4Fpq PGpwJVRl+Rocl3C0kbeVYGOV8LEOgnRjUlNfmMffYkHBN7eHmNugmlNYzKez9nCl DvuX/qP/uQ5vqIcRrbIefN7tA9pKh0nF91cFcIVcF/hDXBHS744xSZYw7Q7GRLZq Eqnq11W4INX6KPU= Received: (qmail 18761 invoked by alias); 17 Mar 2014 12:23:38 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 18721 invoked by uid 89); 17 Mar 2014 12:23:34 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.7 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-we0-f177.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=OvZxrTH/4IFIYDe8Zeij2llbH5AigxZxdjfi8O2x+M8=; b=gNQYZJ+nWRnFtI2bhXxG2gxFFUhJuO1SCO32K7rRfetMaSNLjqpViMw8Dl+2gJEPCq ry72MpRocCcBZQjIHXDnNQp4nwNVJXk0awIQto6vcTqj1OjAFhVue65JIgynC1uM1lFu 5x2zl01yfwA8xZPfxpTX/27/Mb4fnkrTm+Cp4MI37JAUqHUNq9mkwyqBTK8YXwJjIfBZ lfa1bCWRoGY3dfZXjCy1L+aA/P6ztJ76IwW/G9eNGUNxycV7SxVPTNsiWyMkTteisx1g 5h6l4bBMN1wOeBF487TDcLz+taXfWEbrklSpFQ1WZPPFY/zOEVjydDLkLNsWTis4lLmJ 8/KA== X-Gm-Message-State: ALoCoQm1yIjgVuQa3XaQEuSIrMdhm+ULnMdOORNsZvfsH3fPbApv0M8nc19zPI7SOgyAokWG5yue X-Received: by 10.180.12.14 with SMTP id u14mr9710794wib.0.1395059009607; Mon, 17 Mar 2014 05:23:29 -0700 (PDT) From: Will Newton To: libc-alpha@sourceware.org Subject: [PATCH 1/7] Fix __PTHREAD_MUTEX_HAVE_ELISION -Wundef warning Date: Mon, 17 Mar 2014 12:23:18 +0000 Message-Id: <1395059004-20960-1-git-send-email-will.newton@linaro.org> X-DH-Original-To: glibc@patchwork.siddhesh.in ChangeLog: 2014-03-17 Will Newton * 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