From patchwork Mon Jul 15 15:22:24 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: 1132082 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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45nS3v5d32z9sRp for ; Tue, 16 Jul 2019 01:23:55 +1000 (AEST) Received: from localhost ([::1]:40117 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hn2pV-0001Ck-OY for incoming@patchwork.ozlabs.org; Mon, 15 Jul 2019 11:23:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47374) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hn2oq-00078z-Cb for qemu-devel@nongnu.org; Mon, 15 Jul 2019 11:23:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hn2op-0001Ya-7L for qemu-devel@nongnu.org; Mon, 15 Jul 2019 11:23:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53388) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hn2om-0001WK-OO; Mon, 15 Jul 2019 11:23:08 -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 F1910307D851; Mon, 15 Jul 2019 15:23:07 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.205.87]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 53539608E4; Mon, 15 Jul 2019 15:22:58 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Mon, 15 Jul 2019 17:22:24 +0200 Message-Id: <20190715152225.26135-5-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.48]); Mon, 15 Jul 2019 15:23:08 +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 4/5] target/arm: 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 , Miroslav Rezanina , James Hogan , =?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é --- default-configs/arm-softmmu.mak | 2 +- target/arm/Makefile.objs | 3 ++- target/arm/arm-semi-stubs.c | 21 +++++++++++++++++++++ 3 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 target/arm/arm-semi-stubs.c diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index ad2debf543..bf34bcb137 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -1,6 +1,6 @@ # Default configuration for arm-softmmu -# CONFIG_SEMIHOSTING is always required on this architecture +# CONFIG_SEMIHOSTING is not required on KVM only builds CONFIG_SEMIHOSTING=y # TODO: ARM_V7M is currently always required - make this more flexible! diff --git a/target/arm/Makefile.objs b/target/arm/Makefile.objs index 5cafc1eb6c..4afaf82bbe 100644 --- a/target/arm/Makefile.objs +++ b/target/arm/Makefile.objs @@ -1,4 +1,5 @@ -obj-$(CONFIG_TCG) += arm-semi.o +obj-$(CONFIG_SEMIHOSTING) += arm-semi.o +obj-$(call lnot,$(CONFIG_SEMIHOSTING)) += arm-semi-stubs.o obj-y += helper.o vfp_helper.o obj-y += cpu.o gdbstub.o obj-$(TARGET_AARCH64) += cpu64.o gdbstub64.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(); +}