From patchwork Mon Jul 15 15:22:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 11044477 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BAD74138D for ; Mon, 15 Jul 2019 15:23:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AAA8E284C0 for ; Mon, 15 Jul 2019 15:23:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9EA00284FC; Mon, 15 Jul 2019 15:23:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2F378284F0 for ; Mon, 15 Jul 2019 15:23:43 +0000 (UTC) Received: from localhost ([::1]:40112 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hn2pK-0000on-7V for patchwork-qemu-devel@patchwork.kernel.org; Mon, 15 Jul 2019 11:23:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47457) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hn2ox-0007c0-43 for qemu-devel@nongnu.org; Mon, 15 Jul 2019 11:23:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hn2ow-0001ez-0t for qemu-devel@nongnu.org; Mon, 15 Jul 2019 11:23:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36548) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hn2ot-0001c2-Gs; Mon, 15 Jul 2019 11:23:15 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BA401C057F3D; Mon, 15 Jul 2019 15:23:14 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.205.87]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BEA5A608C6; Mon, 15 Jul 2019 15:23:08 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Mon, 15 Jul 2019 17:22:25 +0200 Message-Id: <20190715152225.26135-6-philmd@redhat.com> In-Reply-To: <20190715152225.26135-1-philmd@redhat.com> References: <20190715152225.26135-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Mon, 15 Jul 2019 15:23:14 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [RFC PATCH-for-4.1? v2 5/5] target/mips: Add stubs to build with CONFIG_SEMIHOSTING disabled X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Thomas Huth , Aleksandar Rikalo , James Hogan , Riku Voipio , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, Aleksandar Markovic , Paolo Bonzini , James Hogan , =?utf-8?q?Alex_Benn=C3=A9e?= , Aurelien Jarno Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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é --- default-configs/mips-softmmu-common.mak | 2 +- target/mips/Makefile.objs | 3 ++- target/mips/mips-semi-stubs.c | 22 ++++++++++++++++++++++ 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 target/mips/mips-semi-stubs.c diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips-softmmu-common.mak index da29c6c0b2..08fa16191f 100644 --- a/default-configs/mips-softmmu-common.mak +++ b/default-configs/mips-softmmu-common.mak @@ -1,6 +1,6 @@ # Common mips*-softmmu CONFIG defines -# CONFIG_SEMIHOSTING is always required on this architecture +# CONFIG_SEMIHOSTING is probably not required on KVM only builds CONFIG_SEMIHOSTING=y CONFIG_ISA_BUS=y 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..b1d3f88edc --- /dev/null +++ b/target/mips/mips-semi-stubs.c @@ -0,0 +1,22 @@ +/* + * Unified Hosting Interface syscalls stubs + * + * Copyright (c) 2019 Red Hat, Inc. + * + * Author: + * Philippe Mathieu-Daudé + * + * 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" +#include "exec/helper-proto.h" + +void helper_do_semihosting(CPUMIPSState *env) +{ + g_assert_not_reached(); +}