From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
"Aleksandar Rikalo" <arikalo@wavecomp.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
qemu-arm@nongnu.org,
"Aleksandar Markovic" <amarkovic@wavecomp.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Miroslav Rezanina" <mrezanin@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Aurelien Jarno" <aurelien@aurel32.net>
Subject: [Qemu-devel] [RFC PATCH 2/2] target/mips: Add stubs to build with CONFIG_SEMIHOSTING disabled
Date: Fri, 31 May 2019 17:47:35 +0200 [thread overview]
Message-ID: <20190531154735.20809-3-philmd@redhat.com> (raw)
In-Reply-To: <20190531154735.20809-1-philmd@redhat.com>
If a distribution wants to build QEMU without semihosting support,
it currently gets this build failure:
$ ./configure --target-list=mips64el-softmmu --without-default-devices
$ sed -i s/CONFIG_SEMIHOSTING=y/CONFIG_SEMIHOSTING=n/ default-configs/mips-softmmu-common.mak
$ make subdir-mips64el-softmmu
[...]
LINK mips64el-softmmu/qemu-system-mips64el
/usr/bin/ld: target/mips/mips-semi.o: in function `helper_do_semihosting':
./target/mips/mips-semi.c:335: undefined reference to `qemu_semihosting_log_out'
/usr/bin/ld: ./target/mips/mips-semi.c:338: undefined reference to `qemu_semihosting_log_out'
collect2: error: ld returned 1 exit status
make[1]: *** [Makefile:204: qemu-system-mips64el] Error 1
make: *** [Makefile:472: subdir-mips64el-softmmu] Error 2
Fix it by providing a stub when semihosting is disabled.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
checkpatch ERROR: externs should be avoided in .c files
---
target/mips/Makefile.objs | 3 ++-
target/mips/mips-semi-stubs.c | 23 +++++++++++++++++++++++
2 files changed, 25 insertions(+), 1 deletion(-)
create mode 100644 target/mips/mips-semi-stubs.c
diff --git a/target/mips/Makefile.objs b/target/mips/Makefile.objs
index 3448ad5e19..3f4d566a35 100644
--- a/target/mips/Makefile.objs
+++ b/target/mips/Makefile.objs
@@ -1,5 +1,6 @@
obj-y += translate.o dsp_helper.o op_helper.o lmi_helper.o helper.o cpu.o
obj-y += gdbstub.o msa_helper.o
-obj-$(CONFIG_SOFTMMU) += mips-semi.o
+obj-$(CONFIG_SEMIHOSTING) += mips-semi.o
+obj-$(call lnot,$(CONFIG_SEMIHOSTING)) += mips-semi-stubs.o
obj-$(CONFIG_SOFTMMU) += machine.o cp0_timer.o
obj-$(CONFIG_KVM) += kvm.o
diff --git a/target/mips/mips-semi-stubs.c b/target/mips/mips-semi-stubs.c
new file mode 100644
index 0000000000..f5b13b9153
--- /dev/null
+++ b/target/mips/mips-semi-stubs.c
@@ -0,0 +1,23 @@
+/*
+ * Unified Hosting Interface syscalls stubs
+ *
+ * Copyright (c) 2019 Red Hat, Inc.
+ *
+ * Author:
+ * Philippe Mathieu-Daudé <philmd@redhat.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ */
+
+#include "qemu/osdep.h"
+#include "cpu.h"
+
+extern void helper_do_semihosting(CPUMIPSState *env);
+
+void helper_do_semihosting(CPUMIPSState *env)
+{
+ g_assert_not_reached();
+}
--
2.20.1
next prev parent reply other threads:[~2019-05-31 16:12 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-31 15:47 [Qemu-devel] [RFC PATCH 0/2] target: Build with CONFIG_SEMIHOSTING disabled Philippe Mathieu-Daudé
2019-05-31 15:47 ` [Qemu-devel] [RFC PATCH 1/2] target/arm: Add stubs to build " Philippe Mathieu-Daudé
2019-06-17 15:19 ` Alex Bennée
2019-06-17 15:33 ` Philippe Mathieu-Daudé
2019-06-18 12:02 ` Philippe Mathieu-Daudé
2019-05-31 15:47 ` Philippe Mathieu-Daudé [this message]
2019-05-31 16:18 ` [Qemu-devel] [RFC PATCH 0/2] target: Build " no-reply
2019-05-31 16:21 ` Peter Maydell
2019-05-31 16:40 ` Philippe Mathieu-Daudé
2019-05-31 16:54 ` Miroslav Rezanina
2019-05-31 17:04 ` Peter Maydell
2019-06-01 9:34 ` Alex Bennée
2019-06-01 9:41 ` Peter Maydell
2019-06-03 8:11 ` Paolo Bonzini
2019-06-15 10:26 ` Philippe Mathieu-Daudé
2019-06-16 15:29 ` Aleksandar Markovic
2019-05-31 17:06 ` 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=20190531154735.20809-3-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=amarkovic@wavecomp.com \
--cc=arikalo@wavecomp.com \
--cc=aurelien@aurel32.net \
--cc=mrezanin@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.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).