From 62785b09987359ede74a98fac11343827f7181af Mon Sep 17 00:00:00 2001 From: Thomas Preud'homme Date: Fri, 24 Mar 2017 13:22:16 +0000 Subject: [PATCH] [GAS/ARM] Fix selected_cpu with default CPU and -mcpu When GAS is compiled with DEFAULT_CPU set and then run with a -mcpu or -march option, selected_cpu will be set to the default CPU. This means the -mcpu is ignored which is surprising behavior. This commit instead sets selected_cpu from the value passed to -mcpu/-march. 2017-03-24 Thomas preud'homme gas/ * config/tc-arm.: (md_begin): Set selected_cpu from *mcpu_cpu_opt when CPU_DEFAULT is defined. --- gas/ChangeLog | 5 +++++ gas/config/tc-arm.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) 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 + + * config/tc-arm.: (md_begin): Set selected_cpu from *mcpu_cpu_opt when + CPU_DEFAULT is defined. + 2017-03-21 Palmer Dabbbelt * 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; -- 2.30.2