diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 272f60343377..8a729436f1e1 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2017-04-11  Richard Earnshaw  <rearnsha@arm.com>
+
+	PR target/80389
+	* config/arm/arm.c (arm_configure_build_target): When -mcpu and -arch
+	conflict, set target->arch_name instead of target->cpu_name.
+
 2017-04-11  Richard Biener  <rguenther@suse.de>
 
 	PR tree-optimization/80374
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index a9b61a339425..a2d80cfd6459 100644
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -3098,15 +3098,15 @@ arm_configure_build_target (struct arm_build_target *target,
 		arm_selected_tune = arm_selected_cpu;
 
 	      arm_selected_cpu = arm_selected_arch;
+	      target->arch_name = arm_selected_arch->name;
 	    }
 	  else
 	    {
 	      /* Architecture and CPU are essentially the same.
 		 Prefer the CPU setting.  */
 	      arm_selected_arch = NULL;
+	      target->core_name = arm_selected_cpu->name;
 	    }
-
-	  target->core_name = arm_selected_cpu->name;
 	}
       else
 	{