From patchwork Mon Oct 21 19:36:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Diego Novillo X-Patchwork-Id: 285270 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 2406C2C012D for ; Tue, 22 Oct 2013 06:37:00 +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 :mime-version:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; q=dns; s=default; b=FZHDmaHUMYT/JZ1vCQ tHNmpBKnazqEDQgiGiAJ6WA905o6y2cA4wzZiKYwil9MgH5wbaY/uKcgD6nQRJXy yy7NreFqEgra/q6VTBk7GwvJc3yfLvSvR/Xdd+hWTJXQIsbL2xwj/qX/Q/Lq7pL9 wtpqigJROPh0jg03qQgDw1Eyk= 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 :mime-version:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; s=default; bh=IUEpsi+m0zp5aevzvmWZJO0q MyM=; b=Wk8eSogzFZnXYzwR83a8/fJVaS5dkrgc1sDQZYDqf4D09A4yrlw05pZd Uj30bvHaqLfaWx3S1+SjmgRtx4ErsVBkppNskToLxwEdz7Z3w4SuXsxNXVu+AKZp YWc0Ig7U732zUtqnrzWvKH7CY8X8xyUmaFqrlz1ZRluVc6lIa4I= Received: (qmail 12478 invoked by alias); 21 Oct 2013 19:36:53 -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 12466 invoked by uid 89); 21 Oct 2013 19:36:53 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.3 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-ie0-f180.google.com Received: from mail-ie0-f180.google.com (HELO mail-ie0-f180.google.com) (209.85.223.180) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Mon, 21 Oct 2013 19:36:52 +0000 Received: by mail-ie0-f180.google.com with SMTP id e14so11894326iej.25 for ; Mon, 21 Oct 2013 12:36:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=ycSWmh/q6IHsx5pxueQ+LXV/pLDIJsTynXNTomx6/10=; b=hpel2ZXO/U3NVGDeva33Almg7us/WaHsIEG6xhsGedPlqC1QZfgpUBjqYadJYf5lEg DRfu0Co3EJyeYvw7aBRfww8mGDIGfg8SvJfNHvMTvxX3QXF16JvXk/3O9wRseHNUPCGd 0B24/btrFmEuwntVgGcQ+T+GZWia27jqJ1lUSb7aEkk2+Lta5VfAsNgxKDZVenP3w8dD YjcbUgpGj5leHCkIDb0QrrIGaHb+mAoEcUA1UuSpeodVGVp0Msv27zkcE21T8FXIb5iA /4DMUxPPwM3IHHPl1EC/AbpOJO5kEKclz4O894m4lgMAUBXObqJ2W1zkLOqeQH5trk53 cqjQ== X-Gm-Message-State: ALoCoQlZDqc9W47SnvfWIDlGujTGkq7wLrLM8d5tz67JedRXlHxYSe6d8fftIzXOlRDTktYebzWlDTJXEFoBBi2YDDqJxKTmKPJAfFcbJBJlGJLH9JuosBg7dbOKyvsFebzd5Pz0Rq3joEUENnpCvPWg3yzwoEcpHII93IzrZ/yZaZ02k4qk9nFiGvY2kYnqCP8KkgzN7HEmhEixdKvlpQd0Xeo9H8JZJQ== MIME-Version: 1.0 X-Received: by 10.50.45.34 with SMTP id j2mr10685056igm.13.1382384209995; Mon, 21 Oct 2013 12:36:49 -0700 (PDT) Received: by 10.64.25.18 with HTTP; Mon, 21 Oct 2013 12:36:49 -0700 (PDT) In-Reply-To: <52655D12.5020602@redhat.com> References: <20131021165218.GA18836@google.com> <52655D12.5020602@redhat.com> Date: Mon, 21 Oct 2013 15:36:49 -0400 Message-ID: Subject: Re: Re-factor inclusion of tree.h From: Diego Novillo To: Jeff Law Cc: Andrew Macleod , gcc-patches X-IsSubscribed: yes On Mon, Oct 21, 2013 at 12:57 PM, Jeff Law wrote: > On 10/21/13 10:52, Diego Novillo wrote: >> >> I plan to commit this by tomorrow, unless there are objections. > > I can't think of a good reason to even bother waiting :-) Heh, OK, thanks. After analyzing all the build failures in config-list.mk, I found that we also need explicit inclusion of tree.h in the gen* binaries. Some of these generate all their includes in header files, but I figured we can revise this later on. This was breaking cr16-elf and mips-netbsd. Can anyone think of some way that we can use to automatically block inclusions of tree.h from header files? Code review is the only way that comes to mind. Committed both patches to trunk. Diego. diff --git a/gcc/genattrtab.c b/gcc/genattrtab.c index 973cade..f79380d 100644 --- a/gcc/genattrtab.c +++ b/gcc/genattrtab.c @@ -5100,6 +5100,7 @@ write_header (FILE *outf) fprintf (outf, "#include \"system.h\"\n"); fprintf (outf, "#include \"coretypes.h\"\n"); fprintf (outf, "#include \"tm.h\"\n"); + fprintf (outf, "#include \"tree.h\"\n"); fprintf (outf, "#include \"rtl.h\"\n"); fprintf (outf, "#include \"insn-attr.h\"\n"); fprintf (outf, "#include \"tm_p.h\"\n"); diff --git a/gcc/genautomata.c b/gcc/genautomata.c index a0bf076..f6c4b91c4 100644 --- a/gcc/genautomata.c +++ b/gcc/genautomata.c @@ -9665,6 +9665,7 @@ main (int argc, char **argv) "#include \"system.h\"\n" "#include \"coretypes.h\"\n" "#include \"tm.h\"\n" + "#include \"tree.h\"\n" "#include \"rtl.h\"\n" "#include \"tm_p.h\"\n" "#include \"insn-config.h\"\n" diff --git a/gcc/genemit.c b/gcc/genemit.c index d4bb301..724a114 100644 --- a/gcc/genemit.c +++ b/gcc/genemit.c @@ -790,6 +790,7 @@ from the machine description file `md'. */\n\n"); printf ("#include \"system.h\"\n"); printf ("#include \"coretypes.h\"\n"); printf ("#include \"tm.h\"\n"); + printf ("#include \"tree.h\"\n"); printf ("#include \"rtl.h\"\n"); printf ("#include \"tm_p.h\"\n"); printf ("#include \"function.h\"\n"); diff --git a/gcc/genopinit.c b/gcc/genopinit.c index 9c7cf2c..3efb71e 100644 --- a/gcc/genopinit.c +++ b/gcc/genopinit.c @@ -404,6 +404,7 @@ main (int argc, char **argv) "#include \"system.h\"\n" "#include \"coretypes.h\"\n" "#include \"tm.h\"\n" + "#include \"tree.h\"\n" "#include \"rtl.h\"\n" "#include \"tm_p.h\"\n" "#include \"flags.h\"\n" diff --git a/gcc/genoutput.c b/gcc/genoutput.c index c3a0936..2a7ee23 100644 --- a/gcc/genoutput.c +++ b/gcc/genoutput.c @@ -238,6 +238,7 @@ output_prologue (void) printf ("#include \"tm.h\"\n"); printf ("#include \"flags.h\"\n"); printf ("#include \"ggc.h\"\n"); + printf ("#include \"tree.h\"\n"); printf ("#include \"rtl.h\"\n"); printf ("#include \"expr.h\"\n"); printf ("#include \"insn-codes.h\"\n"); diff --git a/gcc/genpeep.c b/gcc/genpeep.c index a14d061..877fde3 100644 --- a/gcc/genpeep.c +++ b/gcc/genpeep.c @@ -359,6 +359,7 @@ from the machine description file `md'. */\n\n"); printf ("#include \"coretypes.h\"\n"); printf ("#include \"tm.h\"\n"); printf ("#include \"insn-config.h\"\n"); + printf ("#include \"tree.h\"\n"); printf ("#include \"rtl.h\"\n"); printf ("#include \"tm_p.h\"\n"); printf ("#include \"regs.h\"\n"); diff --git a/gcc/target-globals.c b/gcc/target-globals.c index 65ccb8a..9d223fc 100644 --- a/gcc/target-globals.c +++ b/gcc/target-globals.c @@ -23,6 +23,7 @@ along with GCC; see the file COPYING3. If not see #include "tm.h" #include "insn-config.h" #include "machmode.h" +#include "tree.h" #include "ggc.h" #include "toplev.h" #include "target-globals.h"