From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 9210 invoked by alias); 18 Jun 2013 00:37:21 -0000 Mailing-List: contact libc-ports-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: libc-ports-owner@sourceware.org Received: (qmail 9185 invoked by uid 89); 18 Jun 2013 00:37:17 -0000 X-Spam-SWARE-Status: No, score=-3.9 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,RCVD_IN_HOSTKARMA_W,RCVD_IN_HOSTKARMA_WL,TW_XF autolearn=ham version=3.3.1 Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Tue, 18 Jun 2013 00:37:16 +0000 Received: from svr-orw-exc-10.mgc.mentorg.com ([147.34.98.58]) by relay1.mentorg.com with esmtp id 1Uojv9-00002Z-3l from joseph_myers@mentor.com for libc-ports@sourceware.org; Mon, 17 Jun 2013 17:37:15 -0700 Received: from SVR-IES-FEM-01.mgc.mentorg.com ([137.202.0.104]) by SVR-ORW-EXC-10.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.4675); Mon, 17 Jun 2013 17:37:14 -0700 Received: from digraph.polyomino.org.uk (137.202.0.76) by SVR-IES-FEM-01.mgc.mentorg.com (137.202.0.104) with Microsoft SMTP Server id 14.2.247.3; Tue, 18 Jun 2013 01:37:13 +0100 Received: from jsm28 (helo=localhost) by digraph.polyomino.org.uk with local-esmtp (Exim 4.76) (envelope-from ) id 1Uojv6-0006Vy-93 for libc-ports@sourceware.org; Tue, 18 Jun 2013 00:37:12 +0000 Date: Tue, 18 Jun 2013 00:37:00 -0000 From: "Joseph S. Myers" To: Subject: Fix warnings from ARM soft-float fpu_control.h Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" X-SW-Source: 2013-06/txt/msg00032.txt.bz2 I've applied this patch to make the ARM soft-float fpu_control.h definitions of _FPU_GETCW and _FPU_SETCW match those used in other soft-float cases, to avoid them generating compiler warnings (in particular, when building the test-fpucw.c testcase). diff --git a/ports/ChangeLog.arm b/ports/ChangeLog.arm index c7e22cc..a901c6e 100644 --- a/ports/ChangeLog.arm +++ b/ports/ChangeLog.arm @@ -1,5 +1,10 @@ 2013-06-18 Joseph Myers + * sysdeps/arm/fpu_control.h [!(_LIBC && !_LIBC_TEST) && + __SOFTFP__] (_FPU_GETCW): Define to (cw) = 0. + [!(_LIBC && !_LIBC_TEST) && __SOFTFP__] (_FPU_SETCW): Define to + (void) (cw). + * sysdeps/arm/fpu_control.h [!_LIBC && __SOFTFP__]: Change condition to [!(_LIBC && !_LIBC_TEST) && __SOFTFP__]. * sysdeps/arm/test-fpucw.c: New file. diff --git a/ports/sysdeps/arm/fpu_control.h b/ports/sysdeps/arm/fpu_control.h index 3ceb58b..513e694 100644 --- a/ports/sysdeps/arm/fpu_control.h +++ b/ports/sysdeps/arm/fpu_control.h @@ -24,8 +24,8 @@ #define _FPU_RESERVED 0xffffffff #define _FPU_DEFAULT 0x00000000 typedef unsigned int fpu_control_t; -#define _FPU_GETCW(cw) 0 -#define _FPU_SETCW(cw) do { } while (0) +#define _FPU_GETCW(cw) (cw) = 0 +#define _FPU_SETCW(cw) (void) (cw) extern fpu_control_t __fpu_control; #else -- Joseph S. Myers joseph@codesourcery.com