From patchwork Mon Mar 12 17:08:13 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Georg-Johann Lay X-Patchwork-Id: 146179 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 22337B6F13 for ; Tue, 13 Mar 2012 04:08:46 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1332176927; h=Comment: DomainKey-Signature:Received:Received:Received:Received: Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject: Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:Sender:Delivered-To; bh=Lwb+w8q qwWLbOPVTo8Zu49I0wzU=; b=TEJdpZZmAG1XJ8O7SGeUgvDgKmN0plsKurYyR1/ FDeUK6oCkP1UyfOOg3HYo13yGVQGFUAC2Ofax3ji2/BgL1dnOzNA6I5phCACGeuQ eV16QHxLxzmS5YrCQ1NBcYzU0uPaOCPoz+6SkuRuT+A69yV0X9V5SgvsDyftRJG8 WH9w= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:X-RZG-AUTH:X-RZG-CLASS-ID:Received:Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject:Content-Type:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=eAdXr+QezrpvOi//9HL8nk1zXz8AoE1/jqTZ2TaLXBP9XqHBAgaP7FBSy7AmjK W8U+pn5YMS6Sx07C5MeTW8FCVug1JzJ+/iVkAGTEd5BbF9CIvadFoUbPKUyNWMzg mALSBFQO5/5bPLkvyXWkzHO1Vm5wAJiv2L9wJU50qp9zs=; Received: (qmail 1640 invoked by alias); 12 Mar 2012 17:08:39 -0000 Received: (qmail 1631 invoked by uid 22791); 12 Mar 2012 17:08:38 -0000 X-SWARE-Spam-Status: No, hits=-1.6 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_NONE X-Spam-Check-By: sourceware.org Received: from mo-p00-ob.rzone.de (HELO mo-p00-ob.rzone.de) (81.169.146.160) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 12 Mar 2012 17:08:18 +0000 X-RZG-AUTH: :LXoWVUeid/7A29J/hMvvT2k715jHQaJercGObUOFkj18odoYNahU4Q== X-RZG-CLASS-ID: mo00 Received: from [192.168.0.22] (business-188-111-022-002.static.arcor-ip.net [188.111.22.2]) by post.strato.de (mrclete mo18) (RZmta 28.1 AUTH) with ESMTPA id 50457eo2CH8DUX ; Mon, 12 Mar 2012 18:08:13 +0100 (MET) Message-ID: <4F5E2D7D.7030103@gjlay.de> Date: Mon, 12 Mar 2012 18:08:13 +0100 From: Georg-Johann Lay User-Agent: Thunderbird 2.0.0.24 (X11/20100302) MIME-Version: 1.0 To: gcc-patches@gcc.gnu.org CC: Denis Chertykov , Eric Weddington Subject: [Patch,AVR]; PR52499 fix MODE_CODE_BASE_REG_CLASS type 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 This fixes a problem if avr-gcc is built with C++ Lightly tested. Ok for trunk? Johann PR target/52499 * config/avr/avr.c (avr_mode_code_base_reg_class): Change return type from reg_class_t to enum reg_class. * config/avr/avr-protos.h (avr_mode_code_base_reg_class): Ditto. Index: config/avr/avr-protos.h =================================================================== --- config/avr/avr-protos.h (revision 185099) +++ config/avr/avr-protos.h (working copy) @@ -115,7 +115,7 @@ extern int avr_simplify_comparison_p (en extern RTX_CODE avr_normalize_condition (RTX_CODE condition); extern void out_shift_with_cnt (const char *templ, rtx insn, rtx operands[], int *len, int t_len); -extern reg_class_t avr_mode_code_base_reg_class (enum machine_mode, addr_space_t, RTX_CODE, RTX_CODE); +extern enum reg_class avr_mode_code_base_reg_class (enum machine_mode, addr_space_t, RTX_CODE, RTX_CODE); extern bool avr_regno_mode_code_ok_for_base_p (int, enum machine_mode, addr_space_t, RTX_CODE, RTX_CODE); extern rtx avr_incoming_return_addr_rtx (void); extern rtx avr_legitimize_reload_address (rtx*, enum machine_mode, int, int, int, int, rtx (*)(rtx,int)); Index: config/avr/avr.c =================================================================== --- config/avr/avr.c (revision 185100) +++ config/avr/avr.c (working copy) @@ -8983,7 +8983,7 @@ avr_hard_regno_mode_ok (int regno, enum /* Implement `MODE_CODE_BASE_REG_CLASS'. */ -reg_class_t +enum reg_class avr_mode_code_base_reg_class (enum machine_mode mode ATTRIBUTE_UNUSED, addr_space_t as, RTX_CODE outer_code, RTX_CODE index_code ATTRIBUTE_UNUSED)