From nobody Fri Dec 19 17:37:25 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1747373320; cv=none; d=zohomail.com; s=zohoarc; b=VCg8ZTQqDq+nP3cZIcoEwHvyO2gHXz8RIhsCWi7j+nW6lqFHXnW8HXKx1GcptoLRYOta714CWYsZrRYvOfrHCBvLBS1PNcBC4aOurbiIe1Bm8vj29z09yRA+Ea6NZCM+1PWJWANOZcJyNNrZ0LxsebPPgy3swHJjaVWAKtp0rSw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747373320; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=kEF4F6w/QQ4yK0T92qmZBuHANuJnFGe0fNZ2771Yy/Q=; b=Tfp75T3/WL9XDURumR3RfD3ANTx+1ApgBYCFZGCiOPhejqyE2vXF6Tp6JyF3ySlr49hcvnW5pfWl+BfB/6/Lp8gjY3O77Y/gyKxaGX3mtoNkzfAQWOkLtZ26jzw9ulu+CUA1Oc3p11Au70RudU2yv7+QhCTHgQcQ7BUjwV3b4uU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1747373320375274.2071144905832; Thu, 15 May 2025 22:28:40 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uFnbO-0006Fw-J3; Fri, 16 May 2025 01:27:22 -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 1uFnbM-0006D5-OI for qemu-devel@nongnu.org; Fri, 16 May 2025 01:27:20 -0400 Received: from mail-pg1-x535.google.com ([2607:f8b0:4864:20::535]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFnbL-0001Mb-4a for qemu-devel@nongnu.org; Fri, 16 May 2025 01:27:20 -0400 Received: by mail-pg1-x535.google.com with SMTP id 41be03b00d2f7-af51596da56so1281229a12.0 for ; Thu, 15 May 2025 22:27:18 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-231d4ebabfesm6539135ad.174.2025.05.15.22.27.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 22:27:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747373238; x=1747978038; 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=kEF4F6w/QQ4yK0T92qmZBuHANuJnFGe0fNZ2771Yy/Q=; b=rVa5Mla92LYkP8LjojtiTtRaSW0X/c6swHheVMT456CGqntskJvoWTj659jPQR3RZS vy5XgqD1XnrswYhAO8OVmGEoyJLFBFdVHywREcMNCpBmuuyjwGFXQYib2N7Pv4Ehe5qq Sa3mf4A55DjJMjE+7FUVTaoldpKxkYqUC8/W9yP+ikL5yzHAgfS2rZWBg4BdT5TKS+tG HHJd1OCxqobSKzFlkBPrstjzPIec2l0zIFyQrwq/o3rV2Hg626EbsAA9A+2rdffh0ng5 uNqAOG+E4J15CneeLO85XKG0WUlWrs3EHe+DpixTbNdGffDp0f6v20kMZc0fO1fNHKDz PJcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747373238; x=1747978038; 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=kEF4F6w/QQ4yK0T92qmZBuHANuJnFGe0fNZ2771Yy/Q=; b=fASfMrgWDURzVRQn+s02t3JjVa0U5aZC1RrKpnlJz7/g4ofcnYY9e1KICs8vQjR1BU FjFILRA+EH7jKwIwQDY/ICkrortXrmPOICM08fICZMJ7kh+ZFnLeOrLj4uke7+08k7PA EWRZoo/55tHsUr02F9wuw/Ui0pK+rBufJNxvSScl25/oMmW31GYPL7wvCODqeOGSMOb/ VOUVMPdd2J//eAIhjs6VWFxcRdlHaNsuNqZfoyi2Futq9PUt3HWmzb9xRxwaeuYO8Jhl ed8HK7clKzA/vUkUGZvJ5IBthDG2T/kQqj0RgjeYCLfVX5A21z7n6bs44/PcB6EzyUN6 RFhg== X-Gm-Message-State: AOJu0YzRzw6dcwu5YdrrrqgRngaf4NWRD0O+B+0l7ngeCavCBSwZVV54 8PFHftqQH/dfo0HBixrHfeiPSWK5o9oW4zyKgiHzcJ6mMVuYCRNjFwI1ffJbQG0wV4Cp54lOPSj R+tCT X-Gm-Gg: ASbGncsG6w0LwYKXO2tmGrNMfILxSukEGuJRMcnDIEivEUEZvMXW4FkVppnrYNYRW9R nQ1RcaY7LWmZHIwlWYjcVTXOZg2/YSp4drqsTilhZRpMJ9OxRZsHW3HyULkxyVvbztJuo3/mb2u GE+k+OQB0JLQXhMQkodChspdq9k7FJqcXXAzR/CRZpqDzUxKbm/5J3iN6lddBAKE/QyNDzOAzmf Ts87TXWkS9AE0DXNmXS8XXcIifQY2pz8WH5U+yTnxMVdZApIuL8P7CPf4nS0l1mVdIjO7n/L20N st+fmmsUM6ih9mKEiwgLGFTegtskVOelVFV9Xcz7/IyhG0enyAQ= X-Google-Smtp-Source: AGHT+IGPEveysat8bzRiYMukNhUVqpew1Z/2O4CApz/R//sdjAbc7lwW4sgret2LPc/WaP0OW/Xr2A== X-Received: by 2002:a17:902:d4d1:b0:224:721:ed9 with SMTP id d9443c01a7336-231d45ab656mr29851825ad.44.1747373237831; Thu, 15 May 2025 22:27:17 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Richard Henderson , Paolo Bonzini , berrange@redhat.com, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , thuth@redhat.com, Peter Maydell , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Pierrick Bouvier , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PATCH 1/6] meson: build target libraries with common dependencies Date: Thu, 15 May 2025 22:27:03 -0700 Message-ID: <20250516052708.930928-2-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250516052708.930928-1-pierrick.bouvier@linaro.org> References: <20250516052708.930928-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::535; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pg1-x535.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1747373321464116600 Content-Type: text/plain; charset="utf-8" As mentioned in 20250513115637.184940-1-thuth@redhat.com, dependencies were missing when compiling per target libraries, thus breaking compilation on certain host systems. We now explicitely add common dependencies to those libraries, so it solves the problem. Signed-off-by: Pierrick Bouvier Tested-by: Thomas Huth --- meson.build | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/meson.build b/meson.build index 49c8b0e5f6a..197fdc1c210 100644 --- a/meson.build +++ b/meson.build @@ -3259,6 +3259,7 @@ config_devices_mak_list =3D [] config_devices_h =3D {} config_target_h =3D {} config_target_mak =3D {} +config_base_arch_mak =3D {} =20 disassemblers =3D { 'alpha' : ['CONFIG_ALPHA_DIS'], @@ -3451,6 +3452,11 @@ foreach target : target_dirs config_all_devices +=3D config_devices endif config_target_mak +=3D {target: config_target} + + # build a merged config for all targets with the same TARGET_BASE_ARCH + target_base_arch =3D config_target['TARGET_BASE_ARCH'] + config_base_arch =3D config_base_arch_mak.get(target_base_arch, {}) + co= nfig_target + config_base_arch_mak +=3D {target_base_arch: config_base_arch} endforeach target_dirs =3D actual_target_dirs =20 @@ -4131,12 +4137,17 @@ common_all =3D static_library('common', hw_common_arch_libs =3D {} target_common_arch_libs =3D {} target_common_system_arch_libs =3D {} -foreach target : target_dirs +foreach target_base_arch, config_base_arch : config_base_arch_mak config_target =3D config_target_mak[target] - target_base_arch =3D config_target['TARGET_BASE_ARCH'] target_inc =3D [include_directories('target' / target_base_arch)] inc =3D [common_user_inc + target_inc] =20 + target_common =3D common_ss.apply(config_target, strict: false) + common_deps =3D [] + foreach dep: target_common.dependencies() + common_deps +=3D dep.partial_dependency(compile_args: true, includes: = true) + endforeach + # prevent common code to access cpu compile time definition, # but still allow access to cpu.h target_c_args =3D ['-DCPU_DEFS_H'] @@ -4151,7 +4162,7 @@ foreach target : target_dirs sources: src.all_sources() + genh, include_directories: inc, c_args: target_system_c_args, - dependencies: src.all_dependencies()) + dependencies: src.all_dependencies() + common_deps) hw_common_arch_libs +=3D {target_base_arch: lib} endif endif @@ -4165,7 +4176,7 @@ foreach target : target_dirs sources: src.all_sources() + genh, include_directories: inc, c_args: target_c_args, - dependencies: src.all_dependencies()) + dependencies: src.all_dependencies() + common_deps) target_common_arch_libs +=3D {target_base_arch: lib} endif endif @@ -4179,7 +4190,7 @@ foreach target : target_dirs sources: src.all_sources() + genh, include_directories: inc, c_args: target_system_c_args, - dependencies: src.all_dependencies()) + dependencies: src.all_dependencies() + common_deps) target_common_system_arch_libs +=3D {target_base_arch: lib} endif endif --=20 2.47.2 From nobody Fri Dec 19 17:37:25 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1747373335; cv=none; d=zohomail.com; s=zohoarc; b=C90cBHnHWc29lghW/xWPHhkqcUhNbgaDxkvpVi0rO5IJhs6YEFRcCKlNJGYvikA5JU1UcdGhDgsxfCrC+SOYhH+iZ+6aG82QGww6DBw6uXz5K79nL6eL9u8RwmJdL5lDpCRCO09ghx6hPY+5HJ3Z8DDR4DDfJ+PtSlr97x3+kzA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747373335; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=IEdpnrBOTPtpx4cupcWYpTpp82dk3nMUunAlRdaZgS0=; b=TBzIRv5ssJcuAgOsjL52cUXQk1Zq5j/M6Y2QB9KSf8TLA3LkZbBKDTvLsI1nQ/mdDp2CHquxO/9PCYOLpfCsVP/DcHmny1t/M3eoYeuqWltGHfoX2jXhPZvqdhhAEAV0f1jVW0xsOILNCBhpzwHdmwGTBroeMCOjAhop+6TCR8I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1747373335677411.99778597558736; Thu, 15 May 2025 22:28:55 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uFnbP-0006Gc-CR; Fri, 16 May 2025 01:27:24 -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 1uFnbN-0006EM-Gx for qemu-devel@nongnu.org; Fri, 16 May 2025 01:27:21 -0400 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFnbM-0001Mf-22 for qemu-devel@nongnu.org; Fri, 16 May 2025 01:27:21 -0400 Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-22fbbf9c01bso14480655ad.3 for ; Thu, 15 May 2025 22:27:19 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-231d4ebabfesm6539135ad.174.2025.05.15.22.27.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 22:27:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747373239; x=1747978039; 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=IEdpnrBOTPtpx4cupcWYpTpp82dk3nMUunAlRdaZgS0=; b=KgeZZyRtsTn1pbfWbPf7OmFekLJstXb4va4oM6wYmwW6nVDY9AYlN2jHAIhG9c2KtA ZFW9f8Fg5AWrKUHYSM1p45C33wykYEtBzFfCy/dglCm63OvSlUh7whYGwqJ65NgRqQaQ ERcuC/roUxOgaNKRY4xueCVwiMci66ipuA1piGp34VyGcwPM1XduGWsyIDbjzVGRnWGL IR6YuZtsZDmdziGo/2/6TX/DyWKagql8zOtGn/QityS4kqSjn61akrvq4uCA9jFHsPdE W9gMcQFQdJ8EFoxISj/sO5KAE5PnZVzxCB/3h7zu4gGhoFHrchpAfrcCuLlwJ2Xbc4JT KcrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747373239; x=1747978039; 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=IEdpnrBOTPtpx4cupcWYpTpp82dk3nMUunAlRdaZgS0=; b=P3u7U3p4jXQl7Ti8xNlfIrv2nVH8USCfE8lYQM9ikMfjfl5+ZfBK1i21unnw0EzDXx 4Rmml8bJFy4dvhhLNVitaTgHwdiwJSC6mRZAMpfwWuj7jtZ4m0VSV7RlwznXAmn5ALOz xFl4BOI3QqQyIM8Q0NQJgle1PQYz57jojz2WuCZBkgl9XNwMEHr3mCBneDjuu9dAao8F nQ+TWE8jF71ZP2u7nny7Eq4LyNTv4RC8yArrSeWx3zO5ZFBaCUMLb0N832T1tnX7CVqe gZ3kYp5MCmbdWa2RQfoRqoxG7eXABjEYzLZ4aIJGB9b1Emfdzb90c0SeIuOG/pOSEvwC prUw== X-Gm-Message-State: AOJu0Yx4zLUhPK4vvfISPACrqnlxmN++wl69iLlwlGUoEH33DmWBdgyb rmatzOVT2yFQAQ6wQgN9dX4R+3X9uzpGq1nRg2Ia4Y27owfxo2Mbt8ojqgSXYEd6lsXztjr43nW lCL6T X-Gm-Gg: ASbGnctVBP1WCoD4Fudhg/d3VoQiVAqwnfJcuIQnvsnZk+B0nPgNHQCADz1FFpMp3B/ zQu5568bMJ/nOJDJu1aPfs+PQnP7EC0QmavAPzeHdkKPlFgUT62/dw1+2oZBny8W1PA/latB71L wd9XSH/RXg75yZ7rLg1WBjTxoFbxONnkPLJRZwsIiLcaQjwGv6w7gM+rcu5kspVHyOoMsixTcFv zKevK5nUMeukxyYzxw2zV2mi9wo92vemZOQ2/yLEo8wYObzmUn96z+LJ025OJ8v4pdfWLmifX+Q b3Yx0jaa2jINsFlLbs7V2SvtHZwBne/IvqxQox6+6twiPRdeBsw= X-Google-Smtp-Source: AGHT+IG8yS0gLwkyDwSNXlvD7vuYuDr4qKJFC6ujr89xAT2mP/Rd0/mItn05JVXm/LkiYq+VmVjFdg== X-Received: by 2002:a17:903:1ace:b0:231:c90e:292d with SMTP id d9443c01a7336-231d45af19fmr28322365ad.44.1747373238737; Thu, 15 May 2025 22:27:18 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Richard Henderson , Paolo Bonzini , berrange@redhat.com, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , thuth@redhat.com, Peter Maydell , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Pierrick Bouvier , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PATCH 2/6] hw/arm: remove explicit dependencies listed Date: Thu, 15 May 2025 22:27:04 -0700 Message-ID: <20250516052708.930928-3-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250516052708.930928-1-pierrick.bouvier@linaro.org> References: <20250516052708.930928-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::636; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x636.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1747373337494116600 Content-Type: text/plain; charset="utf-8" Signed-off-by: Pierrick Bouvier Tested-by: Thomas Huth --- hw/arm/meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/arm/meson.build b/hw/arm/meson.build index 5098795f61d..d90be8f4c94 100644 --- a/hw/arm/meson.build +++ b/hw/arm/meson.build @@ -8,7 +8,7 @@ arm_common_ss.add(when: 'CONFIG_HIGHBANK', if_true: files('= highbank.c')) arm_common_ss.add(when: 'CONFIG_INTEGRATOR', if_true: files('integratorcp.= c')) arm_common_ss.add(when: 'CONFIG_MICROBIT', if_true: files('microbit.c')) arm_common_ss.add(when: 'CONFIG_MPS3R', if_true: files('mps3r.c')) -arm_common_ss.add(when: 'CONFIG_MUSICPAL', if_true: [pixman, files('musicp= al.c')]) +arm_common_ss.add(when: 'CONFIG_MUSICPAL', if_true: [files('musicpal.c')]) arm_common_ss.add(when: 'CONFIG_NETDUINOPLUS2', if_true: files('netduinopl= us2.c')) arm_common_ss.add(when: 'CONFIG_OLIMEX_STM32_H405', if_true: files('olimex= -stm32-h405.c')) arm_common_ss.add(when: 'CONFIG_NPCM7XX', if_true: files('npcm7xx.c', 'npc= m7xx_boards.c')) @@ -79,7 +79,7 @@ arm_common_ss.add(when: 'CONFIG_SX1', if_true: files('oma= p_sx1.c')) arm_common_ss.add(when: 'CONFIG_VERSATILE', if_true: files('versatilepb.c'= )) arm_common_ss.add(when: 'CONFIG_VEXPRESS', if_true: files('vexpress.c')) =20 -arm_common_ss.add(fdt, files('boot.c')) +arm_common_ss.add(files('boot.c')) =20 hw_arch +=3D {'arm': arm_ss} hw_common_arch +=3D {'arm': arm_common_ss} --=20 2.47.2 From nobody Fri Dec 19 17:37:25 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1747373324; cv=none; d=zohomail.com; s=zohoarc; b=NVyAJcKU1xrF4VMa6hsb609MvM7lLhb2MrJ1A+Neg+Dhz2R/uH9XquPtC/ORqafprUbOqSK5p6wnegHrre+7SIlYA/pGWBmidcL4qdHOGJh3UphjGtO4XCZKdunbPFzkZXV0Shs282I0XRn988t2S5vtqLL55jzp1+Zb1EsH1t4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747373324; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=dU3iAcSQrpRQtiTX04EuYFPrLnsx+BhMT5SxU3B5tJI=; b=IIZxU3XnetNCjyiyI8F11HnmPlATqgd5krLIfvo+FmDYKsir4iO5BEFKOX5en5jBBF7sS4wcTO/InETT5iuIyrBaGvynkKIL1VEFk8o4DR63SBXy+w2112TIZIVVZrCS3mfCpUCahzGkMDEntFnAA1c+Uwtaq84L/glYu3q7I9U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1747373324242699.6751862668809; Thu, 15 May 2025 22:28:44 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uFnbR-0006HX-EL; Fri, 16 May 2025 01:27:25 -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 1uFnbO-0006GF-Qs for qemu-devel@nongnu.org; Fri, 16 May 2025 01:27:22 -0400 Received: from mail-pl1-x62b.google.com ([2607:f8b0:4864:20::62b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFnbN-0001Mn-E5 for qemu-devel@nongnu.org; Fri, 16 May 2025 01:27:22 -0400 Received: by mail-pl1-x62b.google.com with SMTP id d9443c01a7336-23198fcdeb0so16710435ad.2 for ; Thu, 15 May 2025 22:27:20 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-231d4ebabfesm6539135ad.174.2025.05.15.22.27.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 22:27:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747373239; x=1747978039; 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=dU3iAcSQrpRQtiTX04EuYFPrLnsx+BhMT5SxU3B5tJI=; b=P3DH1mixMNf1IpGmQEV6E5ztBn3TKr61GoD3e4IEVmKeQLnyGpc0vpPPiOR8TX5JIB uErv0FiANSpvBJpk/wLq6+uIvGtR/XaimM8yussrzNWpouxrVNtlKazBes0i0jDoIfTj G78DI7DGaR1Jf3ao1Xfq0ZWc/udOz7etZ2K3fKssGk1INVt8HO5mh2ie0i/7KPQQfPR6 rxiOXzLEBIftsCTQdCsp2HC5QkXJMUPHZKV2JPm2+hKVpRzwHn5TT1roi0IJ24urkdg0 lORYwOKDTc56eYp0u3TByyE0EAD6scesrGYG9KxeNGeJhHgomyq9+Ymddkd1lschowW2 Wzog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747373240; x=1747978040; 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=dU3iAcSQrpRQtiTX04EuYFPrLnsx+BhMT5SxU3B5tJI=; b=sVmPqR5lFy6eQ2ux0/xpqcWSO30Wex96p066h30BlTI6SO3iE3YttyC7smwFUJFzOG Yk8ihJhpaK+lPuRG8GuIrsAUvpUsVmtxZRlX6++RrDYBmADdF/CYE32m8neq72UK5VP5 gZ3rx6+0p03Z4yeTiG1o5RTLXYCwEsTPeM5IYbsX1Hf/Rdt9VQn8peg6g7H1wOULJlL/ XF838SrsQ0k3I3JCzIBHw2lGsykoIx2/gogeO9fOG2e0P2UIAlky+8lYZIxQCwFQ3SsZ taLMfvuHE2Bys1YlImLATG1AY3V82B5oYv/VrM1h2ddFenRBY6aSnUSnn/KfPVAb+RHF hlgQ== X-Gm-Message-State: AOJu0YwbY1M1kfJWop887Gotn3QxOUNNKuo7237OJy8ohFwaCNbIZpP2 Sw9QUQoqE444D4QU4/pTAxYcYzPFd0KoiMxI8fik5MPNYh+PUKuLgWO6xTQ4g0JcUhzTJyXq+0a +uVi0 X-Gm-Gg: ASbGncspRrE40+SRdeZUjsFFm4n164PQdRZ9GqEE7JR1mISZB9C3f3CFDSCUOOC+Mx9 txL2n808YULV2HhGXkUmflNPClRxvWExrG3gdp5XvcQrXIIwikJN5D7gvyuKPbKJqldK1jaBmb4 iYLodFeYx7onh9wq+2ka8/pEp0Bi4gtZJFnyITD3N1/ou/o3OKlTw6n3NDyZ5GP1uLdXKmC1TeA 99ntpG2rO0e002lGKte377R8B04v831GCNuGONL9Nu5+x+mLeL/hpfwI0SazvCPPoiD5IBnrFtb FE3O/yonQkNcfThZt7yUB/s0j0/Up3tS3zqrLUyPGxV+RfVMjBa8aT/usbL63Q== X-Google-Smtp-Source: AGHT+IHlsntQRTzA6tNyetMsEEPrx3HoRDbc/aJ2UJGnQ6Br4wobIo8ayTB1XmOqMa5qL8Ouear3PQ== X-Received: by 2002:a17:902:e80c:b0:224:78e:4eb4 with SMTP id d9443c01a7336-231d45a9c3cmr24389565ad.39.1747373239691; Thu, 15 May 2025 22:27:19 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Richard Henderson , Paolo Bonzini , berrange@redhat.com, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , thuth@redhat.com, Peter Maydell , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Pierrick Bouvier , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PATCH 3/6] target/arm: remove explicit dependencies listed Date: Thu, 15 May 2025 22:27:05 -0700 Message-ID: <20250516052708.930928-4-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250516052708.930928-1-pierrick.bouvier@linaro.org> References: <20250516052708.930928-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::62b; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x62b.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1747373325528116600 Content-Type: text/plain; charset="utf-8" Signed-off-by: Pierrick Bouvier Tested-by: Thomas Huth --- target/arm/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/arm/meson.build b/target/arm/meson.build index b404fa54863..2ff7ed6e98f 100644 --- a/target/arm/meson.build +++ b/target/arm/meson.build @@ -28,7 +28,7 @@ arm_user_ss.add(files( 'vfp_fpscr.c', )) =20 -arm_common_system_ss.add(files('cpu.c'), capstone) +arm_common_system_ss.add(files('cpu.c')) arm_common_system_ss.add(when: 'TARGET_AARCH64', if_false: files( 'cpu32-stubs.c')) arm_common_system_ss.add(when: 'CONFIG_KVM', if_false: files('kvm-stub.c')) --=20 2.47.2 From nobody Fri Dec 19 17:37:25 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1747373309; cv=none; d=zohomail.com; s=zohoarc; b=UOqwlrYqTkL/1aESDIAXyRoNZX6qxpucqh6pD3gA9WpkOi7wAoVzVExE/rNY6Hj/3/Ly5gscVkuRjq+KwGfRE87Pm3sGGPNjyvVDMkiJjHUFpOjuXtFyTCeMLCZ3yblK46+qWPCsJI2BjPBdZB6yASRwDZkjzCGIQdacARkb+G0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747373309; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=RZ2uL7bC3soA9y6EO90cuXo0NZXixq/mNNsFQ78SaEM=; b=deNlwwo51b0GTUYHA5uEVCAJDYtbvjVIEztpyInFM4khOozQuIPO/4zX8TPMd9vtSPzWa1fo4takxyKWNdoCl2uBtBfNKEoub70op49MGFbc1KhFWkCM/2Y1bUooDm1OW9tETsjO8Lo3anX9lcuGnyfekhv5N1Oip55N/3LdmWk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1747373309582467.0061585878734; Thu, 15 May 2025 22:28:29 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uFnbS-0006Hj-3n; Fri, 16 May 2025 01:27:26 -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 1uFnbQ-0006Gs-9S for qemu-devel@nongnu.org; Fri, 16 May 2025 01:27:24 -0400 Received: from mail-pl1-x634.google.com ([2607:f8b0:4864:20::634]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFnbO-0001N5-7d for qemu-devel@nongnu.org; Fri, 16 May 2025 01:27:23 -0400 Received: by mail-pl1-x634.google.com with SMTP id d9443c01a7336-22e16234307so18470005ad.0 for ; Thu, 15 May 2025 22:27:21 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-231d4ebabfesm6539135ad.174.2025.05.15.22.27.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 22:27:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747373241; x=1747978041; 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=RZ2uL7bC3soA9y6EO90cuXo0NZXixq/mNNsFQ78SaEM=; b=rdBWn2GnTsFFoPiozSjitPKmd/j6s6FaWNvGDCbJjqxt1ps/3diE2lQAlE0pmPUCV0 YtAPHXTJvEvH0xQP/s2rUogF3A5tg7Z2R4qxk6kNiZ6d2sFC5mcyfQ9t/Jhganoq7UQd SlLfx8KVYmfpDG/7nc4OZFyqtQK3zTLOn2+9CKf0KXaYbdBwP4hcsMeL3vjOR9FZfwxd QybL1Top15PJFsDEVJ56ficEGqZGxisDoNz107U3y0i4tHDtJ3lqxcOcdFuaekZQHmOk n4KZmcixNFxXyXpzh57y5iIXZdJiPqq3xkoTCVNT0nOPtO2MBNlPy+NOo836FNt+jxr7 nYgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747373241; x=1747978041; 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=RZ2uL7bC3soA9y6EO90cuXo0NZXixq/mNNsFQ78SaEM=; b=q+DnRszRVFX/GxoIvvOd+sUEqmPCcMrFPZxTofYiYmFTO4diaY5vJ+Rci9L39YrM1Y 77uKhp3W08oNbTLslCP77T9ofDK9TQEBOXnVW7AYKtp0LEkK6g06MxmJQqEtZg5OHxkM TKHcX/rzEBkUoWBfLlz+U4w/btaZ2hxd4yUCEYgCXh6qX0NuOptNW+fmWRZ6o/enRuOc U2TbCM4fUS7oZiOVeORcrf0eGETfNfyYkNWynm2bM5UqxWFL+hLyaP0f2Olh5lRcsicB tkthVDQ1OhAXLhsCZQwHV4qKKz+kDcCwAXOxyWjYGBmAZnTTFDF0SAGyEWnDMEie49Ts csEg== X-Gm-Message-State: AOJu0YyC53dF/wjLQAVr8U4Zb7lem6BVGcyPzWzoRnAa3Msev0NnZdJi p4aVIO+rQ+9NYf8uKMjG/ODi5GDaeL47dupJC5gL5STmNnzWusEYJKykX/5K9Nsl+fUOCFJhEdz zy+r1 X-Gm-Gg: ASbGncsu0W4CGl9xMbWB+eNcusSFaJTLwijy71iNwziwl28mPTaw6CgJsHKEsO3n/ZA 7deSRFf6bvfi+afZz60pDN9a83XC2MYo23PqtYsFoEE91PYDnhPYbGzSex7wtZqvpe8KJICNCxU CQMJsPjDvAQ++wCQ+HBVtQIN1FFhxoGeXCfp+8n70ug+KuoGKgGjF3+uoRsJ7oCd/5suM32v1L8 ErV2zqDKdTTKmhvlFIG2lNnr9yJ3FiFfP09UhLxeou+KcSHAdF2dB6rVIrFwg8q+i7M1jeAC0le Jclf3Kh0l2KrBjDZXnkXOgMVbhYYT9XDXRJtXnp5mmux6jhER9Y= X-Google-Smtp-Source: AGHT+IEKXoDYhZw/QppgRZMTMgKXoLnbtyUY1tcDGzJrJaHFKiGzORTiAC5WdVlwJz+9fRNVbyRCiQ== X-Received: by 2002:a17:902:e803:b0:21f:2e:4e4e with SMTP id d9443c01a7336-231d4ae1dbemr24621885ad.5.1747373240683; Thu, 15 May 2025 22:27:20 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Richard Henderson , Paolo Bonzini , berrange@redhat.com, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , thuth@redhat.com, Peter Maydell , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Pierrick Bouvier , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PATCH 4/6] meson: apply target config for picking files from lib{system, user} Date: Thu, 15 May 2025 22:27:06 -0700 Message-ID: <20250516052708.930928-5-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250516052708.930928-1-pierrick.bouvier@linaro.org> References: <20250516052708.930928-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::634; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x634.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1747373311317116600 Content-Type: text/plain; charset="utf-8" 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 Tested-by: Thomas Huth --- meson.build | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/meson.build b/meson.build index 197fdc1c210..fadee0f29fa 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) =20 -libuser_ss =3D libuser_ss.apply({}) libuser =3D 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 =3D declare_dependency(objects: libuser.extract_all_objects(recurs= ive: false), - dependencies: libuser_ss.dependencies()) -common_ss.add(when: 'CONFIG_USER_ONLY', if_true: libuser) =20 -libsystem_ss =3D libsystem_ss.apply({}) libsystem =3D 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 =3D declare_dependency(objects: libsystem.extract_all_objects(re= cursive: false), - dependencies: libsystem_ss.dependencies()) -common_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: libsystem) =20 # Note that this library is never used directly (only through extract_obje= cts) # and is not built by default; therefore, source files not used by the bui= ld @@ -4365,6 +4357,16 @@ foreach target : target_dirs target_common =3D common_ss.apply(config_target, strict: false) objects =3D [common_all.extract_objects(target_common.sources())] arch_deps +=3D target_common.dependencies() + if target_type =3D=3D 'system' + src =3D libsystem_ss.apply(config_target, strict: false) + objects +=3D libsystem.extract_objects(src.sources()) + arch_deps +=3D src.dependencies() + endif + if target_type =3D=3D 'user' + src =3D libuser_ss.apply(config_target, strict: false) + objects +=3D libuser.extract_objects(src.sources()) + arch_deps +=3D src.dependencies() + endif if target_base_arch in target_common_arch_libs src =3D target_common_arch[target_base_arch].apply(config_target, stri= ct: false) lib =3D target_common_arch_libs[target_base_arch] --=20 2.47.2 From nobody Fri Dec 19 17:37:25 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1747373306; cv=none; d=zohomail.com; s=zohoarc; b=dcvUaRznz2iUr28UobnG6OdRZB8M8QvEjiw86s9v9b2Hsphev+3fTQya3nlJBo7SQAyOj7f+DNtGAi+wdexS2M79SV/UCKSyo6gZsrTO7mR6WcN9RRR3fRPKnrIgpWyG1X+iz/Lb8Lp//yB9P+qvJ3adfaS6GMldZpDNaAjizXw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747373306; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=kXBESZVUZ0qJuwgxJHdI3VR+MEIbN3bpMpEGJ/yalXg=; b=VoO6lrXgaFD1rtkxn8a69Hqe7QM0VyZgn+fKM/G0JoUYTz5csi5KRtJiM76SwGz+picruI6DePpgiWJN+ZeLdV2IQr3PHz/vKRRwR41xC+RY6KJOFxOLUVfEdflR8SISRjNisICXFmuWahbqL7dia0xp1SegUjegP2Ix1OkhAJE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1747373306210446.0582966351535; Thu, 15 May 2025 22:28:26 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uFnbT-0006Ie-2Y; Fri, 16 May 2025 01:27:27 -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 1uFnbR-0006HW-Ao for qemu-devel@nongnu.org; Fri, 16 May 2025 01:27:25 -0400 Received: from mail-pl1-x634.google.com ([2607:f8b0:4864:20::634]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFnbP-0001NL-Et for qemu-devel@nongnu.org; Fri, 16 May 2025 01:27:25 -0400 Received: by mail-pl1-x634.google.com with SMTP id d9443c01a7336-231d4679580so4642245ad.1 for ; Thu, 15 May 2025 22:27:22 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-231d4ebabfesm6539135ad.174.2025.05.15.22.27.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 22:27:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747373242; x=1747978042; 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=kXBESZVUZ0qJuwgxJHdI3VR+MEIbN3bpMpEGJ/yalXg=; b=OV6+ghR4XJLqcSAEn7IvPpjnpDkZpDcHFvAsHDGDBFFxsAQvIPbFr2y0zKMczmaBQw rEeBHKBBGqMCToQAUqf+JFlXNBORK9XnVmUafS1t3TDJcIDPJkO9zzGlg+a8F4LgQIQt wU8fkwDiYr/XPPXw6y4izJnu/OHaJJwYAVNUw2zGlAKu7cJBqnD8zaFbGsa9Rt1WxRzv Rhtq+DD2XVey5X/gkBOIjICTPNbFzjeLNm4tvx6L/JktivAFdiZl9V9aA9qg4im6v0dN 9nJfE96rjr3A2qLCxXTfK0mUqhvykIdLJJy9cD4GZk6I9ZdpZHwC6ndmjb9uWsCbe56w tJzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747373242; x=1747978042; 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=kXBESZVUZ0qJuwgxJHdI3VR+MEIbN3bpMpEGJ/yalXg=; b=UCR1ji1u2fiMEMkhQXGCqCufZOzVNeo6djnDbKQ5BMecyoKEHYQtxA/Fqo35lUAVcy pVGKpZ13XTnX4vcwXwKkLUPtfAVqKa8Sxnf6C+qp2obwS2r/B3AbNVhcGBQKidXe23EP wkytwVs509JW2tSQ6BOxLFf9+loLT3FNq8lyoJ/saTHmi/Ifcx22p+ggf1WIQHMpJnJD iw3bHElqszqWhCnS+3lbGbP8YnkzLNQTztK4GZpHuw407Am/zVWiWTDn30RpMfEd7dh3 EHNP9ltKgJeCK/qJaR2nYraVXwu/twWNVskUJLkku/2hnwcwm3FW4nw9v2EDMt/qygS6 vjBA== X-Gm-Message-State: AOJu0YxgIiLPNynWTP957UbPYTGfAfZyvZEnJDuvi2REo8tPol4HZ9hP OTAdfbai2i2ZMXEP9CnApX2i26oI0pVI2QPkMYjkRiGDj6DXnQ8f4wsokgp+ePGs3ocAVd+u89/ 2HS1S X-Gm-Gg: ASbGncsO8iMQGYSeDHZYNAQJS5xHvTc6D1x8F8DXSZBQS7icVzRm7ILOakkz0Z0yfaK eZdBq3EloAfwSO/B4qLIdpyeBLF8W/pWdmK3N4FTn2WpNuQ05+RZmQWgZuA03jis4hCHSgiFFNb ewcDyatTCNxF8rzdEkhwLLaOdr/Hvst/6v6+aUSqhmVq/cjuNbYZVGyHC1BTqonliy9YS7jeLEA GrlDi86/XKm/e2G+JRvrK2KWvG4hGS9FsU3hDKBnSUPT0mF6dapA2NPYMGs++2Oma5PXYhhJ0N5 z8nh7z3kOxQOSSXZfncD8csxF1EyBDvZsEhatDA+rWIevFOCGP8= X-Google-Smtp-Source: AGHT+IFWSzTIxUMXClaMsNx/3QmdW+19V3MhDwNmcN8ovzqJIbpz6ChBlTE76+P2d53FezPhRuoIUQ== X-Received: by 2002:a17:902:c948:b0:22f:c91f:d05f with SMTP id d9443c01a7336-231d45c99c7mr26113395ad.46.1747373241875; Thu, 15 May 2025 22:27:21 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Richard Henderson , Paolo Bonzini , berrange@redhat.com, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , thuth@redhat.com, Peter Maydell , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Pierrick Bouvier , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PATCH 5/6] meson: merge lib{system, user}_ss with {system, user}_ss. Date: Thu, 15 May 2025 22:27:07 -0700 Message-ID: <20250516052708.930928-6-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250516052708.930928-1-pierrick.bouvier@linaro.org> References: <20250516052708.930928-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::634; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x634.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1747373307360116600 Content-Type: text/plain; charset="utf-8" Now that target configuration can be applied to lib{system, user}_ss, there is no reason to keep that separate from the existing {system, user}_ss. We extract existing system/user code common common libraries to lib{system, user}. To not break existing meson files, we alias libsystem_ss to system_ss and libuser_ss to user_ss, so we can do the cleanup in next commit. Signed-off-by: Pierrick Bouvier Tested-by: Thomas Huth --- meson.build | 38 +++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/meson.build b/meson.build index fadee0f29fa..98b97fd7ba3 100644 --- a/meson.build +++ b/meson.build @@ -3712,14 +3712,14 @@ io_ss =3D ss.source_set() qmp_ss =3D ss.source_set() qom_ss =3D ss.source_set() system_ss =3D ss.source_set() -libsystem_ss =3D ss.source_set() +libsystem_ss =3D system_ss specific_fuzz_ss =3D ss.source_set() specific_ss =3D ss.source_set() rust_devices_ss =3D ss.source_set() stub_ss =3D ss.source_set() trace_ss =3D ss.source_set() user_ss =3D ss.source_set() -libuser_ss =3D ss.source_set() +libuser_ss =3D user_ss util_ss =3D ss.source_set() =20 # accel modules @@ -4098,21 +4098,19 @@ common_ss.add(hwcore) system_ss.add(authz, blockdev, chardev, crypto, io, qmp) common_ss.add(qom, qemuutil) =20 -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 =3D static_library('user', - libuser_ss.all_sources() + genh, + user_ss.all_sources() + genh, c_args: ['-DCONFIG_USER_ONLY', '-DCOMPILING_SYSTEM_VS_USER'], - dependencies: libuser_ss.all_dependencies(), + include_directories: common_user_inc, + dependencies: user_ss.all_dependencies(), build_by_default: false) =20 libsystem =3D static_library('system', - libsystem_ss.all_sources() + genh, + system_ss.all_sources() + genh, c_args: ['-DCONFIG_SOFTMMU', '-DCOMPILING_SYSTEM_VS_USER'], - dependencies: libsystem_ss.all_dependencies(), + dependencies: system_ss.all_dependencies(), build_by_default: false) =20 # Note that this library is never used directly (only through extract_obje= cts) @@ -4121,7 +4119,6 @@ libsystem =3D static_library('system', common_all =3D static_library('common', build_by_default: false, sources: common_ss.all_sources() + genh, - include_directories: common_user_inc, implicit_include_directories: false, dependencies: common_ss.all_dependencies()) =20 @@ -4135,10 +4132,20 @@ foreach target_base_arch, config_base_arch : config= _base_arch_mak inc =3D [common_user_inc + target_inc] =20 target_common =3D common_ss.apply(config_target, strict: false) + target_system =3D system_ss.apply(config_target, strict: false) + target_user =3D user_ss.apply(config_target, strict: false) common_deps =3D [] + system_deps =3D [] + user_deps =3D [] foreach dep: target_common.dependencies() common_deps +=3D dep.partial_dependency(compile_args: true, includes: = true) endforeach + foreach dep: target_system.dependencies() + system_deps +=3D dep.partial_dependency(compile_args: true, includes: = true) + endforeach + foreach dep: target_user.dependencies() + user_deps +=3D dep.partial_dependency(compile_args: true, includes: tr= ue) + endforeach =20 # prevent common code to access cpu compile time definition, # but still allow access to cpu.h @@ -4154,7 +4161,7 @@ foreach target_base_arch, config_base_arch : config_b= ase_arch_mak sources: src.all_sources() + genh, include_directories: inc, c_args: target_system_c_args, - dependencies: src.all_dependencies() + common_deps) + dependencies: src.all_dependencies() + common_deps + system_deps) hw_common_arch_libs +=3D {target_base_arch: lib} endif endif @@ -4168,7 +4175,8 @@ foreach target_base_arch, config_base_arch : config_b= ase_arch_mak sources: src.all_sources() + genh, include_directories: inc, c_args: target_c_args, - dependencies: src.all_dependencies() + common_deps) + dependencies: src.all_dependencies() + common_deps + + system_deps + user_deps) target_common_arch_libs +=3D {target_base_arch: lib} endif endif @@ -4182,7 +4190,7 @@ foreach target_base_arch, config_base_arch : config_b= ase_arch_mak sources: src.all_sources() + genh, include_directories: inc, c_args: target_system_c_args, - dependencies: src.all_dependencies() + common_deps) + dependencies: src.all_dependencies() + common_deps + system_deps) target_common_system_arch_libs +=3D {target_base_arch: lib} endif endif @@ -4358,12 +4366,12 @@ foreach target : target_dirs objects =3D [common_all.extract_objects(target_common.sources())] arch_deps +=3D target_common.dependencies() if target_type =3D=3D 'system' - src =3D libsystem_ss.apply(config_target, strict: false) + src =3D system_ss.apply(config_target, strict: false) objects +=3D libsystem.extract_objects(src.sources()) arch_deps +=3D src.dependencies() endif if target_type =3D=3D 'user' - src =3D libuser_ss.apply(config_target, strict: false) + src =3D user_ss.apply(config_target, strict: false) objects +=3D libuser.extract_objects(src.sources()) arch_deps +=3D src.dependencies() endif --=20 2.47.2 From nobody Fri Dec 19 17:37:25 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1747373335; cv=none; d=zohomail.com; s=zohoarc; b=MnUJGedURV4VjZDxNm/XLfuNqYG2HubzyE4wnD7KinGYOmXxnb6vz+o100T36zEhqDHPLNxZNN4ASToMKiyymTAmw7+j4PA98GxolTFqlsn9111QX69vei4hupcHJmKQkMKoGUDc5ppP9NzeXDkL+czNpi/uRefgDE5PRMa9tWI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747373335; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=bqGoY+CilUPAjO+dXO+6qxpClMsZaBn+YNo/aP57Mxk=; b=TryX90bBfTm5c28iqr5IO4m8JQinDw4/GppEoaQ6PdtbhDKLqBSRbBU99K47vfKsl+QaQIhepe/Y/Mmve6an48bnzWpHzkP+IsqHjrE+pG/vCRjkvfz3MdQ0p+z+ECHHORLPayAKfnf+6J3rDvOzzAuIvJUiC8IA1zhTnV9pgzI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1747373335760951.3362562660711; Thu, 15 May 2025 22:28:55 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uFnbT-0006Ji-MY; Fri, 16 May 2025 01:27:27 -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 1uFnbS-0006I1-Dd for qemu-devel@nongnu.org; Fri, 16 May 2025 01:27:26 -0400 Received: from mail-pl1-x62b.google.com ([2607:f8b0:4864:20::62b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFnbQ-0001NX-HN for qemu-devel@nongnu.org; Fri, 16 May 2025 01:27:26 -0400 Received: by mail-pl1-x62b.google.com with SMTP id d9443c01a7336-2317d94c9cdso16327785ad.2 for ; Thu, 15 May 2025 22:27:24 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-231d4ebabfesm6539135ad.174.2025.05.15.22.27.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 22:27:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747373243; x=1747978043; 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=bqGoY+CilUPAjO+dXO+6qxpClMsZaBn+YNo/aP57Mxk=; b=NYo/HDAtRxweDrkzLG7bg/UxrwrXIo1yZGfzHBffiIUHQDhEr8IetP0iF+SWorwuI7 QL76fRy4069miCmjtmyrganlE0T8cuS6SKCirOAxq0Os5QcGTedH+v5dO8R1zWjBNKcC PQ7DFn1FV0obcIu7VsBICpAUp+xcPxms9iKMq4hpAMvZPGsM+nDDKd9aM3t/7fSjFSpQ RAZLr3XPK+//CiO0HumkWt05MjtuxRyJehligkKJEoAUUgZyrtsH+5qY2kvFlO6PjZx4 65Ij+q95ptdIitnBMGuU+qngA6DC5Zni8lV64tBIQvkWFgzuBXot0c2PuvvWLX6D9Oiq cB/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747373243; x=1747978043; 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=bqGoY+CilUPAjO+dXO+6qxpClMsZaBn+YNo/aP57Mxk=; b=qQDxWO5QX/JULw78AJtp0MMHd7xLX4Ah/Ei1Xqy4ii4XmOQyWcwh3V6ATLVHYVmbpT 5VH4UQlmaIAO2VoGlqBC00DNl9uShjBqzxSsJAGB0cyUBSLGm7a49yjf/0zTe/xe2bAN m2SEpFcFsbfXJuIO6N6U+ue+4g5EO4LEC4iYLUjzP8OeBh3gYp0o9NzG2SsSedSPv3oQ CA1RSBoPBU2Ad+0M6fnR7YlnUQ/1BvOTkZydm+lorg/4S+fQwZ8PH8ir/MkwrBFYdjST +6bAIyxR/8bLl842nKgYHDKZM40nYQA9YTzuO/C6nUS/cdNlahzVZ7QRFK1AZ8LXCP3V MnRQ== X-Gm-Message-State: AOJu0Yy7CGTB4mUQFgQnozDfttoOYW3lUBB97BK32vCLdtb7gC75Iv7c d117+c8UfO7YskMc6nHagIhcS6uJYAuiluQedAo23sVRdPYs24yVKZOYO1HTH6XI3XwAvGALc7U MD+BR X-Gm-Gg: ASbGnctL/eGAd2R29jrdp/QFRT1ola9Sd5wCJPr+GT3P2vGrxSbLDI+HkFsDG4nryce yWCfFAOsvPgW/p4pnqTt4LnDfxGDbOQ5MVJ9o+vmLhPGSAS3WG9tZlG6FPX+9LmHRHJU/n3mtOz hIe9kGplc5cy0CynaopmFch/UJVOI+Xkjipc30BQh09i1mta+yN8Ytecoxwdq8MumGG/AfA47DA gu2KIyyp+3TMU3Dgt+mThcqtsWiSwX78kXn0vGp3NlheQ8ci4JUNTz4vfi43E4BrdAfMUhpnn7Q u+++XhP9t2+VSZQOehmBtCOTlqvwRmrE8VvTE84104IrvF92upA= X-Google-Smtp-Source: AGHT+IHdGcYnD7etgGjPSQyyFm3Ma+Ccyjo/gTj3QPh+peprcRePm5WJ3NdSJENJuHpiHdQ3OcU2Pw== X-Received: by 2002:a17:903:94f:b0:220:ea90:191e with SMTP id d9443c01a7336-231d43d9ca1mr25398015ad.4.1747373243077; Thu, 15 May 2025 22:27:23 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Richard Henderson , Paolo Bonzini , berrange@redhat.com, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , thuth@redhat.com, Peter Maydell , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Pierrick Bouvier , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PATCH 6/6] meson: remove lib{system, user}_ss aliases Date: Thu, 15 May 2025 22:27:08 -0700 Message-ID: <20250516052708.930928-7-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250516052708.930928-1-pierrick.bouvier@linaro.org> References: <20250516052708.930928-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::62b; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x62b.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1747373337539116600 Content-Type: text/plain; charset="utf-8" Signed-off-by: Pierrick Bouvier Tested-by: Thomas Huth --- meson.build | 2 -- accel/tcg/meson.build | 8 ++++---- gdbstub/meson.build | 4 ++-- hw/core/meson.build | 4 ++-- plugins/meson.build | 4 ++-- system/meson.build | 2 +- tcg/meson.build | 4 ++-- 7 files changed, 13 insertions(+), 15 deletions(-) diff --git a/meson.build b/meson.build index 98b97fd7ba3..7aca61a1e8f 100644 --- a/meson.build +++ b/meson.build @@ -3712,14 +3712,12 @@ io_ss =3D ss.source_set() qmp_ss =3D ss.source_set() qom_ss =3D ss.source_set() system_ss =3D ss.source_set() -libsystem_ss =3D system_ss specific_fuzz_ss =3D ss.source_set() specific_ss =3D ss.source_set() rust_devices_ss =3D ss.source_set() stub_ss =3D ss.source_set() trace_ss =3D ss.source_set() user_ss =3D ss.source_set() -libuser_ss =3D user_ss util_ss =3D ss.source_set() =20 # accel modules diff --git a/accel/tcg/meson.build b/accel/tcg/meson.build index 97d5e5a7112..575e92bb9e8 100644 --- a/accel/tcg/meson.build +++ b/accel/tcg/meson.build @@ -18,15 +18,15 @@ if get_option('plugins') tcg_ss.add(files('plugin-gen.c')) endif =20 -libuser_ss.add_all(tcg_ss) -libsystem_ss.add_all(tcg_ss) +user_ss.add_all(tcg_ss) +system_ss.add_all(tcg_ss) =20 -libuser_ss.add(files( +user_ss.add(files( 'user-exec.c', 'user-exec-stub.c', )) =20 -libsystem_ss.add(files( +system_ss.add(files( 'cputlb.c', 'icount-common.c', 'monitor.c', diff --git a/gdbstub/meson.build b/gdbstub/meson.build index b25db86767e..15c666f5752 100644 --- a/gdbstub/meson.build +++ b/gdbstub/meson.build @@ -5,13 +5,13 @@ # =20 # We build two versions of gdbstub, one for each mode -libuser_ss.add(files( +user_ss.add(files( 'gdbstub.c', 'syscalls.c', 'user.c' )) =20 -libsystem_ss.add(files( +system_ss.add(files( 'gdbstub.c', 'syscalls.c', 'system.c' diff --git a/hw/core/meson.build b/hw/core/meson.build index 547de6527cf..b5a545a0edd 100644 --- a/hw/core/meson.build +++ b/hw/core/meson.build @@ -26,7 +26,7 @@ system_ss.add(when: 'CONFIG_XILINX_AXI', if_true: files('= stream.c')) system_ss.add(when: 'CONFIG_PLATFORM_BUS', if_true: files('sysbus-fdt.c')) system_ss.add(when: 'CONFIG_EIF', if_true: [files('eif.c'), zlib, libcbor,= gnutls]) =20 -libsystem_ss.add(files( +system_ss.add(files( 'cpu-system.c', 'fw-path-provider.c', 'gpio.c', @@ -46,7 +46,7 @@ libsystem_ss.add(files( 'vm-change-state-handler.c', 'clock-vmstate.c', )) -libuser_ss.add(files( +user_ss.add(files( 'cpu-user.c', 'qdev-user.c', )) diff --git a/plugins/meson.build b/plugins/meson.build index 5383c7b88bf..b20edfbabc1 100644 --- a/plugins/meson.build +++ b/plugins/meson.build @@ -61,8 +61,8 @@ endif user_ss.add(files('user.c', 'api-user.c')) system_ss.add(files('system.c', 'api-system.c')) =20 -libuser_ss.add(files('api.c', 'core.c')) -libsystem_ss.add(files('api.c', 'core.c')) +user_ss.add(files('api.c', 'core.c')) +system_ss.add(files('api.c', 'core.c')) =20 common_ss.add(files('loader.c')) =20 diff --git a/system/meson.build b/system/meson.build index c2f00827669..7514bf3455d 100644 --- a/system/meson.build +++ b/system/meson.build @@ -7,7 +7,7 @@ system_ss.add(files( 'vl.c', ), sdl, libpmem, libdaxctl) =20 -libsystem_ss.add(files( +system_ss.add(files( 'balloon.c', 'bootdevice.c', 'cpus.c', diff --git a/tcg/meson.build b/tcg/meson.build index bd2821e4b54..706a6eb260e 100644 --- a/tcg/meson.build +++ b/tcg/meson.build @@ -27,5 +27,5 @@ if host_os =3D=3D 'linux' tcg_ss.add(files('perf.c')) endif =20 -libuser_ss.add_all(tcg_ss) -libsystem_ss.add_all(tcg_ss) +user_ss.add_all(tcg_ss) +system_ss.add_all(tcg_ss) --=20 2.47.2