From patchwork Wed Nov 12 17:08:58 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ramana Radhakrishnan X-Patchwork-Id: 40687 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f197.google.com (mail-lb0-f197.google.com [209.85.217.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 72D5524493 for ; Wed, 12 Nov 2014 17:09:28 +0000 (UTC) Received: by mail-lb0-f197.google.com with SMTP id b6sf1663983lbj.8 for ; Wed, 12 Nov 2014 09:09:27 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:mailing-list:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:sender :delivered-to:message-id:date:from:user-agent:mime-version:to :subject:x-original-sender:x-original-authentication-results :content-type; bh=bdtJJ0oTPDhv9yLSsTpalAFKuH+fu6IdW+un++BH6G4=; b=IxTGGVsU+zl45D1FVG75n0gHgGinMIHnFptc8gBzKYhi3Er0aTV9RMob5r+FE+03hx Y5dwK3Akron5vevQJ3uO79mkYmChMfQMBG6sXlQUs0g1q53rFd/TB9hYvClIrf9/ZOCD f09Tubt9KE+CJoVNxkDEGy+pLXt9EYnVR/KHzZs+jx51JXb6r8EkPNHNQBYkEVI1xRXn dBU3dBKx1otSrGWyAemA4OE2MM/+DBk5nq58whB8gXVlKQT8K6mIKb8tuw+v8yAp8BFF CnR99MrEfd/y6a8B+TWkPHra0oA3vsyBF9yRD337tupEAZQBMPv2srUTL3GNkszhXXOM 9pFw== X-Gm-Message-State: ALoCoQlrOJAd6qDtzd6z1cvU4MlH2KxQ3KYFwTQWNHENR/Da3+rqUyiQkIXTWRLrT6MJM5I5QV1+ X-Received: by 10.112.55.10 with SMTP id n10mr726513lbp.14.1415812167086; Wed, 12 Nov 2014 09:09:27 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.178.196 with SMTP id da4ls347136lac.1.gmail; Wed, 12 Nov 2014 09:09:26 -0800 (PST) X-Received: by 10.112.136.164 with SMTP id qb4mr43737717lbb.62.1415812166935; Wed, 12 Nov 2014 09:09:26 -0800 (PST) Received: from mail-lb0-x235.google.com (mail-lb0-x235.google.com. [2a00:1450:4010:c04::235]) by mx.google.com with ESMTPS id nb4si35692062lbb.35.2014.11.12.09.09.26 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 12 Nov 2014 09:09:26 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:4010:c04::235 as permitted sender) client-ip=2a00:1450:4010:c04::235; Received: by mail-lb0-f181.google.com with SMTP id l4so9635873lbv.26 for ; Wed, 12 Nov 2014 09:09:26 -0800 (PST) X-Received: by 10.152.37.69 with SMTP id w5mr2847815laj.67.1415812166570; Wed, 12 Nov 2014 09:09:26 -0800 (PST) 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.112.184.201 with SMTP id ew9csp458572lbc; Wed, 12 Nov 2014 09:09:25 -0800 (PST) X-Received: by 10.66.151.141 with SMTP id uq13mr49032203pab.87.1415812164183; Wed, 12 Nov 2014 09:09:24 -0800 (PST) Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id gm10si1889877pbd.44.2014.11.12.09.09.23 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Nov 2014 09:09:24 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-return-383898-patch=linaro.org@gcc.gnu.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Received: (qmail 20925 invoked by alias); 12 Nov 2014 17:09:02 -0000 Mailing-List: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org Precedence: list 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 20813 invoked by uid 89); 12 Nov 2014 17:09:01 -0000 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: foss-mx-na.foss.arm.com Received: from foss-mx-na.foss.arm.com (HELO foss-mx-na.foss.arm.com) (217.140.108.86) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 12 Nov 2014 17:08:59 +0000 Received: from foss-smtp-na-1.foss.arm.com (unknown [10.80.61.8]) by foss-mx-na.foss.arm.com (Postfix) with ESMTP id 66B8966 for ; Wed, 12 Nov 2014 11:08:49 -0600 (CST) Received: from collaborate-mta1.arm.com (highbank-bc01-b06.austin.arm.com [10.112.81.134]) by foss-smtp-na-1.foss.arm.com (Postfix) with ESMTP id 202A35FAD7 for ; Wed, 12 Nov 2014 11:08:47 -0600 (CST) Received: from [10.1.209.40] (e105545-lin.cambridge.arm.com [10.1.209.40]) by collaborate-mta1.arm.com (Postfix) with ESMTPS id AA55613F78C for ; Wed, 12 Nov 2014 11:08:46 -0600 (CST) Message-ID: <5463942A.6070707@arm.com> Date: Wed, 12 Nov 2014 17:08:58 +0000 From: Ramana Radhakrishnan User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.2.0 MIME-Version: 1.0 To: "gcc-patches@gcc.gnu.org" Subject: [Patch ARM] Fix typo in *_shiftsi X-IsSubscribed: yes X-Original-Sender: ramana.radhakrishnan@arm.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:4010:c04::235 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org; dkim=pass header.i=@gcc.gnu.org X-Google-Group-Id: 836684582541 As per RichardS's comment on the checkin to change the patterns for _shiftsi here. https://gcc.gnu.org/ml/gcc-patches/2014-05/msg02534.html I toyed with the idea of removing this check but on balance it's probably safe to have this to have the condition fail before the recognizer kicks in. Bootstrapped and regression tested on armhf. Applied to trunk. Ramana 2014-11-12 Ramana Radhakrishnan * config/arm/arm.md (arith_shift_insn): Fix typo in operand number. Index: gcc/config/arm/arm.h =================================================================== --- gcc/config/arm/arm.h (revision 216854) +++ gcc/config/arm/arm.h (working copy) @@ -36,7 +36,7 @@ #define MACHMODE int #else #include "insn-modes.h" -#define MACHMODE enum machine_mode +#define MACHMODE machine_mode #endif #include "config/vxworks-dummy.h" @@ -1510,7 +1510,7 @@ } arm_stack_offsets; -#if !defined(GENERATOR_FILE) && !defined(USED_FOR_TARGET) +#if !defined(GENERATOR_FILE) && !defined (USED_FOR_TARGET) /* A C structure for machine-specific, per-function data. This is added to the cfun structure. */ typedef struct GTY(()) machine_function @@ -1578,6 +1578,7 @@ /* Default procedure calling standard of current compilation unit. */ extern enum arm_pcs arm_pcs_default; +#if !defined (USED_FOR_TARGET) /* A C type for declaring a variable that is used as the first argument of `FUNCTION_ARG' and other related values. */ typedef struct @@ -1611,6 +1612,7 @@ int aapcs_vfp_rcount; MACHMODE aapcs_vfp_rmode; } CUMULATIVE_ARGS; +#endif #define FUNCTION_ARG_PADDING(MODE, TYPE) \ (arm_pad_arg_upward (MODE, TYPE) ? upward : downward)