From patchwork Mon Jun 14 07:28:41 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Jelinek X-Patchwork-Id: 55513 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 E9B41B7D8B for ; Mon, 14 Jun 2010 20:17:48 +1000 (EST) Received: (qmail 26868 invoked by alias); 14 Jun 2010 10:17:45 -0000 Received: (qmail 26845 invoked by uid 22791); 14 Jun 2010 10:17:44 -0000 X-SWARE-Spam-Status: No, hits=-6.0 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_HI, SPF_HELO_PASS, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 14 Jun 2010 10:17:39 +0000 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o5EAHbKZ023058 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 14 Jun 2010 06:17:38 -0400 Received: from tyan-ft48-01.lab.bos.redhat.com (tyan-ft48-01.lab.bos.redhat.com [10.16.42.4]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o5EAHZZw006419 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 14 Jun 2010 06:17:37 -0400 Received: from tyan-ft48-01.lab.bos.redhat.com (tyan-ft48-01.lab.bos.redhat.com [127.0.0.1]) by tyan-ft48-01.lab.bos.redhat.com (8.14.4/8.14.4) with ESMTP id o5E7SfRA012189; Mon, 14 Jun 2010 09:28:41 +0200 Received: (from jakub@localhost) by tyan-ft48-01.lab.bos.redhat.com (8.14.4/8.14.4/Submit) id o5E7SfRx012188; Mon, 14 Jun 2010 09:28:41 +0200 Date: Mon, 14 Jun 2010 09:28:41 +0200 From: Jakub Jelinek To: Andreas Krebbel Cc: gcc-patches@gcc.gnu.org Subject: [PATCH] Fix s390 trunk build Message-ID: <20100614072841.GE7811@tyan-ft48-01.lab.bos.redhat.com> Reply-To: Jakub Jelinek MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-12-10) 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! After latest change s390 doesn't build on the trunk, there are too many alternatives in z10prop attribute list on two insns where the first alternative has been removed, but the corresponding *, hasn't been removed from the list. Fixed thusly, committed as obvious. 2010-06-14 Jakub Jelinek * config/s390/s390.md (*mov_64 DD_DF, mov): Properly adjust z10prop set_attr. Jakub --- gcc/config/s390/s390.md.jj 2010-06-14 09:14:39.000000000 +0200 +++ gcc/config/s390/s390.md 2010-06-14 09:18:53.000000000 +0200 @@ -2079,7 +2079,7 @@ (define_insn "*mov_64" [(set_attr "op_type" "RR,RX,RXY,RX,RXY,RRE,RXY,RXY") (set_attr "type" "fload,fload,fload, fstore,fstore,lr,load,store") - (set_attr "z10prop" "*,*,*,*,*,*,z10_fr_E1,z10_fwd_A3,z10_rec")]) + (set_attr "z10prop" "*,*,*,*,*,z10_fr_E1,z10_fwd_A3,z10_rec")]) (define_insn "*mov_31" [(set (match_operand:DD_DF 0 "nonimmediate_operand" @@ -2168,7 +2168,7 @@ (define_insn "mov" [(set_attr "op_type" "RR,RX,RXY,RX,RXY,RR,RX,RXY,RX,RXY") (set_attr "type" "fload,fload,fload, fstore,fstore,lr,load,load,store,store") - (set_attr "z10prop" "*,*,*,*,*,*,z10_fr_E1,z10_fwd_A3,z10_fwd_A3,z10_rec,z10_rec")]) + (set_attr "z10prop" "*,*,*,*,*,z10_fr_E1,z10_fwd_A3,z10_fwd_A3,z10_rec,z10_rec")]) ; ; movcc instruction pattern