[PATCH v2 15/18] target/riscv: Compile arch_dump.c once

[Anton Johansson via qemu development]

Reviewed-by: Pierrick Bouvier <pierrick.bouv...@oss.qualcomm.com>
Signed-off-by: Anton Johansson <a...@rev.ng>
---
 target/riscv/arch_dump.c | 13 +++++++------
 target/riscv/meson.build |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/target/riscv/arch_dump.c b/target/riscv/arch_dump.c
index 12b6879907..3276c00128 100644
--- a/target/riscv/arch_dump.c
+++ b/target/riscv/arch_dump.c
@@ -17,7 +17,8 @@
  */
 
 #include "qemu/osdep.h"
-#include "cpu.h"
+#include "qemu/target-info.h"
+#include "target/riscv/cpu.h"
 #include "elf.h"
 #include "system/dump.h"
 
@@ -175,11 +176,11 @@ int cpu_get_dump_info(ArchDumpInfo *info,
 
     info->d_machine = EM_RISCV;
 
-#if defined(TARGET_RISCV64)
-    info->d_class = ELFCLASS64;
-#else
-    info->d_class = ELFCLASS32;
-#endif
+    if (target_riscv64()) {
+        info->d_class = ELFCLASS64;
+    } else {
+        info->d_class = ELFCLASS32;
+    }
 
     info->d_endian = (env->mstatus & MSTATUS_UBE) != 0 ?
                      ELFDATA2MSB : ELFDATA2LSB;
diff --git a/target/riscv/meson.build b/target/riscv/meson.build
index 8d0b3ed4ce..28a6ff8553 100644
--- a/target/riscv/meson.build
+++ b/target/riscv/meson.build
@@ -22,7 +22,6 @@ riscv_stubs_ss = ss.source_set()
 
 riscv_system_ss = ss.source_set()
 riscv_system_ss.add(files(
-  'arch_dump.c',
   'monitor.c',
   'machine.c',
   'time_helper.c',
@@ -36,6 +35,7 @@ riscv_user_ss.add(files(
 ))
 
 riscv_common_system_ss.add(files(
+  'arch_dump.c',
   'cpu.c',
   'riscv-qmp-cmds.c',
 ))

-- 
2.52.0