From patchwork Fri Aug 27 10:12:31 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ramana Radhakrishnan X-Patchwork-Id: 62843 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]) by ozlabs.org (Postfix) with SMTP id 14845B70E6 for ; Fri, 27 Aug 2010 20:12:45 +1000 (EST) Received: (qmail 14642 invoked by alias); 27 Aug 2010 10:12:44 -0000 Received: (qmail 14632 invoked by uid 22791); 27 Aug 2010 10:12:43 -0000 X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL, BAYES_00, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from cam-admin0.cambridge.arm.com (HELO cam-admin0.cambridge.arm.com) (217.140.96.50) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 27 Aug 2010 10:12:37 +0000 Received: from cam-owa1.Emea.Arm.com (cam-owa1.emea.arm.com [10.1.255.62]) by cam-admin0.cambridge.arm.com (8.12.6/8.12.6) with ESMTP id o7RAB6F9015858; Fri, 27 Aug 2010 11:11:06 +0100 (BST) Received: from [10.1.66.29] ([10.1.255.212]) by cam-owa1.Emea.Arm.com with Microsoft SMTPSVC(6.0.3790.0); Fri, 27 Aug 2010 11:12:31 +0100 Subject: [Patch ARM] Unbreak ARM bootstrap. From: Ramana Radhakrishnan Reply-To: ramana.radhakrishnan@arm.com To: gcc-patches@gcc.gnu.org Cc: bernds@codesourcery.com, Richard Earnshaw Date: Fri, 27 Aug 2010 11:12:31 +0100 Message-Id: <1282903951.23926.25.camel@e102325-lin.cambridge.arm.com> Mime-Version: 1.0 X-IsSubscribed: yes 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 Hi, This unbreaks bootstraps on arm-linux-gnueabi which started failing because of issues with warnings of -Werror=c++-compat because the return value was being type-casted automatically from one enum type to another. error: enum conversion in return is invalid in C++ [-Werror=c++-compat] error: enum conversion in return is invalid in C++ [-Werror=c ++-compat] error: enum conversion in return is invalid in C++ [-Werror=c++-compat] Verified that stage2 proceeds further with this. Committing as obvious in the next few minutes unless someone has any objections to this. cheers Ramana * config/arm/arm.md (enabled): Test the value of arch_enabled rather than just using it. Index: trunk/gcc/config/arm/arm.md =================================================================== --- trunk/gcc/config/arm/arm.md (revision 163581) +++ trunk/gcc/config/arm/arm.md (working copy) @@ -236,7 +236,9 @@ ; Enable all alternatives that are both arch_enabled and insn_enabled. (define_attr "enabled" "no,yes" (if_then_else (eq_attr "insn_enabled" "yes") - (attr "arch_enabled") + (if_then_else (eq_attr "arch_enabled" "yes") + (const_string "yes") + (const_string "no")) (const_string "no"))) ; POOL_RANGE is how far away from a constant pool entry that this insn