aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Hutton <joel.hutton@arm.com>2020-02-28 14:46:26 +0000
committerJoel Hutton <joel.hutton@arm.com>2020-02-28 15:19:00 +0000
commit349297b6e69c5af74ed26a333488b1bf994dbcce (patch)
tree66de16ce9a110dc3cabea2f5070191f7c5f8cde5
parenta15350157862db3631772b4ae69a9c9e3b0fab6e (diff)
downloadgcc-349297b6e69c5af74ed26a333488b1bf994dbcce.zip
gcc-349297b6e69c5af74ed26a333488b1bf994dbcce.tar.gz
gcc-349297b6e69c5af74ed26a333488b1bf994dbcce.tar.bz2
Fix misleading aarch64 mcpu/march warning string
The message for conflicting mcpu and march previously printed the architecture of the CPU instead of the CPU name, as well as omitting the extensions to the march string. This patch corrects both errors. This patch fixes PR target/87612. 2020-02-27 Joel Hutton <Joel.Hutton@arm.com> PR target/87612 * config/aarch64/aarch64.c (aarch64_override_options): Fix misleading warning string.
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/config/aarch64/aarch64.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1992369..f6a9ae2 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2020-02-27 Joel Hutton <Joel.Hutton@arm.com>
+
+ PR target/87612
+ * config/aarch64/aarch64.c (aarch64_override_options): Fix
+ misleading warning string.
+
2020-02-27 Martin Sebor <msebor@redhat.com>
* doc/invoke.texi (-Wbuiltin-declaration-mismatch): Fix a typo.
diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
index f53c98e..4b9747b 100644
--- a/gcc/config/aarch64/aarch64.c
+++ b/gcc/config/aarch64/aarch64.c
@@ -14131,8 +14131,8 @@ aarch64_override_options (void)
if (selected_arch->arch != selected_cpu->arch)
{
warning (0, "switch %<-mcpu=%s%> conflicts with %<-march=%s%> switch",
- all_architectures[selected_cpu->arch].name,
- selected_arch->name);
+ aarch64_cpu_string,
+ aarch64_arch_string);
}
aarch64_isa_flags = arch_isa;
explicit_arch = selected_arch->arch;