From patchwork Tue Oct 29 16:37:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew MacLeod X-Patchwork-Id: 286900 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]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 43B442C0363 for ; Wed, 30 Oct 2013 03:37:27 +1100 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :message-id:date:from:mime-version:to:cc:subject:references :in-reply-to:content-type; q=dns; s=default; b=Y5bxVm2gtiB5Z5liA rnfPYVb/VFvT/rB1wsZfkm9rjDNpnepoCnfCLdDv/2C++zONdhd4lE097XJ0ltaR 2gikwGKJLSYr3D/OPKPJkHzRYDBqXdVSfop56IF5/pSusnP7nCFPtQLS5lQsEmbF c+X/5XdSEmHLf4z+c0WWhN+D5c= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :message-id:date:from:mime-version:to:cc:subject:references :in-reply-to:content-type; s=default; bh=wSp4t48kqsGWIdrU2omMBK0 Tf1Y=; b=VR1oI15tgf91YGPFfPZ/YgsTJn1fxgFF/MkLso8n0BZQIGPQLRO83Cq kaIJ3tmophpg7HgVwNs7vDmYbryBfhlS1CzwpTLDD61U5zdm47l0r0sT5qnjyJto 4o1dh0F0uJRC1+IVXzQGuecgLwtTmp4N71O/yzmgmfm0Zezln1zA= Received: (qmail 24646 invoked by alias); 29 Oct 2013 16:37:20 -0000 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 Received: (qmail 24633 invoked by uid 89); 29 Oct 2013 16:37:19 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.9 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 29 Oct 2013 16:37:19 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r9TGbH04030217 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 29 Oct 2013 12:37:17 -0400 Received: from [10.10.62.103] (vpn-62-103.rdu2.redhat.com [10.10.62.103]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r9TGbGdZ003291; Tue, 29 Oct 2013 12:37:17 -0400 Message-ID: <526FE43C.7050209@redhat.com> Date: Tue, 29 Oct 2013 12:37:16 -0400 From: Andrew MacLeod User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130805 Thunderbird/17.0.8 MIME-Version: 1.0 To: gcc-patches CC: Richard Biener , Jeff Law Subject: Re: [patch] Mostly remove tree-core.h from other .h files. References: <526EBD40.2020601@redhat.com> In-Reply-To: <526EBD40.2020601@redhat.com> X-IsSubscribed: yes On 10/28/2013 03:38 PM, Andrew MacLeod wrote: > I noticed there were a few .h files which we including tree-core.h > themselves. expr.h was one of them, and many of the rtl files used > that to get at the basic tree structure for various bits. > > I moved the include of tree-core.h to rtl.h instead. That way all the > rtl files get it, and when we flatten the rtl.h includes into the c > files, it'll be reduced to just the ones that need it. Eventually, > those things that need it from rtl.h won't even need tree-code.h, > they'll get converted to the new gimple interface instead. bah, looks like I broke some cross compiling. Apparently some gen* routines include rtl.h before all-tree.def exists, and this causes breakage. Doesnt happen during stage 1 of a cross, but later. sigh. I'll put tree-core.h back into expr.h, remove it from rtl.h and look to flatten it properly shortly... bootstrapped on x86_64-unknown-linux-gnu and applied as revision 204167. Andrew * expr.h: Revert change and include tree-core.h. * rtl.h: Revert change and don't include tree-core.h. Index: expr.h =================================================================== *** expr.h (revision 204163) --- expr.h (working copy) *************** along with GCC; see the file COPYING3. *** 26,31 **** --- 26,34 ---- #include "rtl.h" /* For optimize_size */ #include "flags.h" + /* For host_integerp, tree_low_cst, fold_convert, size_binop, ssize_int, + TREE_CODE, TYPE_SIZE, int_size_in_bytes, */ + #include "tree-core.h" /* For GET_MODE_BITSIZE, word_mode */ #include "machmode.h" Index: rtl.h =================================================================== *** rtl.h (revision 204163) --- rtl.h (working copy) *************** along with GCC; see the file COPYING3. *** 29,35 **** #include "alias.h" #include "hashtab.h" #include "flags.h" - #include "tree-core.h" /* Value used by some passes to "recognize" noop moves as valid instructions. */ --- 29,34 ----