From f82c43af8aebc5a270c8be06055ee5a38063bac3 Mon Sep 17 00:00:00 2001 From: Kaz Kojima Date: Fri, 12 Dec 2014 08:07:35 +0900 Subject: * Fix SH specific compiler warnings which are for integer-pointer type conversions without cast. --- sysdeps/sh/jmpbuf-unwind.h | 4 ++-- sysdeps/sh/nptl/tls.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'sysdeps/sh') 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 -- cgit v1.1