From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a17:907:9874:b0:a31:23a7:2a34 with SMTP id ko20csp742807ejc; Fri, 26 Jan 2024 00:41:17 -0800 (PST) X-Google-Smtp-Source: AGHT+IF4QH9hslVp8D2E7vrK9f65Fn4/YaLxV/IDh0eLsoRTONp5JYSlgc886rn2cSz9EODSp9SO X-Received: by 2002:a05:622a:1309:b0:42a:1ee3:add1 with SMTP id v9-20020a05622a130900b0042a1ee3add1mr1112213qtk.110.1706258477369; Fri, 26 Jan 2024 00:41:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706258477; cv=none; d=google.com; s=arc-20160816; b=PszxfrrYupJicZi9vk5Fp8Z7zQqodd5Y0xlvKdrSbiSpjyl7NbWVnnS/n1vvzCmJO3 Vs2keONayRdMM2cqcjKnoKXd8EpxhG2Hq31ryIsaNMyIpFZdcEIscDiIyXeOcdy1IfsS mh3QRaOpqHvT+YbqL7nagIBf4CKCB1UUWy0ST5dTA9vFku8QFzkAHWkSittnprIjsOZF gCI5cM32FEx7FqeqgdEbvOOhYWeYMAbLPe1nev68TtRHE5pjivMCWafslidplSXWAok8 Yi2IOn+Q9mlUc/tI+nHb7ZFr3JfeqHDsOfFLLmMMthkbPjX6s4d4m/eCSre1zOgG+yCi iGUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=wpCHFQ+Q7ZokEYTyUg93u3zevpKOJQR/LQ1ziXupeeA=; fh=4MFjWk99T14cOfrd/QAZZe1F8g1v4KV8Ub1F9CwTKmk=; b=BJ66QpbKxJ/PaDW+fghffMTMgdameW9v/WnUP6qWtHlBQCYBwxUrOjHN22OasunQh0 f54kCODhmkyPMNMLICsCF/+6usqQwHN+tb5BtdOnTQi6vhQI/TsAWDlCrBKuXJGLY7Jp vedGcBARFrR3ZK9gqRSk4pF5zDoEZyFgsNzBB2ziZTyjCu6xI8BcM3WXKPACFhumTrkY iQ1Z7qXmit4l7pCBzr8mXLD5H/GU1MyFTpoU2i1sVXsK3CzpPXyqOfykrwwEjTgbIgKA PbhiPLLhvDGK9MXLwyBF+zXpsdRlIBc+amSNa2pq5aNhOCBI9wDSFYOhALs29Om+dL2l XoQg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=E6rzN6EU; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id t10-20020a05622a148a00b0042a7031c21fsi767446qtx.369.2024.01.26.00.41.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 Jan 2024 00:41:17 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=E6rzN6EU; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rTHlD-0000Ii-EP; Fri, 26 Jan 2024 03:40:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rTHl3-0008He-UC for qemu-arm@nongnu.org; Fri, 26 Jan 2024 03:40:19 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rTHl1-0002Sd-6c for qemu-arm@nongnu.org; Fri, 26 Jan 2024 03:40:17 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1706258413; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wpCHFQ+Q7ZokEYTyUg93u3zevpKOJQR/LQ1ziXupeeA=; b=E6rzN6EUMqCDtAftMYBeI9XEqzbHlPSvD+pgVnJnErg1Ho5zfAaOpWJOmS1vJ312bbzTYH R8YppBLyXTniZyx+8z9fMgO00nc6a49hmYvtvYj4l3aDotb5OCfnGOAEJCr9n8FN0bMD6H 0i03y2PfZoop5ESPYtKiO3XAhGJcoTA= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-288-_gJ5-bDIO-y8iccZ4Y6hFA-1; Fri, 26 Jan 2024 03:40:07 -0500 X-MC-Unique: _gJ5-bDIO-y8iccZ4Y6hFA-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8ABF7885622; Fri, 26 Jan 2024 08:40:07 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.193.161]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1646F492BFA; Fri, 26 Jan 2024 08:40:05 +0000 (UTC) From: Thomas Huth To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Cc: Peter Maydell , Fabiano Rosas , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 2/3] target/arm/tcg/m_helper.c: Include the full helpers only with CONFIG_ARM_V7M Date: Fri, 26 Jan 2024 09:40:00 +0100 Message-ID: <20240126084001.879548-3-thuth@redhat.com> In-Reply-To: <20240126084001.879548-1-thuth@redhat.com> References: <20240126084001.879548-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.10 Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.5, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-arm@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org X-TUID: EPLhwzVml4Oh If CONFIG_ARM_V7M is not set, we don't want to include the full-fledged helper functions that require additional functions for linking. The reduced set of the linux-user functions works fine as stubs in this case, so change the #ifdef statement accordingly. Signed-off-by: Thomas Huth --- target/arm/tcg/m_helper.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target/arm/tcg/m_helper.c b/target/arm/tcg/m_helper.c index d1f1e02acc..a5a6e96fc3 100644 --- a/target/arm/tcg/m_helper.c +++ b/target/arm/tcg/m_helper.c @@ -22,6 +22,7 @@ #endif #if !defined(CONFIG_USER_ONLY) #include "hw/intc/armv7m_nvic.h" +#include CONFIG_DEVICES #endif static void v7m_msr_xpsr(CPUARMState *env, uint32_t mask, @@ -69,7 +70,7 @@ uint32_t arm_v7m_mrs_control(CPUARMState *env, uint32_t secure) return value; } -#ifdef CONFIG_USER_ONLY +#if defined(CONFIG_USER_ONLY) || !defined(CONFIG_ARM_V7M) void HELPER(v7m_msr)(CPUARMState *env, uint32_t maskreg, uint32_t val) { -- 2.43.0