From patchwork Fri Jun 6 09:46:57 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Riku Voipio X-Patchwork-Id: 31466 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ig0-f198.google.com (mail-ig0-f198.google.com [209.85.213.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C5310203C3 for ; Fri, 6 Jun 2014 09:48:29 +0000 (UTC) Received: by mail-ig0-f198.google.com with SMTP id uq10sf1910717igb.5 for ; Fri, 06 Jun 2014 02:48:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id :mime-version:cc:subject:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:errors-to:sender :x-original-sender:x-original-authentication-results:mailing-list :content-type:content-transfer-encoding; bh=z9AqryTTIJczck3wwPpjD0MZd/C2ryM5KEs6uJImsLE=; b=N0d2LgJOsnhiPkGVJXHWm1jnfTi0hMDaNIyS3Gezp2v5/7uEqzFse8r22dOhN3GD53 7sWcZ1WgPGSyKBdrgWyXji8oTCdwWRqJmGPGRFU43n+AyUYFPVBr4jpB/i0U11ZoHuYW D/ScNKj/XQeodlV2dYO8BDkKhH+blYkLQuqIu2c0dCj8arA0gx/evETyjiIGZ/OAs09+ fZMqntiPRd5GFE3In3qNEtoyb09Guqj3JHD/n56SVEY0I43lSOEnid4R9kqLgxoYiZUP jLREn022IkhNJUJ/7LtZ4mq4DmJ8oIaI+eTzz+K+bnE0MLs5zgdVZYXQU7rXY9qEOl3K 0BIQ== X-Gm-Message-State: ALoCoQlwsuMc+d9L9CfRJecwO5kjPozuYfUQuSgOrkHFc6Gy5ELgj3AMd+ijtgqwtWGXcy26L9Au X-Received: by 10.182.87.3 with SMTP id t3mr1876489obz.20.1402048108332; Fri, 06 Jun 2014 02:48:28 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.19.173 with SMTP id 42ls626841qgh.27.gmail; Fri, 06 Jun 2014 02:48:28 -0700 (PDT) X-Received: by 10.58.227.193 with SMTP id sc1mr1554061vec.43.1402048108213; Fri, 06 Jun 2014 02:48:28 -0700 (PDT) Received: from mail-ve0-f181.google.com (mail-ve0-f181.google.com [209.85.128.181]) by mx.google.com with ESMTPS id fp5si4467164vcb.75.2014.06.06.02.48.28 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 06 Jun 2014 02:48:28 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.181 as permitted sender) client-ip=209.85.128.181; Received: by mail-ve0-f181.google.com with SMTP id pa12so2748465veb.40 for ; Fri, 06 Jun 2014 02:48:28 -0700 (PDT) X-Received: by 10.220.44.141 with SMTP id a13mr1082905vcf.71.1402048108137; Fri, 06 Jun 2014 02:48:28 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.54.6 with SMTP id vs6csp84226vcb; Fri, 6 Jun 2014 02:48:27 -0700 (PDT) X-Received: by 10.224.147.80 with SMTP id k16mr6218002qav.40.1402048107730; Fri, 06 Jun 2014 02:48:27 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id b3si11871900qak.97.2014.06.06.02.48.27 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 06 Jun 2014 02:48:27 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:46178 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wsql9-0007zR-8E for patch@linaro.org; Fri, 06 Jun 2014 05:48:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35234) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wsqjt-0006Fp-Kd for qemu-devel@nongnu.org; Fri, 06 Jun 2014 05:47:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wsqjn-0001Xg-7b for qemu-devel@nongnu.org; Fri, 06 Jun 2014 05:47:09 -0400 Received: from afflict.kos.to ([92.243.29.197]:38385) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wsqjn-0001XP-0E for qemu-devel@nongnu.org; Fri, 06 Jun 2014 05:47:03 -0400 Received: from afflict.kos.to (afflict [92.243.29.197]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by afflict.kos.to (Postfix) with ESMTPSA id 0226526587; Fri, 6 Jun 2014 11:47:00 +0200 (CEST) From: riku.voipio@linaro.org To: qemu-devel@nongnu.org Date: Fri, 6 Jun 2014 12:46:57 +0300 Message-Id: <1402048017-30604-14-git-send-email-riku.voipio@linaro.org> X-Mailer: git-send-email 1.7.10.4 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 92.243.29.197 Cc: Riku Voipio , Richard Henderson Subject: [Qemu-devel] [PATCH v2 13/13] linux-user: fix gcc-4.9 compiler error on __{get, put]}_user X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: riku.voipio@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.181 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Riku Voipio gcc-4.9 finds unused operand: linux-user/syscall.c: In function ‘host_to_target_stat64’: linux-user/qemu.h:301:19: error: right-hand operand of comma expression has no effect [-Werror=unused-value] ((hptr), (x)), 0) Just removing the rh operand is no good, it will error in later: linux-user/main.c: In function ‘arm_kernel_cmpxchg64_helper’: linux-user/qemu.h:330:15: error: void value not ignored as it ought to be __ret = __put_user((x), __hptr); \ Thus, remove setting __ret from __get_user and __put_user, as and set the right hand operand to (void)0 to make it clear that these return never nothing. This commit depends on the signal.c cleanup, to ensure bisectable version history. Cc: Richard Henderson Signed-off-by: Riku Voipio --- linux-user/qemu.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/linux-user/qemu.h b/linux-user/qemu.h index ba3d8ab..8012cc2 100644 --- a/linux-user/qemu.h +++ b/linux-user/qemu.h @@ -299,7 +299,7 @@ static inline int access_ok(int type, abi_ulong addr, abi_ulong size) __builtin_choose_expr(sizeof(*(hptr)) == 2, stw_##e##_p, \ __builtin_choose_expr(sizeof(*(hptr)) == 4, stl_##e##_p, \ __builtin_choose_expr(sizeof(*(hptr)) == 8, stq_##e##_p, abort)))) \ - ((hptr), (x)), 0) + ((hptr), (x)), (void)0) #define __get_user_e(x, hptr, e) \ ((x) = (typeof(*hptr))( \ @@ -307,7 +307,7 @@ static inline int access_ok(int type, abi_ulong addr, abi_ulong size) __builtin_choose_expr(sizeof(*(hptr)) == 2, lduw_##e##_p, \ __builtin_choose_expr(sizeof(*(hptr)) == 4, ldl_##e##_p, \ __builtin_choose_expr(sizeof(*(hptr)) == 8, ldq_##e##_p, abort)))) \ - (hptr)), 0) + (hptr)), (void)0) #ifdef TARGET_WORDS_BIGENDIAN # define __put_user(x, hptr) __put_user_e(x, hptr, be) @@ -326,9 +326,9 @@ static inline int access_ok(int type, abi_ulong addr, abi_ulong size) ({ \ abi_ulong __gaddr = (gaddr); \ target_type *__hptr; \ - abi_long __ret; \ + abi_long __ret = 0; \ if ((__hptr = lock_user(VERIFY_WRITE, __gaddr, sizeof(target_type), 0))) { \ - __ret = __put_user((x), __hptr); \ + __put_user((x), __hptr); \ unlock_user(__hptr, __gaddr, sizeof(target_type)); \ } else \ __ret = -TARGET_EFAULT; \ @@ -339,9 +339,9 @@ static inline int access_ok(int type, abi_ulong addr, abi_ulong size) ({ \ abi_ulong __gaddr = (gaddr); \ target_type *__hptr; \ - abi_long __ret; \ + abi_long __ret = 0; \ if ((__hptr = lock_user(VERIFY_READ, __gaddr, sizeof(target_type), 1))) { \ - __ret = __get_user((x), __hptr); \ + __get_user((x), __hptr); \ unlock_user(__hptr, __gaddr, 0); \ } else { \ /* avoid warning */ \