From: Joseph Myers <joseph@codesourcery.com>
Date: Wed, 26 Nov 2014 16:07:39 +0000 (+0000)
Subject: Fix nptl/tst-cancel-self-cancelstate.c warning.
X-Git-Tag: glibc-2.21~320
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=59ef17152b1ad9a4c4d618ec085586e3e14f6e94;p=thirdparty%2Fglibc.git

Fix nptl/tst-cancel-self-cancelstate.c warning.

This patch fixes "../sysdeps/nptl/pthread.h:670:26: warning:
initialization discards 'volatile' qualifier from pointer target type"
arising when building nptl/tst-cancel-self-cancelstate.c.  The problem
is passing a volatile int * to a macro expecting void *; the patch
adds an explicit cast.

Tested for x86_64.

	* nptl/tst-cancel-self-cancelstate.c (do_test): Cast argument of
	pthread_cleanup_push to void *.
---

diff --git a/ChangeLog b/ChangeLog
index f43cb09c9f2..0797a15123b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2014-11-26  Joseph Myers  <joseph@codesourcery.com>
 
+	* nptl/tst-cancel-self-cancelstate.c (do_test): Cast argument of
+	pthread_cleanup_push to void *.
+
 	* sysdeps/unix/sysv/linux/arm/libc-do-syscall.S (_FORTIFY_SOURCE):
 	Undefine.
 
diff --git a/nptl/tst-cancel-self-cancelstate.c b/nptl/tst-cancel-self-cancelstate.c
index 3dce967e8f4..0defd0b425e 100644
--- a/nptl/tst-cancel-self-cancelstate.c
+++ b/nptl/tst-cancel-self-cancelstate.c
@@ -29,7 +29,7 @@ do_test (void)
   int ret = 0;
   volatile int should_fail = 1;
 
-  pthread_cleanup_push (cleanup, &should_fail);
+  pthread_cleanup_push (cleanup, (void *) &should_fail);
 
   if ((ret = pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, NULL)) != 0)
     {