From patchwork Tue Aug 12 15:01:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ramana Radhakrishnan X-Patchwork-Id: 379390 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 6810D14008C for ; Wed, 13 Aug 2014 01:01:35 +1000 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :message-id:date:from:mime-version:to:subject:content-type; q= dns; s=default; b=vLlNqV6OQPyzr/1lzy9MmONEK6wmCIGldYxGlREL3KXtjb /B6QXkqnZJAxBjUHTRATG2lZ2qdKqLRT7+ydav4L6z5eMIAveXi8cyrJ1Vri/7ee xFJRKnsUPhBAgIY67BYrfsSoOSC2io+uMahtsBIoLuK1RTkLMK9r17IamyhSU= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :message-id:date:from:mime-version:to:subject:content-type; s= default; bh=zvvU7rW2XUy/Beje0ayDT3ctULs=; b=XoJHopeh9BFojL+QPXh6 WaZB0c+q1nfmgjMNIFoJ/rjyXXfQKKhL/dP1F4pS9YHDNx4BdVLglFAGR4ZVSxa1 59Bg2hcz6E1gNqbN10w/wBNLGJv0EOQucXxKurK+xfsNO7RnmCjKP1WjlFLZW7j3 X2c7s5CH0NYYGF0YSvLTnBY= Received: (qmail 24822 invoked by alias); 12 Aug 2014 15:01:28 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 24774 invoked by uid 89); 12 Aug 2014 15:01:20 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.2 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 X-HELO: collaborate-mta1.arm.com Received: from fw-tnat.austin.arm.com (HELO collaborate-mta1.arm.com) (217.140.110.23) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 12 Aug 2014 15:01:18 +0000 Received: from [10.1.209.140] (e105545-lin.cambridge.arm.com [10.1.209.140]) by collaborate-mta1.arm.com (Postfix) with ESMTPS id 5EDAF13F88D for ; Tue, 12 Aug 2014 10:01:16 -0500 (CDT) Message-ID: <53EA2C3C.5060701@arm.com> Date: Tue, 12 Aug 2014 16:01:16 +0100 From: Ramana Radhakrishnan User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.0 MIME-Version: 1.0 To: "gcc-patches@gcc.gnu.org" Subject: [Patch ARM] Fix PR target/61413 - definition of __ARM_SIZEOF_WCHAR_T X-IsSubscribed: yes Hi, The ACLE http://infocenter.arm.com/help/topic/com.arm.doc.ihi0053c/IHI0053C_acle_2_0.pdf expects this macro to be defined in terms of byte sizes but we return bit sizes *and* additionally do not handle -fshort-wchar. Applied to trunk. regards Ramana 2014-08-12 Ramana Radhakrishnan PR target/61413 * config/arm/arm.h (TARGET_CPU_CPP_BUILTINS): Fix definition of __ARM_SIZEOF_WCHAR_T. diff --git a/gcc/config/arm/arm.h b/gcc/config/arm/arm.h index 047df97..96e8626 100644 --- a/gcc/config/arm/arm.h +++ b/gcc/config/arm/arm.h @@ -74,8 +74,8 @@ extern char arm_arch_name[]; builtin_define_with_int_value ( \ "__ARM_SIZEOF_MINIMAL_ENUM", \ flag_short_enums ? 1 : 4); \ - builtin_define_with_int_value ( \ - "__ARM_SIZEOF_WCHAR_T", WCHAR_TYPE_SIZE); \ + builtin_define_type_sizeof ("__ARM_SIZEOF_WCHAR_T", \ + wchar_type_node); \ if (TARGET_ARM_ARCH_PROFILE) \ builtin_define_with_int_value ( \ "__ARM_ARCH_PROFILE", TARGET_ARM_ARCH_PROFILE); \