From patchwork Sat Jan 24 00:22:43 2015
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: "H.J. Lu" <hjl.tools@gmail.com>
X-Patchwork-Id: 4787
Received: (qmail 11860 invoked by alias); 24 Jan 2015 00:22:47 -0000
Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <libc-alpha.sourceware.org>
List-Unsubscribe: <mailto:libc-alpha-unsubscribe-##L=##H@sourceware.org>
List-Subscribe: <mailto:libc-alpha-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/libc-alpha/>
List-Post: <mailto:libc-alpha@sourceware.org>
List-Help: <mailto:libc-alpha-help@sourceware.org>,
	<http://sourceware.org/ml/#faqs>
Sender: libc-alpha-owner@sourceware.org
Delivered-To: mailing list libc-alpha@sourceware.org
Received: (qmail 11851 invoked by uid 89); 24 Jan 2015 00:22:46 -0000
Authentication-Results: sourceware.org; auth=none
X-Spam-SWARE-Status: No, score=-2.4 required=5.0 tests=AWL, BAYES_00,
	FREEMAIL_FROM, RCVD_IN_DNSWL_LOW,
	SPF_PASS autolearn=ham version=3.3.2
X-HELO: mail-oi0-f43.google.com
MIME-Version: 1.0
X-Received: by 10.60.156.196 with SMTP id wg4mr6199556oeb.11.1422058963167;
	Fri, 23 Jan 2015 16:22:43 -0800 (PST)
In-Reply-To: 
 <CAMe9rOriCBS4++Lm_RGyjPkgPuO2zJ_JM+OJRWFWZp1CReapMw@mail.gmail.com>
References: <54C2BDD7.7000304@redhat.com>
	<CAMe9rOpYHheBKOS5-uFqSSaQWv1O1vtpSUBpZkHXsoUtL43LZw@mail.gmail.com>
	<54C2D593.4060503@ezchip.com>
	<CAMe9rOriCBS4++Lm_RGyjPkgPuO2zJ_JM+OJRWFWZp1CReapMw@mail.gmail.com>
Date: Fri, 23 Jan 2015 16:22:43 -0800
Message-ID: 
 <CAMe9rOpiTj2PTrA3xgFunhEtOjfmqAxNvpUnDzvd-LNeViWSiA@mail.gmail.com>
Subject: Re: glibc 2.21 - Machine maintainers, please test your machines.
From: "H.J. Lu" <hjl.tools@gmail.com>
To: Chris Metcalf <cmetcalf@ezchip.com>
Cc: "Carlos O'Donell" <carlos@redhat.com>,
	GNU C Library <libc-alpha@sourceware.org>,
	David Miller <davem@davemloft.net>, Richard Henderson <rth@redhat.com>,
	Mike Frysinger <vapier@gentoo.org>, Andreas Schwab <schwab@suse.de>,
	"Joseph S. Myers" <joseph@codesourcery.com>,
	Kaz Kojima <kkojima@rr.iij4u.or.jp>,
	Thomas Schwinge <thomas@codesourcery.com>,
	Marcus Shawcroft <marcus.shawcroft@linaro.org>,
	David Holsgrove <david.holsgrove@xilinx.com>,
	Chung-Lin Tang <chunglin_tang@mentor.com>,
	Adhemerval Zanella <azanella@linux.vnet.ibm.com>,
	Andreas Krebbel <krebbel@linux.vnet.ibm.com>

On Fri, Jan 23, 2015 at 4:11 PM, H.J. Lu <hjl.tools@gmail.com> wrote:
> On Fri, Jan 23, 2015 at 3:13 PM, Chris Metcalf <cmetcalf@ezchip.com> wrote:
>> On 1/23/2015 5:03 PM, H.J. Lu wrote:
>>>
>>> On Fri, Jan 23, 2015 at 1:32 PM, Carlos O'Donell <carlos@redhat.com>
>>> wrote:
>>>>
>>>> Dear Machine Maintainers,
>>>>
>>>> Please start testing your machines against glibc
>>>> master.
>>>>
>>>> Please update the glibc 2.21 release page with your
>>>> testing results:
>>>>
>>>> https://sourceware.org/glibc/wiki/Release/2.21
>>>>
>>>> If nobody objects I want to cut the release as soon
>>>
>>> x32 failed to build:
>>>
>>> https://sourceware.org/bugzilla/show_bug.cgi?id=17870
>>
>>
>> tilegx32 failed to build with the same symptoms.
>>
>
> I checked in my fix.  It should build for you now.
>

I checked in another fix.

diff --git a/ChangeLog b/ChangeLog
index a59266f..306341c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@
  with uint64_t.
  * nptl/sem_waitcommon.c (__sem_wait_cleanup): Replace 1UL with
  (uint64_t) 1.
+ (__new_sem_wait_fast): Replace unsigned long with uint64_t.
  (__new_sem_wait_slow): Replace unsigned long int with uint64_t.
  Replace 1UL with (uint64_t) 1.
  * sysdeps/nptl/internaltypes.h (new_sem): Replace unsigned long
diff --git a/nptl/sem_waitcommon.c b/nptl/sem_waitcommon.c
index c60daa3..311e511 100644
--- a/nptl/sem_waitcommon.c
+++ b/nptl/sem_waitcommon.c
@@ -228,7 +228,7 @@ __new_sem_wait_fast (struct new_sem *sem, int
definitive_result)
      and the failure path of the CAS.  If the weak CAS fails and we need a
      definitive result, retry.  */
 #if __HAVE_64B_ATOMICS
-  unsigned long d = atomic_load_relaxed (&sem->data);
+  uint64_t d = atomic_load_relaxed (&sem->data);
   do
     {