On Mon, 16 Sep 2013, Uros Bizjak wrote: > On Mon, Sep 16, 2013 at 11:06 AM, Uros Bizjak <ubiz...@gmail.com> wrote: > > >> My Build Robot[1] found this recent commit to break Alpha: > >> > >> * tree-flow.h (FREE_SSANAMES): Move to tree-ssanames.c > >> (SSANAMES, MODIFIED_NORETURN_CALLS, DEFAULT_DEFS, ptr_info_def, > >> num_ssa_names, ssa_name): Move to tree-ssanames.h + prototypes. > >> * tree-flow-inline.h (make_ssa_name, copy_ssa_name, duplicate_ssa_name, > >> make_temp_ssa_name): move to tree-ssanames.h > >> * tree-ssa-alias.h: Move prototype. > >> * tree-ssa.h: Include tree-ssanames.h. > >> * tree-ssanames.c (FREE_SSANAMES): Move to here. > >> * tree-ssanames.h: New. Move items from tree-flow*.h > >> * Makefile.in (tree-ssanames.h): Add to tree-ssanames.o and GTFILES. > >> > >> See for example this build log: > >> http://toolchain.lug-owl.de/buildbot/showlog.php?id=11663&mode=view > >> > >> I suggest this patch, which fixes an alpha-linux build for me: > >> > >> 2013-09-13 Jan-Benedict Glaw <jbg...@lug-owl.de> > >> > >> * config/alpha.c: Include tree-ssa.h. > > > > Thanks, I have tested the patch and commit it to the mainline to > > restore bootstrap. > > Richi noted that: > > I think you can remove the tree-flow.h include and you need to update the > dependencies in gcc/Makefile.in. > > However, we still need tree-flow.h, but instead of tree-ssa.h, we can > include tree-ssanames.h:
My point was that tree-ssa.h now includes tree-flow.h. But yes, making it even more specific works for me as well. Richard. > I will commit attached incremental patch, once bootstrap finish. > > Uros. > > Index: alpha.c > =================================================================== > --- alpha.c (revision 202621) > +++ alpha.c (working copy) > @@ -50,7 +50,7 @@ > #include "splay-tree.h" > #include "gimple.h" > #include "tree-flow.h" > -#include "tree-ssa.h" > +#include "tree-ssanames.h" > #include "tree-stdarg.h" > #include "tm-constrs.h" > #include "df.h" > > -- Richard Biener <rguent...@suse.de> SUSE / SUSE Labs SUSE LINUX Products GmbH - Nuernberg - AG Nuernberg - HRB 16746 GF: Jeff Hawn, Jennifer Guild, Felix Imend
