From patchwork Thu Dec 11 23:11:47 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kaz Kojima X-Patchwork-Id: 420287 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 7134B1400DE for ; Fri, 12 Dec 2014 10:12:05 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:message-id:to:subject:from:mime-version :content-type:content-transfer-encoding; q=dns; s=default; b=tMG pBdP6sKI1gqvv43Pgi+lL1wmhkghtWpd3udUzzkJZvo6nxfRQZ9tFa1JphjBo7tB HzvhGgoB9UHGq/mf5aDvrIz25b4csRWTE3ozwUqn+uFff7q7nha0UDNh4uXUs+LQ ClX1cPHYU883WvvKIFcT1tBOgbrAHw2muhtaELsU= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:message-id:to:subject:from:mime-version :content-type:content-transfer-encoding; s=default; bh=P8sCHyuSD YvtEXjQUqktMLhWyK0=; b=AuV0ertnwH54tAEQwwIzZ4cTWAVwMq+vV4mcQSwy/ OlxXw4kNFSTX2O4DOczIxu2+3MAH8bHXWJ7ciSCS9PgqV5hE1XrR9o6x9VcEFP1H 8oEqXxy13l5mmNeU6kbWLN1gCeOWYpEXY5Xh2xna5+Yv4VnA3yOHoG7NVsz7j6QP 00= Received: (qmail 32331 invoked by alias); 11 Dec 2014 23:12:00 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 32317 invoked by uid 89); 11 Dec 2014 23:11:59 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.6 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: mo-sw.iij4u.or.jp Date: Fri, 12 Dec 2014 08:11:47 +0900 (JST) Message-Id: <20141212.081147.240027448.kkojima@rr.iij4u.or.jp> To: libc-alpha@sourceware.org Subject: [PATCH committed] [SH] Fix integer-pointer conversion warnings From: Kaz Kojima Mime-Version: 1.0 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 * 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. 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);