Re: [PATCH] Remove -combine support

[Richard Guenther <rguenther at suse dot de>]

On Thu, 16 Sep 2010, Diego Novillo wrote:

> On Thu, Sep 16, 2010 at 10:43, Richard Guenther <rguenther@suse.de> wrote:
> > On Thu, 16 Sep 2010, Richard Guenther wrote:
> >
> >> On Thu, 16 Sep 2010, Diego Novillo wrote:
> >>
> >> > On Thu, Sep 16, 2010 at 07:23, Richard Guenther <rguenther@suse.de> wrote:
> >> >
> >> > > 2010-09-16 ÂRichard Guenther Â<rguenther@suse.de>
> >> > >
> >> > > Â Â Â Â* common.opt (combine): Remove.
> >> > > Â Â Â Â* gcc.c (struct compiler): Rename combinable field.
> >> > > Â Â Â Â(default_compilers): Remove specs testing combine.
> >> > > Â Â Â Â(option_map): Remove -combine.
> >> > > Â Â Â Â(combine_inputs): Remove.
> >> > > Â Â Â Â(display_help): Remove -combine.
> >> > > Â Â Â Â(driver_handle_option): Remove OPT_combine handling.
> >> >
> >> > But LTO uses this for specifying multiple files, IIRC.
> >>
> >> Yeah - I noticed that. ÂBah. ÂI'm working on a workaround for that,
> >> and maybe my fourth try that is now testing will work ...
> >
> > Ok, so the following works.
> >
> > Bootstrapped and tested on x86_64-unknown-linux-gnu, ok for trunk?
> >
> > Thanks,
> > Richard.
> >
> > 2010-09-16 ÂRichard Guenther Â<rguenther@suse.de>
> >
> > Â Â Â Â* common.opt (combine): Remove.
> > Â Â Â Â* gcc.c (default_compilers): Remove specs testing combine.
> > Â Â Â ÂThe C compilers no longer can combine.
> > Â Â Â Â(option_map): Remove -combine.
> > Â Â Â Â(combine_inputs): Remove.
> > Â Â Â Â(display_help): Remove -combine.
> > Â Â Â Â(driver_handle_option): Remove OPT_combine handling.
> > Â Â Â Â(compile_input_file_p): Remove.
> > Â Â Â Â(do_spec): Remove code concerning combine.
> > Â Â Â Â(main): Likewise.
> > Â Â Â Â* doc/invoke.texi: Remove traces of -combine.
> > Â Â Â Â* lto-wrapper.c (run_gcc): Do not pass -combine to the compiler
> > Â Â Â Âdriver.
> >
> > Â Â Â Â* gcc.dg/pr27898.c: Use -flto instead of -combine.
> > Â Â Â Â* gcc.dg/pr28706.c: Likewise.
> > Â Â Â Â* gcc.dg/pr28712.c: Likewise.
> > Â Â Â Â* gcc.dg/pr30762-1.c: Likewise.
> > Â Â Â Â* gcc.dg/pr30762-2.c: Likewise.
> > Â Â Â Â* gcc.dg/pr31529-1.c: Likewise.
> > Â Â Â Â* gcc.dg/pr31529-2.c: Likewise.
> > Â Â Â Â* gcc.dg/pr34457-1.c: Likewise.
> > Â Â Â Â* gcc.dg/pr34457-2.c: Likewise.
> > Â Â Â Â* gcc.dg/pr34668-1.c: Likewise.
> > Â Â Â Â* gcc.dg/pr34668-2.c: Likewise.
> > Â Â Â Â* gcc.dg/pr34989-1.c: Likewise.
> > Â Â Â Â* gcc.dg/pr34989-2.c: Likewise.
> > Â Â Â Â* gcc.dg/pr43557-1.c: Likewise.
> > Â Â Â Â* gcc.dg/pr43557-2.c: Likewise.
> > Â Â Â Â* gcc.dg/debug/pr41893-1.c: Likewise.
> > Â Â Â Â* gcc.dg/matrix/matrix.exp: Do not use -combine.
> > Â Â Â Â* gcc.dg/matrix/matrix-3.c: Drop dg-options.
> > Â Â Â Â* gcc.dg/matrix/matrix-4.c: Likewise.
> > Â Â Â Â* gcc.dg/struct/struct-reorg.exp: Do not use -combine.
> > Â Â Â Â* gcc.dg/struct/wo_prof_empty_str.c: Drop dg-options.
> > Â Â Â Â* gcc.dg/struct/wo_prof_escape_arg_to_local.c: Likewise.
> > Â Â Â Â* gcc.dg/struct/wo_prof_escape_return.c: Likewise.
> 
> OK with me.  I think it's best to also wait for Joseph's input too.
> This also needs a mention in changes.html.

I'll amend changes.html when its done.

> Should we first mark it deprecated, make -combine an alias of -flto
> for one release and then remove?

The problem is that ongoing work wrecks -combine and I don't really
want to fix it.

I considered making the alias, but -combine really works different
from -flto so that Makefiles likely would need adjustments anyway.

As of deprecating it - how'd you do that?  We can easily amend 4.5
documentation, but diagnosing it's use?

Richard.