aboutsummaryrefslogtreecommitdiff
path: root/target/nios2
diff options
context:
space:
mode:
authorRichard Henderson <richard.henderson@linaro.org>2022-04-21 08:16:42 -0700
committerRichard Henderson <richard.henderson@linaro.org>2022-04-26 08:16:40 -0700
commitd2a11b40a42051fe3ed846a0014c3a7ac89780bb (patch)
tree1b46114a769c6b3892b661bd8075adc12463cb2e /target/nios2
parentfb4de9d2357bc42048a3ed3fcd15d8036e4c94a7 (diff)
downloadqemu-d2a11b40a42051fe3ed846a0014c3a7ac89780bb.zip
qemu-d2a11b40a42051fe3ed846a0014c3a7ac89780bb.tar.gz
qemu-d2a11b40a42051fe3ed846a0014c3a7ac89780bb.tar.bz2
target/nios2: Build helper.c for system only
Remove the #ifdef !defined(CONFIG_USER_ONLY) that surrounds the whole file, and move helper.c to nios2_softmmu_ss. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Message-Id: <20220421151735.31996-12-richard.henderson@linaro.org>
Diffstat (limited to 'target/nios2')
-rw-r--r--target/nios2/helper.c3
-rw-r--r--target/nios2/meson.build7
2 files changed, 6 insertions, 4 deletions
diff --git a/target/nios2/helper.c b/target/nios2/helper.c
index 55b8fb0..04a8831 100644
--- a/target/nios2/helper.c
+++ b/target/nios2/helper.c
@@ -28,7 +28,7 @@
#include "exec/helper-proto.h"
#include "semihosting/semihost.h"
-#if !defined(CONFIG_USER_ONLY)
+
void nios2_cpu_do_interrupt(CPUState *cs)
{
Nios2CPU *cpu = NIOS2_CPU(cs);
@@ -292,4 +292,3 @@ bool nios2_cpu_tlb_fill(CPUState *cs, vaddr address, int size,
env->regs[CR_BADADDR] = address;
cpu_loop_exit_restore(cs, retaddr);
}
-#endif /* !CONFIG_USER_ONLY */
diff --git a/target/nios2/meson.build b/target/nios2/meson.build
index 62b3847..2bd60ba 100644
--- a/target/nios2/meson.build
+++ b/target/nios2/meson.build
@@ -1,14 +1,17 @@
nios2_ss = ss.source_set()
nios2_ss.add(files(
'cpu.c',
- 'helper.c',
'nios2-semi.c',
'op_helper.c',
'translate.c',
))
nios2_softmmu_ss = ss.source_set()
-nios2_softmmu_ss.add(files('monitor.c', 'mmu.c'))
+nios2_softmmu_ss.add(files(
+ 'helper.c',
+ 'monitor.c',
+ 'mmu.c'
+))
target_arch += {'nios2': nios2_ss}
target_softmmu_arch += {'nios2': nios2_softmmu_ss}