From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Subject: [PATCH v4 2/3] target/nios2: Move nios2-semi.c to nios2_softmmu_ss
Date: Tue, 7 Jun 2022 19:38:15 -0700 [thread overview]
Message-ID: <20220608023816.759426-3-richard.henderson@linaro.org> (raw)
In-Reply-To: <20220608023816.759426-1-richard.henderson@linaro.org>
Semihosting is not enabled for nios2-linux-user.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/nios2/nios2-semi.c | 5 -----
target/nios2/meson.build | 4 ++--
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/target/nios2/nios2-semi.c b/target/nios2/nios2-semi.c
index bdf8849689..55061bb2dc 100644
--- a/target/nios2/nios2-semi.c
+++ b/target/nios2/nios2-semi.c
@@ -22,14 +22,9 @@
*/
#include "qemu/osdep.h"
-
#include "cpu.h"
#include "exec/gdbstub.h"
-#if defined(CONFIG_USER_ONLY)
-#include "qemu.h"
-#else
#include "semihosting/softmmu-uaccess.h"
-#endif
#include "qemu/log.h"
#define HOSTED_EXIT 0
diff --git a/target/nios2/meson.build b/target/nios2/meson.build
index 2bd60ba306..c6e2243cc3 100644
--- a/target/nios2/meson.build
+++ b/target/nios2/meson.build
@@ -1,7 +1,6 @@
nios2_ss = ss.source_set()
nios2_ss.add(files(
'cpu.c',
- 'nios2-semi.c',
'op_helper.c',
'translate.c',
))
@@ -10,7 +9,8 @@ nios2_softmmu_ss = ss.source_set()
nios2_softmmu_ss.add(files(
'helper.c',
'monitor.c',
- 'mmu.c'
+ 'mmu.c',
+ 'nios2-semi.c',
))
target_arch += {'nios2': nios2_ss}
--
2.34.1
next prev parent reply other threads:[~2022-06-08 2:42 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-08 2:38 [PATCH v4 0/3] target/nios2: semihosting cleanup Richard Henderson
2022-06-08 2:38 ` [PATCH v4 1/3] target/nios2: Eliminate nios2_semi_is_lseek Richard Henderson
2022-06-09 10:33 ` Peter Maydell
2022-06-10 13:33 ` Philippe Mathieu-Daudé via
2022-06-08 2:38 ` Richard Henderson [this message]
2022-06-09 10:36 ` [PATCH v4 2/3] target/nios2: Move nios2-semi.c to nios2_softmmu_ss Peter Maydell
2022-06-20 22:04 ` Richard Henderson
2022-06-21 8:52 ` Peter Maydell
2022-06-10 13:33 ` Philippe Mathieu-Daudé via
2022-06-08 2:38 ` [PATCH v4 3/3] target/nios2: Use semihosting/syscalls.h Richard Henderson
2022-06-09 10:39 ` Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220608023816.759426-3-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).