[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [RFC PATCH 2/2] target/mips: Add stubs to build with CONFIG_S
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-arm] [RFC PATCH 2/2] target/mips: Add stubs to build with CONFIG_SEMIHOSTING disabled |
Date: |
Fri, 31 May 2019 17:47:35 +0200 |
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é <address@hidden>
---
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é <address@hidden>
+ *
+ * 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