diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | sysdeps/sh/jmpbuf-unwind.h | 4 | ||||
| -rw-r--r-- | sysdeps/sh/nptl/tls.h | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sh/lowlevellock.h | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sh/sh4/register-dump.h | 2 |
5 files changed, 14 insertions, 5 deletions
@@ -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 99adec3950..43b1e9ceab 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 5a829756a8..446b2406c3 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 e6dbab248d..8045846b04 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 a77df8cc5a..ec2beabbf2 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); |