aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSiddhesh Poyarekar <siddhesh@redhat.com>2014-06-24 16:12:43 +0530
committerSiddhesh Poyarekar <siddhesh@redhat.com>2014-06-24 16:12:43 +0530
commit08e5862f5f087138047c757376edb1b63217d547 (patch)
tree01f19fa018bbea57b891d0783d9af7e2cb0fbaa2
parent0813022c7993dfa1379c533aeaa03d9257911a96 (diff)
downloadglibc-08e5862f5f087138047c757376edb1b63217d547.tar
glibc-08e5862f5f087138047c757376edb1b63217d547.tar.gz
glibc-08e5862f5f087138047c757376edb1b63217d547.tar.bz2
glibc-08e5862f5f087138047c757376edb1b63217d547.zip
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 *.
-rw-r--r--ChangeLog3
-rw-r--r--sysdeps/x86/nptl/elide.h2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 9b119b5e4f..8bfdf803d6 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 19f27e5438..5befa53f30 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;