[committed,SH] Fix integer-pointer conversion warnings
diff mbox

Message ID 20141212.081147.240027448.kkojima@rr.iij4u.or.jp
State New
Headers show

Commit Message

Kaz Kojima Dec. 11, 2014, 11:11 p.m. UTC
I've committed the attached patch to fix SH specific compiler warnings
which are for integer-pointer type conversions without cast.

Regards,
	kaz
--
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.

Patch
diff mbox

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);