From patchwork Wed May 21 22:34:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 891556 Delivered-To: patch@linaro.org Received: by 2002:adf:e88a:0:b0:3a3:61c9:c5d4 with SMTP id d10csp2355256wrm; Wed, 21 May 2025 15:37:16 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU25BOZHwy1mZSh/2IaSltWe90Ky5OUyDdk2DvhLpzK5PrVHuZoqfK3sKBYW11D/p3GvEIrMg==@linaro.org X-Google-Smtp-Source: AGHT+IG3OyPq/ZFnjGiuoz3BW8+2IKvFoKgWJbH17MysJ/WB02jeLLiEN3No1ZI/JAUECTiA/eRm X-Received: by 2002:a05:622a:558e:b0:494:7a16:18e3 with SMTP id d75a77b69052e-494b07ea341mr371366731cf.29.1747867036179; Wed, 21 May 2025 15:37:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747867036; cv=none; d=google.com; s=arc-20240605; b=irPEGeUgCXtTfnnxbQYknUPkCm7q2cpQ4lWrS62m0+QsLsXUIFvmvkLklS8GxmRR2n qz4yfWceQ67UoMWCSgFzN3yfv48ll+FmGp2xbgfDyCxUwPpgWTkQrVNAqDPd+UubDmV1 oHR9SJ8Ukfa0tZHZISNvgf8EHEFqU+h6DTFZncdK8IqonsLXin/Ujr4gCIUbsJFWcTAU nFf+APs5ORDpIMpeZz+vezhwyNeMnOs26NPVkPESQTj5Mye+cn+01OYEtT+a73/JxrQF 6CcunZvlhUlbNWpSq+3KBeg1plJ9lWi/REdbx1eBz0HS6v4c5XZlL6mmK+NMwCmodB5M zO6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=0FmrrYF727TSqjvHbt0O4AI+WunPG75VXnTztBP8v6U=; fh=jpZTer8Lnp0ij2TL+T2yfvfY/N/1F7aXXNGwiZkGqro=; b=DB9GgsQkNUlHAYjwgSzlBeV1FaWtSVW8R7c1ZL0vXmp777Tk9HepGqBDjiraYvheiC Q/tSstlrrINAx4LrFOarmBvG8n/xZi877IWRqTZzMQb6kctVmFZ0Cu76VX5/QVujvF9f NlvApbhZTk74uSHRNB97uSSLVNcQIMfHqzAivahu4vehemD1Tha6wE3wZGrlbvNo9A3Q xhtGRuqKhK4xfjTmVQpYndc1GpMthVYDWeBT6LGvGVIWtt1A1xN4zsDEk0OnOLZLKxA7 MUfQDrKm8C7F9ltBTfRt1fSlss2c/rSGqFdhmrmgAcmCl2bZpiMuHxBvwHj8Oe8pzDdB qQ7w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=OUNje9TI; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-494ae4346fcsi152259541cf.136.2025.05.21.15.37.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 21 May 2025 15:37:16 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=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=@linaro.org header.s=google header.b=OUNje9TI; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uHs1R-0001Xw-TL; Wed, 21 May 2025 18:34:49 -0400 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 1uHs1M-0001WT-1d for qemu-devel@nongnu.org; Wed, 21 May 2025 18:34:44 -0400 Received: from mail-pf1-x42c.google.com ([2607:f8b0:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uHs15-00050C-5o for qemu-devel@nongnu.org; Wed, 21 May 2025 18:34:42 -0400 Received: by mail-pf1-x42c.google.com with SMTP id d2e1a72fcca58-74068f95d9fso6467212b3a.0 for ; Wed, 21 May 2025 15:34:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747866865; x=1748471665; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0FmrrYF727TSqjvHbt0O4AI+WunPG75VXnTztBP8v6U=; b=OUNje9TIaxKNZduRuMZJfjJl630dw+CnZ+/KhxhhZDESkfn+RsVapJb4V10Dxmaynd hxYc+A/aTMQpkQctC8isqAdNlxp3dPjvWJmii2M/LrtmYRlQSXNhaem2exI04tlB/CvH jXq3lJhbP50vddQfzkkKbUERGM4vFxtNq7rsNqcjnlWLERsqJZmhSggu2jkDuyJAQakt OF5zOA4D9I5nDqc5dW8ZVX9sTSsdbGEF5NaiejpqjQphRYrGOOvd4txv7L8UpQpG4+9f tWrC/H/y/otTasD0vPtry4vNRaL73+ALVnbiP6W9loSbtHsngIOz+YVkglCNez0D6V3g bgqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747866865; x=1748471665; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0FmrrYF727TSqjvHbt0O4AI+WunPG75VXnTztBP8v6U=; b=mIoGGnQj+R6GJfnRXADi/yzWNSNrykhZHbkNMN7e/b+RIrcsqOHrbEIzmMl+Ql/Qbn dhdzZ9uoZ87w12WKfXZYG4TobeYTz4x9PbybbRWuZ26pCOZh2NRs31zv1AC8I0NEb7mK UnNF5szCdnTHTPNnbCkAvcMQMqBW/bjLI6hLO3Ddkd1KbdrQqNCzFWiUGJo+N3cRi91Q WTeEf4wI4MGpljhii6MsXnndS2yx1J18206v1YWfHMO5rvQV+yakNUqb/VQ/bMoS5kMD wP0fBsgV4bIs9tA5a103PPOdmJ2ZOmk5XXNkV4+C2+Uh6QagMT6nJegUNe4FJTSjHPsI SbJg== X-Gm-Message-State: AOJu0YygzPght4IYq3dznKJDDiiFXrclYMjVNqXUyo+FJ+KPjJt3uUhY BYKgoOqFdbdIldH5MrdAzDGQoxFwAey3mLxLx0fWJ7EI1BmzPfydVV6Z42d345XvLSm70+uhFkx JsWvQ X-Gm-Gg: ASbGnct+m7ElGIW59Vz0qydhe20Vo8BxlsyXAaSKGI/mZwSSGa0Hqq03Pf4dqInj1Zj laMIIXnExOpdngCPC9sdXXNFWUPai4mq8sczo8ssNnpXkl2fEIktJkfaFdyVHfdYxA6Og8Vdz/3 OMBT9xL8pjGwvKhZPd4CGShQAgLw6UiOrI4CnxY1P9CnAkFm2k1RQkO3eW+2QdS+v4wcH1go+Co 9qVb5FniMn/oUHJpDKUFuA7Tu5xMNWUC/Ga+zd7rlelfGyeTmyt64HDazPsazOAz2R9OJyUV8os ysEx4oqKxaX1NDVAVib43ti2UXaF+DY0mAafAbdKMZy7/Tpt3Co= X-Received: by 2002:a05:6a00:3d11:b0:736:5438:ccc with SMTP id d2e1a72fcca58-742accc6b24mr26657538b3a.9.1747866865441; Wed, 21 May 2025 15:34:25 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b26eaf5a31dsm10165224a12.2.2025.05.21.15.34.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 May 2025 15:34:25 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , Richard Henderson , Peter Maydell , Paolo Bonzini , thuth@redhat.com, =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= Subject: [PATCH v2 4/7] meson: apply target config for picking files from lib{system, user} Date: Wed, 21 May 2025 15:34:11 -0700 Message-ID: <20250521223414.248276-5-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250521223414.248276-1-pierrick.bouvier@linaro.org> References: <20250521223414.248276-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42c; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pf1-x42c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, T_SPF_HELO_TEMPERROR=0.01, T_SPF_TEMPERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@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-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org semihosting code needs to be included only if CONFIG_SEMIHOSTING is set. However, this is a target configuration, so we need to apply it to the lib{system, user}_ss. As well, this prepares merging lib{system, user}_ss with {system, user}_ss. Acked-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- meson.build | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/meson.build b/meson.build index d803ec47221..22eb2f04e09 100644 --- a/meson.build +++ b/meson.build @@ -4101,27 +4101,19 @@ common_ss.add(qom, qemuutil) common_ss.add_all(when: 'CONFIG_SYSTEM_ONLY', if_true: [system_ss]) common_ss.add_all(when: 'CONFIG_USER_ONLY', if_true: user_ss) -libuser_ss = libuser_ss.apply({}) libuser = static_library('user', - libuser_ss.sources() + genh, + libuser_ss.all_sources() + genh, c_args: ['-DCONFIG_USER_ONLY', '-DCOMPILING_SYSTEM_VS_USER'], - dependencies: libuser_ss.dependencies(), + dependencies: libuser_ss.all_dependencies(), build_by_default: false) -libuser = declare_dependency(objects: libuser.extract_all_objects(recursive: false), - dependencies: libuser_ss.dependencies()) -common_ss.add(when: 'CONFIG_USER_ONLY', if_true: libuser) -libsystem_ss = libsystem_ss.apply({}) libsystem = static_library('system', - libsystem_ss.sources() + genh, + libsystem_ss.all_sources() + genh, c_args: ['-DCONFIG_SOFTMMU', '-DCOMPILING_SYSTEM_VS_USER'], - dependencies: libsystem_ss.dependencies(), + dependencies: libsystem_ss.all_dependencies(), build_by_default: false) -libsystem = declare_dependency(objects: libsystem.extract_all_objects(recursive: false), - dependencies: libsystem_ss.dependencies()) -common_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: libsystem) # Note that this library is never used directly (only through extract_objects) # and is not built by default; therefore, source files not used by the build @@ -4365,6 +4357,16 @@ foreach target : target_dirs objects += lib.extract_objects(src.sources()) arch_deps += src.dependencies() endif + if target_type == 'system' + src = libsystem_ss.apply(config_target, strict: false) + objects += libsystem.extract_objects(src.sources()) + arch_deps += src.dependencies() + endif + if target_type == 'user' + src = libuser_ss.apply(config_target, strict: false) + objects += libuser.extract_objects(src.sources()) + arch_deps += src.dependencies() + endif if target_type == 'system' and target_base_arch in hw_common_arch_libs src = hw_common_arch[target_base_arch].apply(config_target, strict: false) lib = hw_common_arch_libs[target_base_arch]