GNU C Library master sources branch master updated. glibc-2.20-342-gf82c43a

[kkojima at sourceware dot org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  f82c43af8aebc5a270c8be06055ee5a38063bac3 (commit)
      from  fc00cf7bcdf3367da105d86185411f7b7eced239 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=f82c43af8aebc5a270c8be06055ee5a38063bac3

commit f82c43af8aebc5a270c8be06055ee5a38063bac3
Author: Kaz Kojima <kkojima@rr.iij4u.or.jp>
Date:   Fri Dec 12 08:07:35 2014 +0900

    * Fix SH specific compiler warnings which are for integer-pointer
      type conversions without cast.

diff --git a/ChangeLog b/ChangeLog
index 7630e80..fad966f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2014-12-11  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
+
+	* sysdeps/sh/jmpbuf_unwind.h (_jmpbuf_sp): Declare SP as void
+	pointer and cast to uintptr_t.
+	* sysdeps/sh/nptl/tls.h (TLS_INIT_TP): Use NULL instead of 0.
+	* sysdeps/unix/sysv/linux/sh/lowlevellock.h (lll_futex_timed_wait):
+	Add cast to avoid warning.
+	* sysdeps/unix/sysv/linux/sh/register-dump.h: Use 0 instead of NULL.
+
 2014-12-11  Joseph Myers  <joseph@codesourcery.com>
 
 	* nptl/semaphore.h: Move to ...
diff --git a/sysdeps/sh/jmpbuf-unwind.h b/sysdeps/sh/jmpbuf-unwind.h
index 99adec3..43b1e9c 100644
--- a/sysdeps/sh/jmpbuf-unwind.h
+++ b/sysdeps/sh/jmpbuf-unwind.h
@@ -32,11 +32,11 @@
 static inline uintptr_t __attribute__ ((unused))
 _jmpbuf_sp (__jmp_buf regs)
 {
-  uintptr_t sp = regs[0].__regs[7];
+  void *sp = (void *) regs[0].__regs[7];
 #ifdef PTR_DEMANGLE
   PTR_DEMANGLE (sp);
 #endif
-  return sp;
+  return (uintptr_t) sp;
 }
 
 #define _JMPBUF_UNWINDS_ADJ(_jmpbuf, _address, _adj) \
diff --git a/sysdeps/sh/nptl/tls.h b/sysdeps/sh/nptl/tls.h
index 5a82975..446b240 100644
--- a/sysdeps/sh/nptl/tls.h
+++ b/sysdeps/sh/nptl/tls.h
@@ -99,7 +99,7 @@ typedef struct
    special attention since 'errno' is not yet available and if the
    operation can cause a failure 'errno' must not be touched.  */
 # define TLS_INIT_TP(tcbp) \
-  ({ __asm __volatile ("ldc %0,gbr" : : "r" (tcbp)); 0; })
+  ({ __asm __volatile ("ldc %0,gbr" : : "r" (tcbp)); NULL; })
 
 # define TLS_DEFINE_INIT_TP(tp, pd) void *tp = (pd) + 1
 
diff --git a/sysdeps/unix/sysv/linux/sh/lowlevellock.h b/sysdeps/unix/sysv/linux/sh/lowlevellock.h
index e6dbab2..8045846 100644
--- a/sysdeps/unix/sysv/linux/sh/lowlevellock.h
+++ b/sysdeps/unix/sysv/linux/sh/lowlevellock.h
@@ -321,7 +321,7 @@ extern int __lll_unlock_wake (int *__futex, int private) attribute_hidden;
     register unsigned long __r5 asm ("r5")				      \
       = __lll_private_flag (FUTEX_WAIT, private);			      \
     register unsigned long __r6 asm ("r6") = (unsigned long) (val);	      \
-    register unsigned long __r7 asm ("r7") = (timeout);			      \
+    register unsigned long __r7 asm ("r7") = (unsigned long) (timeout);	      \
     __asm __volatile (SYSCALL_WITH_INST_PAD				      \
 		      : "=z" (__status)					      \
 		      : "r" (__r3), "r" (__r4), "r" (__r5),		      \
diff --git a/sysdeps/unix/sysv/linux/sh/sh4/register-dump.h b/sysdeps/unix/sysv/linux/sh/sh4/register-dump.h
index a77df8c..ec2beab 100644
--- a/sysdeps/unix/sysv/linux/sh/sh4/register-dump.h
+++ b/sysdeps/unix/sysv/linux/sh/sh4/register-dump.h
@@ -144,7 +144,7 @@ register_dump (int fd, struct sigcontext *ctx)
   ADD_STRING ("\n");
 
 #ifdef __SH_FPU_ANY__
-  if (ctx->sc_ownedfp != NULL)
+  if (ctx->sc_ownedfp != 0)
     {
       hexvalue (ctx->sc_fpregs[0], fpregs[0], 8);
       hexvalue (ctx->sc_fpregs[1], fpregs[1], 8);

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                                      |    9 +++++++++
 sysdeps/sh/jmpbuf-unwind.h                     |    4 ++--
 sysdeps/sh/nptl/tls.h                          |    2 +-
 sysdeps/unix/sysv/linux/sh/lowlevellock.h      |    2 +-
 sysdeps/unix/sysv/linux/sh/sh4/register-dump.h |    2 +-
 5 files changed, 14 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources