From: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Tue, 24 Jun 2014 10:42:43 +0000 (+0530)
Subject: Fix build warning in pthread_rwlock_*
X-Git-Tag: glibc-2.20~259
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=08e5862f5f087138047c757376edb1b63217d547;p=thirdparty%2Fglibc.git

Fix build warning in pthread_rwlock_*

The first argument of elision_adapt and that of ELISION_*LOCK have
different signs since __elision_rwcount is signed char * and the
argument of elision_adapt is uint8_t *.  Modified elision_adapt to
accept signed char * instead of uint8_t *.
---

diff --git a/ChangeLog b/ChangeLog
index 9b119b5e4fd..8bfdf803d66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2014-06-24  Siddhesh Poyarekar  <siddhesh@redhat.com>
 
+	* sysdeps/x86/nptl/elide.h (elision_adapt): Make first
+	argument type signed char.
+
 	* Makerules (check-abi): Dump diff of symlist if the test
 	fails.
 
diff --git a/sysdeps/x86/nptl/elide.h b/sysdeps/x86/nptl/elide.h
index 19f27e5438f..5befa53f30a 100644
--- a/sysdeps/x86/nptl/elide.h
+++ b/sysdeps/x86/nptl/elide.h
@@ -26,7 +26,7 @@
 /* Adapt elision with ADAPT_COUNT and STATUS and decide retries.  */
 
 static inline bool
-elision_adapt(uint8_t *adapt_count, unsigned int status)
+elision_adapt(signed char *adapt_count, unsigned int status)
 {
   if (status & _XABORT_RETRY)
     return false;