From: "Alex Bennée" <alex.bennee@linaro.org>
To: "Philippe Mathieu-Daudé" <philmd@redhat.com>
Cc: Peter Maydell <peter.maydell@linaro.org>,
Aleksandar Rikalo <arikalo@wavecomp.com>,
Richard Henderson <richard.henderson@linaro.org>,
qemu-devel@nongnu.org, qemu-arm@nongnu.org,
Aleksandar Markovic <amarkovic@wavecomp.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Miroslav Rezanina <mrezanin@redhat.com>,
Aurelien Jarno <aurelien@aurel32.net>
Subject: Re: [Qemu-devel] [RFC PATCH 1/2] target/arm: Add stubs to build with CONFIG_SEMIHOSTING disabled
Date: Mon, 17 Jun 2019 16:19:55 +0100 [thread overview]
Message-ID: <878su09r38.fsf@zen.linaroharston> (raw)
In-Reply-To: <20190531154735.20809-2-philmd@redhat.com>
Philippe Mathieu-Daudé <philmd@redhat.com> writes:
> If a distribution wants to build QEMU without semihosting support,
> it currently gets this build failure:
>
> $ ./configure --target-list=aarch64-softmmu --without-default-devices
> $ sed -i s/CONFIG_SEMIHOSTING=y/CONFIG_SEMIHOSTING=n/default-configs/arm-softmmu.mak
I'm still not convinced we should be adding support for stuff being done
outside the normal build process... that said...
> $ make subdir-aarch64-softmmu
> [...]
> LINK aarch64-softmmu/qemu-system-aarch64
> /usr/bin/ld: target/arm/arm-semi.o: in function `do_arm_semihosting':
> ./target/arm/arm-semi.c:321: undefined reference to `qemu_semihosting_console_out'
> /usr/bin/ld: ./target/arm/arm-semi.c:318: undefined reference to `qemu_semihosting_console_out'
> collect2: error: ld returned 1 exit status
> make[1]: *** [Makefile:204: qemu-system-aarch64] Error 1
> make: *** [Makefile:472: subdir-aarch64-softmmu] Error 2
>
> Fix it by providing a stub when semihosting is disabled.
>
> Reported-by: Miroslav Rezanina <mrezanin@redhat.com>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> target/arm/Makefile.objs | 3 ++-
> target/arm/arm-semi-stubs.c | 21 +++++++++++++++++++++
> 2 files changed, 23 insertions(+), 1 deletion(-)
> create mode 100644 target/arm/arm-semi-stubs.c
>
> diff --git a/target/arm/Makefile.objs b/target/arm/Makefile.objs
> index 6bdcc65c2c..39b02b1fa4 100644
> --- a/target/arm/Makefile.objs
> +++ b/target/arm/Makefile.objs
> @@ -1,4 +1,5 @@
> -obj-y += arm-semi.o
> +obj-$(CONFIG_SEMIHOSTING) += arm-semi.o
> +obj-$(call lnot,$(CONFIG_SEMIHOSTING)) += arm-semi-stubs.o
> obj-$(CONFIG_SOFTMMU) += machine.o psci.o arch_dump.o monitor.o
> obj-$(CONFIG_KVM) += kvm.o
> obj-$(call land,$(CONFIG_KVM),$(call lnot,$(TARGET_AARCH64))) += kvm32.o
> diff --git a/target/arm/arm-semi-stubs.c b/target/arm/arm-semi-stubs.c
> new file mode 100644
> index 0000000000..a91ecbd9d5
> --- /dev/null
> +++ b/target/arm/arm-semi-stubs.c
> @@ -0,0 +1,21 @@
> +/*
> + * Arm "Angel" semihosting 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"
> +
> +target_ulong do_arm_semihosting(CPUARMState *env)
> +{
> + g_assert_not_reached();
> +}
Could this not just be added to arm-semi.c in an
#ifndef CONFIG_SEMIHOSTING
target_ulong do_arm_semihosting(CPUARMState *env)
{
g_assert_not_reached();
}
#else
... rest of arm-semi.c....
#endif
--
Alex Bennée
next prev parent reply other threads:[~2019-06-17 16:11 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 [this message]
2019-06-17 15:33 ` Philippe Mathieu-Daudé
2019-06-18 12:02 ` Philippe Mathieu-Daudé
2019-05-31 15:47 ` [Qemu-devel] [RFC PATCH 2/2] target/mips: " Philippe Mathieu-Daudé
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=878su09r38.fsf@zen.linaroharston \
--to=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=philmd@redhat.com \
--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).