From patchwork Fri May 31 15:47:34 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: 1108416 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45Fplp0zFxz9s3l for ; Sat, 1 Jun 2019 01:49:08 +1000 (AEST) Received: from localhost ([127.0.0.1]:45413 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWjmD-0005uW-TP for incoming@patchwork.ozlabs.org; Fri, 31 May 2019 11:49:05 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60391) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWjlX-0005tF-Li for qemu-devel@nongnu.org; Fri, 31 May 2019 11:48:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hWjlW-0003Ki-If for qemu-devel@nongnu.org; Fri, 31 May 2019 11:48:23 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46544) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hWjlU-0002Vf-2b; Fri, 31 May 2019 11:48:20 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0619B80B3F; Fri, 31 May 2019 15:47:58 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-73.brq.redhat.com [10.40.204.73]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B5DC310027B8; Fri, 31 May 2019 15:47:49 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Fri, 31 May 2019 17:47:34 +0200 Message-Id: <20190531154735.20809-2-philmd@redhat.com> In-Reply-To: <20190531154735.20809-1-philmd@redhat.com> References: <20190531154735.20809-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Fri, 31 May 2019 15:47:59 +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 1/2] target/arm: Add stubs to build with CONFIG_SEMIHOSTING disabled X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Aleksandar Rikalo , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , qemu-arm@nongnu.org, Aleksandar Markovic , Paolo Bonzini , Miroslav Rezanina , =?utf-8?q?Alex_Benn=C3=A9e?= , Aurelien Jarno Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 $ 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 Signed-off-by: Philippe Mathieu-Daudé --- 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é + * + * 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(); +} From patchwork Fri May 31 15:47:35 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: 1108431 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45FqFz0rSSz9sB8 for ; Sat, 1 Jun 2019 02:11:50 +1000 (AEST) Received: from localhost ([127.0.0.1]:45904 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWk8C-0006sz-J2 for incoming@patchwork.ozlabs.org; Fri, 31 May 2019 12:11:48 -0400 Received: from eggs.gnu.org ([209.51.188.92]:35190) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hWk4q-0004JG-4I for qemu-devel@nongnu.org; Fri, 31 May 2019 12:08:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hWjqJ-0004q2-5Q for qemu-devel@nongnu.org; Fri, 31 May 2019 11:53:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44976) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hWjlQ-0002z9-98; Fri, 31 May 2019 11:48:16 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4F5467E43D; Fri, 31 May 2019 15:48:07 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-73.brq.redhat.com [10.40.204.73]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BDB151001E6F; Fri, 31 May 2019 15:47:58 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Fri, 31 May 2019 17:47:35 +0200 Message-Id: <20190531154735.20809-3-philmd@redhat.com> In-Reply-To: <20190531154735.20809-1-philmd@redhat.com> References: <20190531154735.20809-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Fri, 31 May 2019 15:48:07 +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 2/2] target/mips: Add stubs to build with CONFIG_SEMIHOSTING disabled X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Aleksandar Rikalo , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , qemu-arm@nongnu.org, Aleksandar Markovic , Paolo Bonzini , Miroslav Rezanina , =?utf-8?q?Alex_Benn=C3=A9e?= , Aurelien Jarno Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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é --- 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é + * + * 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(); +}