From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 28868 invoked by alias); 6 May 2015 01:13:47 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 28859 invoked by uid 89); 6 May 2015 01:13:47 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.5 required=5.0 tests=BAYES_05,FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,SPF_PASS,T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: resqmta-po-02v.sys.comcast.net Received: from resqmta-po-02v.sys.comcast.net (HELO resqmta-po-02v.sys.comcast.net) (96.114.154.161) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Wed, 06 May 2015 01:13:46 +0000 Received: from resomta-po-09v.sys.comcast.net ([96.114.154.233]) by resqmta-po-02v.sys.comcast.net with comcast id QRCD1q00452QWKC01RDkmo; Wed, 06 May 2015 01:13:44 +0000 Received: from [IPv6:2001:558:6045:a4:40c6:7199:cd03:b02d] ([IPv6:2001:558:6045:a4:40c6:7199:cd03:b02d]) by resomta-po-09v.sys.comcast.net with comcast id QRDh1q00V2ztT3H01RDikX; Wed, 06 May 2015 01:13:43 +0000 Content-Type: text/plain; charset=windows-1252 Mime-Version: 1.0 (Mac OS X Mail 7.3 \(1878.6\)) Subject: Re: [PATCH 5/8] always define HAVE_simple_return and HAVE_return From: Mike Stump In-Reply-To: <1430114140-15817-6-git-send-email-tbsaunde+gcc@tbsaunde.org> Date: Wed, 06 May 2015 01:13:00 -0000 Cc: gcc-patches@gcc.gnu.org Content-Transfer-Encoding: quoted-printable Message-Id: <445EB2C0-291E-4614-8484-08A920F80A63@comcast.net> References: <1430114140-15817-1-git-send-email-tbsaunde+gcc@tbsaunde.org> <1430114140-15817-6-git-send-email-tbsaunde+gcc@tbsaunde.org> To: tbsaunde+gcc@tbsaunde.org X-IsSubscribed: yes X-SW-Source: 2015-05/txt/msg00376.txt.bz2 On Apr 26, 2015, at 10:55 PM, tbsaunde+gcc@tbsaunde.org wrote: > From: Trevor Saunders >=20 > gcc/ChangeLog: >=20 > 2015-04-27 Trevor Saunders >=20 > * bb-reorder.c (HAVE_return): Don't check if its undefined. > * defaults.h (gen_simple_return): New function. > (gen_simple_return): Likewise. > (HAVE_return): Add default definition to false. > (HAVE_simple_return): Likewise. > * cfgrtl.c (force_nonfallthru_and_redirect): Remove checks if > HAVE_return and HAVE_simple_return are defined. > * function.c (gen_return_pattern): Likewise. > (convert_jumps_to_returns): Likewise. > (thread_prologue_and_epilogue_insns): Likewise. > * reorg.c (find_end_label): Likewise. > (dbr_schedule): Likewise. > * shrink-wrap.c: Likewise. > * shrink-wrap.h: Likewise. I=92m seeing: In file included from ./tm.h:30:0, from ../../gcc/gcc/c-family/c-semantics.c:24: ../../gcc/gcc/defaults.h: In function =91rtx_def* gen_simple_return()=92: ../../gcc/gcc/defaults.h:1422:1: error: redefinition of =91rtx_def* gen_sim= ple_return()=92 gen_simple_return () ^ In file included from ./tm.h:22:0, from ../../gcc/gcc/c-family/c-semantics.c:24: ./insn-flags.h:1744:1: error: =91rtx_def* gen_simple_return()=92 previously= defined here gen_simple_return(void) ^ in my port. I have a simple_return and a return that is =930=94 enabled. defaults.h has: #ifndef HAVE_simple_return #define HAVE_simple_return 0 static inline rtx gen_simple_return () { gcc_unreachable (); return NULL; } #endif and insn-flags.h has: static inline rtx gen_simple_return (v= oid); static inline rtx gen_simple_return(void) { return 0; } If I change the enable to =931=94 or =93=94 then it compiles better. Also,= I can delete the pattern or change the name of the pattern and it works ok= as well. If they both did #ifndef HAVE_simple_return, and then insn-flags did #defin= e HAVE_simple_return 0, I think it might work better. I=92ve not thought a= bout it much.