diff options
| author | James Greenhalgh <james.greenhalgh@arm.com> | 2014-01-20 11:32:32 +0000 |
|---|---|---|
| committer | James Greenhalgh <jgreenhalgh@gcc.gnu.org> | 2014-01-20 11:32:32 +0000 |
| commit | ffee7aa91a16a2a037aee7f96dd635df18cd7109 (patch) | |
| tree | 0f72a08d989156923d4ad477e3da76e54d4867d2 /gcc/common | |
| parent | c716977996bb5b73c3ab8dd7c14215697d5eed19 (diff) | |
| download | gcc-ffee7aa91a16a2a037aee7f96dd635df18cd7109.zip gcc-ffee7aa91a16a2a037aee7f96dd635df18cd7109.tar.gz gcc-ffee7aa91a16a2a037aee7f96dd635df18cd7109.tar.bz2 | |
[AArch64] Fix behaviour of -mcpu option to match ARM.
gcc/
* common/config/aarch64/aarch64-common.c
(aarch64_handle_option): Don't handle any option order logic here.
* config/aarch64/aarch64.c (aarch64_parse_arch): Do not override
selected_cpu, warn on architecture version mismatch.
(aarch64_override_options): Fix parsing order for option strings.
From-SVN: r206803
Diffstat (limited to 'gcc/common')
| -rw-r--r-- | gcc/common/config/aarch64/aarch64-common.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/gcc/common/config/aarch64/aarch64-common.c b/gcc/common/config/aarch64/aarch64-common.c index 135a9bc..6107007 100644 --- a/gcc/common/config/aarch64/aarch64-common.c +++ b/gcc/common/config/aarch64/aarch64-common.c @@ -52,10 +52,10 @@ static const struct default_options aarch_option_optimization_table[] = /* Implement TARGET_HANDLE_OPTION. This function handles the target specific options for CPU/target selection. - march wins over mcpu, so when march is defined, mcpu takes the same value, - otherwise march remains undefined. mtune can be used with either march or - mcpu. If march and mcpu are used together, the rightmost option wins. - mtune can be used with either march or mcpu. */ + -mcpu=CPU is shorthand for -march=ARCH_FOR_CPU, -mtune=CPU. + If either of -march or -mtune is given, they override their + respective component of -mcpu. This logic is implemented + in config/aarch64/aarch64.c:aarch64_override_options. */ static bool aarch64_handle_option (struct gcc_options *opts, @@ -70,12 +70,10 @@ aarch64_handle_option (struct gcc_options *opts, { case OPT_march_: opts->x_aarch64_arch_string = arg; - opts->x_aarch64_cpu_string = arg; return true; case OPT_mcpu_: opts->x_aarch64_cpu_string = arg; - opts->x_aarch64_arch_string = NULL; return true; case OPT_mtune_: |