From d800a1e76ae4c5ed1425e89c9f416b28ae7df82b Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Tue, 17 Jul 2018 11:21:41 +0200 Subject: [PATCH] Define MAX_CODE_ALIGN globally. 2018-07-17 Martin Liska * align.h (MAX_CODE_ALIGN): New. (MAX_CODE_ALIGN_VALUE): New. * common/config/i386/i386-common.c (ix86_handle_option): (MAX_CODE_ALIGN): Moved to align.h. * final.c (MAX_CODE_ALIGN): Likewise. * opts.c (parse_and_check_align_values): (MAX_CODE_ALIGN): Likewise. (MAX_CODE_ALIGN_VALUE): Likewise. From-SVN: r262806 --- gcc/ChangeLog | 11 +++++++++++ gcc/align.h | 4 ++++ gcc/common/config/i386/i386-common.c | 3 --- gcc/final.c | 1 - gcc/opts.c | 4 ---- 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index fe754fae619..ccc824cfbe7 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,14 @@ +2018-07-17 Martin Liska + + * align.h (MAX_CODE_ALIGN): New. + (MAX_CODE_ALIGN_VALUE): New. + * common/config/i386/i386-common.c (ix86_handle_option): + (MAX_CODE_ALIGN): Moved to align.h. + * final.c (MAX_CODE_ALIGN): Likewise. + * opts.c (parse_and_check_align_values): + (MAX_CODE_ALIGN): Likewise. + (MAX_CODE_ALIGN_VALUE): Likewise. + 2018-07-17 Martin Liska * config/i386/att.h (ASM_OUTPUT_ALIGN): Fix spacing diff --git a/gcc/align.h b/gcc/align.h index 5a5d6c752a3..9acce47cf9b 100644 --- a/gcc/align.h +++ b/gcc/align.h @@ -74,3 +74,7 @@ struct align_flags align_flags_tuple levels[2]; }; + +/* Define maximum supported code alignment. */ +#define MAX_CODE_ALIGN 16 +#define MAX_CODE_ALIGN_VALUE (1 << MAX_CODE_ALIGN) diff --git a/gcc/common/config/i386/i386-common.c b/gcc/common/config/i386/i386-common.c index 277ee55a093..70b3c3f2fc3 100644 --- a/gcc/common/config/i386/i386-common.c +++ b/gcc/common/config/i386/i386-common.c @@ -1318,9 +1318,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) diff --git a/gcc/final.c b/gcc/final.c index 59eb75c3d63..445a3fe938a 100644 --- a/gcc/final.c +++ b/gcc/final.c @@ -842,7 +842,6 @@ shorten_branches (rtx_insn *first) rtx_insn *insn; int max_uid; int i; -#define MAX_CODE_ALIGN 16 rtx_insn *seq; int something_changed = 1; char *varying_length; diff --git a/gcc/opts.c b/gcc/opts.c index e536607fe79..0625b15b27b 100644 --- a/gcc/opts.c +++ b/gcc/opts.c @@ -1805,10 +1805,6 @@ parse_and_check_align_values (const char *flag, return false; } - /* Comes from final.c -- no real reason to change it. */ -#define MAX_CODE_ALIGN 16 -#define MAX_CODE_ALIGN_VALUE (1 << MAX_CODE_ALIGN) - for (unsigned i = 0; i < result_values.length (); i++) if (result_values[i] > MAX_CODE_ALIGN_VALUE) { -- 2.30.2