diff --git a/gas/ChangeLog b/gas/ChangeLog
index 5fda819abcc..e74ff8ec532 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2017-03-24  Thomas preud'homme  <thomas.preudhomme@arm.com>
+
+	* config/tc-arm.: (md_begin): Set selected_cpu from *mcpu_cpu_opt when
+	CPU_DEFAULT is defined.
+
 2017-03-21  Palmer Dabbbelt  <palmer@dabbelt.com>
 
 	* config/tc-riscv.c (md_show_usage): Remode defuct -m32, -m64,
diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index ef6b609d087..bbfe634a64a 100644
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -25040,8 +25040,8 @@ md_begin (void)
       mcpu_cpu_opt = &cpu_default;
       selected_cpu = cpu_default;
     }
-  else if (no_cpu_selected ())
-    selected_cpu = cpu_default;
+  else
+    selected_cpu = *mcpu_cpu_opt;
 #else
   if (mcpu_cpu_opt)
     selected_cpu = *mcpu_cpu_opt;