On Tue, Apr 18, 2017 at 8:30 PM, Denys Vlasenko <dvlas...@redhat.com> wrote:
> 2017-04-18 Denys Vlasenko <dvlas...@redhat.com>
>
> * config/i386/i386-common.c (ix86_handle_option): Remove support
> for obsolete -malign-loops, -malign-jumps and -malign-functions
> options.
> * config/i386/i386.opt: Likewise.
> Index: gcc/common/config/i386/i386-common.c
> ===================================================================
> --- gcc/common/config/i386/i386-common.c (revision 240663)
> +++ gcc/common/config/i386/i386-common.c (working copy)
> @@ -998,38 +998,6 @@ ix86_handle_option (struct gcc_options *opts,
> }
> return true;
>
> -
> - /* Comes from final.c -- no real reason to change it. */
> -#define MAX_CODE_ALIGN 16
> -
> - case OPT_malign_loops_:
> - warning_at (loc, 0, "-malign-loops is obsolete, use -falign-loops");
> - if (value > MAX_CODE_ALIGN)
> - error_at (loc, "-malign-loops=%d is not between 0 and %d",
> - value, MAX_CODE_ALIGN);
> - else
> - opts->x_align_loops = 1 << value;
> - return true;
> -
> - case OPT_malign_jumps_:
> - warning_at (loc, 0, "-malign-jumps is obsolete, use -falign-jumps");
> - if (value > MAX_CODE_ALIGN)
> - error_at (loc, "-malign-jumps=%d is not between 0 and %d",
> - value, MAX_CODE_ALIGN);
> - else
> - opts->x_align_jumps = 1 << value;
> - return true;
> -
> - case OPT_malign_functions_:
> - warning_at (loc, 0,
> - "-malign-functions is obsolete, use -falign-functions");
> - if (value > MAX_CODE_ALIGN)
> - error_at (loc, "-malign-functions=%d is not between 0 and %d",
> - value, MAX_CODE_ALIGN);
> - else
> - opts->x_align_functions = 1 << value;
> - return true;
> -
> case OPT_mbranch_cost_:
> if (value > 5)
> {
> Index: gcc/config/i386/i386.opt
> ===================================================================
> --- gcc/config/i386/i386.opt (revision 240663)
> +++ gcc/config/i386/i386.opt (working copy)
> @@ -205,18 +205,6 @@ malign-double
> Target Report Mask(ALIGN_DOUBLE) Save
> Align some doubles on dword boundary.
>
> -malign-functions=
> -Target RejectNegative Joined UInteger
> -Function starts are aligned to this power of 2.
> -
> -malign-jumps=
> -Target RejectNegative Joined UInteger
> -Jump targets are aligned to this power of 2.
> -
> -malign-loops=
> -Target RejectNegative Joined UInteger
> -Loop code aligned to this power of 2.
> -
> malign-stringops
> Target RejectNegative Report InverseMask(NO_ALIGN_STRINGOPS,
> ALIGN_STRINGOPS) Save
> Align destination of the string operations.
Instead of removing the above definitions, please rather redefine them
in a similar way -mcpu in i386.opt is obsoleted, e.g.:
malign-functions=
Target RejectNegative Joined Undocumented Alias(falign-functions=)
Warn(%<-malign-functions%> is obsolete, use %<-falign-functions%>)
This cleanup should be done a long time ago, the patch can be
committed independently of other patches in the series.
Uros.
