From nobody Fri Dec 19 17:36:30 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=1747866930; cv=none; d=zohomail.com; s=zohoarc; b=i7zgMU1BCPEKxYk9CjpUra76vRxTjQDmVuNXT5QNFaYtorQ48A11pt4Ai3K3SeNqeXgCjAhWE0lKuqOvnRqkP44doeEtjHLh/LynVrZU1Iw0fa7MBtzh8cMLJcvha/6KR2mmp3cvQF9kWAKIfLmeOqVhszN85qTxndPCtHRJebY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747866930; 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=iFTPMBgBeSb1Nb3otdhugWerdFL6Has6F3uTGj/LNK8=; b=HsKHPNRmpjmSKqH3P9R5vQtsgGq8Ct/sUQ3KuWFiqWY4N4SGyc1/gK0rp5kjfgptWtsu+MgHOLLBLp9BS2RRMLN+f73iWHe7fM+LW2xGy0sFBB/eMB4Bl5fPqc05dTpGaeDHqKaei43hfxQGXI7ctmBHAkbOmpFIE1cj9JdtwM8= 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 1747866930982903.0694837300753; Wed, 21 May 2025 15:35:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uHs1B-0001UC-K9; Wed, 21 May 2025 18:34:33 -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 1uHs19-0001Ti-6s for qemu-devel@nongnu.org; Wed, 21 May 2025 18:34:32 -0400 Received: from mail-pf1-x431.google.com ([2607:f8b0:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uHs13-0004zp-Me for qemu-devel@nongnu.org; Wed, 21 May 2025 18:34:30 -0400 Received: by mail-pf1-x431.google.com with SMTP id d2e1a72fcca58-73bf5aa95e7so6604068b3a.1 for ; Wed, 21 May 2025 15:34:24 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b26eaf5a31dsm10165224a12.2.2025.05.21.15.34.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 May 2025 15:34:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747866863; x=1748471663; 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=iFTPMBgBeSb1Nb3otdhugWerdFL6Has6F3uTGj/LNK8=; b=LT5ZREmRjiGgW4lhkNVmUUWHG9WY+CcjSnhQgEyT4v1F77JxKjt6sUyfIXHjQA/jvS 0FE4xBkQo/4rb/kSnkRdL5p9aNVziYoqTEweeQGzCBmhsQmNzshtVJpJoKFsgt5z2o9z HcrWWGZLkcj75JgI4VbFzVd2CbuKvxv4MngHqa6qMOi6uoGskiTipcB4Y7wU+s/AUQ0N 2UkyOFgEkjshnndkrXyueBms70Rn9f/QrgOnWObizwZRwq5UJKFA5/ZiyILbusLAO9vB 2bFdieMP4+yJMgWQg+gNuiCYVRuCjqzP+0lskD4MDrhDQaZN/OP01nGL1tY1xyh39eFW WMPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747866863; x=1748471663; 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=iFTPMBgBeSb1Nb3otdhugWerdFL6Has6F3uTGj/LNK8=; b=L90ox6elqPV9LaIb4c7S5EFO5BjGuDFzoor1xFWWoqYVniUP7zaSlvyvpRek4yssfX RabEmZX56kG8po+PtNSVSRIN5jflzJXD4ntpMiH4aYYFULhqqYrluCug6oNrX5DigrjY CJLk04bMzsWAfuFt507FdekHmxmPFH1uI1aPHeUCUkQA2XucOlrk8vb9KmzlRxlwMhtz Dnf+SGbgk19EYMz+2KjMFemBrebSFIcWttom2xDYO1N4v3oq5cQeH9jJzwytxEZdsXIA aZ6CSjWDLDg7SShfc1Xoa2SbRwsEXFM3OkqSQiG5Nc8N1drTRvKcAR8sB9MXj1IHZClg bfNQ== X-Gm-Message-State: AOJu0YxsY4ak5jau2iwlQ0zH7my7kTqjX4pn/ORQZfM4EFsF5wyWrmi3 lpQyeYu/dT8piq9KLSIqXnZj3LSyxQo6tYBiQg4/2MIc1VLQIftJTW+85okYbnJFvNVAaTNmRPJ 6MdpD X-Gm-Gg: ASbGncs+NL1SIhrxzdetimKdJJtPiwb+zx9W+CUoq5mQej4uHl4RTka0A9l1mH62yy8 JOD6zsPIcOajzCJKAskBO9uYoJldvnrbZf//7mM8FqXAzU+g7stPIHibAqR06MX8ALnvsWUOxyK 526uRjZrcr6Oo4Q950VPdVKaMNNPs9TrpW5tZGJGQYrEuTRcFEEPwbK8UopaZsBCAj1yfplyHzV vkYWGkAE2++hDyfpkMR62sdD+ujSfSGYO9IMv4pv2PhrImuai3AoONRQ+yM6xexOOH3W29e3XxO eRJtCh6y215IIdubuwm4wBQifqWG8QZi/6duyrYClbGYNq/tibs= X-Google-Smtp-Source: AGHT+IFiGuN+jNpOhnPmSQ47Z4Q6SH4T9q4ux8WgqN+/wec40sTmRACeqXs6V8C94yZokdMyGqTL/A== X-Received: by 2002:a05:6a21:3384:b0:1f5:769a:a4bf with SMTP id adf61e73a8af0-21621a23f5fmr37446219637.36.1747866862831; Wed, 21 May 2025 15:34:22 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Peter Maydell , Paolo Bonzini , thuth@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v2 1/7] meson: build target libraries with common dependencies Date: Wed, 21 May 2025 15:34:08 -0700 Message-ID: <20250521223414.248276-2-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 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::431; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pf1-x431.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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1747866932201116600 Content-Type: text/plain; charset="utf-8" As mentioned in [1], dependencies were missing when compiling per target libraries, thus breaking compilation on certain host systems. We now explicitly add common dependencies to those libraries, so it solves the problem. [1] https://lore.kernel.org/qemu-devel/20250513115637.184940-1-thuth@redhat= .com/ Tested-by: Thomas Huth Fixes: 6f4e8a92bbd ("hw/arm: make most of the compilation units common") Signed-off-by: Pierrick Bouvier Tested-by: Philippe Mathieu-Daud=C3=A9 --- meson.build | 75 ++++++++++++++++++++++++++++------------------------- 1 file changed, 40 insertions(+), 35 deletions(-) diff --git a/meson.build b/meson.build index 49c8b0e5f6a..d803ec47221 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,57 +4137,56 @@ 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'] target_system_c_args =3D target_c_args + ['-DCOMPILING_SYSTEM_VS_USER', = '-DCONFIG_SOFTMMU'] =20 if target_base_arch in hw_common_arch - if target_base_arch not in hw_common_arch_libs - src =3D hw_common_arch[target_base_arch] - lib =3D static_library( - 'hw_' + target_base_arch, - build_by_default: false, - sources: src.all_sources() + genh, - include_directories: inc, - c_args: target_system_c_args, - dependencies: src.all_dependencies()) - hw_common_arch_libs +=3D {target_base_arch: lib} - endif + src =3D hw_common_arch[target_base_arch] + lib =3D static_library( + 'hw_' + target_base_arch, + build_by_default: false, + sources: src.all_sources() + genh, + include_directories: inc, + c_args: target_system_c_args, + dependencies: src.all_dependencies() + common_deps) + hw_common_arch_libs +=3D {target_base_arch: lib} endif =20 if target_base_arch in target_common_arch - if target_base_arch not in target_common_arch_libs - src =3D target_common_arch[target_base_arch] - lib =3D static_library( - 'target_' + target_base_arch, - build_by_default: false, - sources: src.all_sources() + genh, - include_directories: inc, - c_args: target_c_args, - dependencies: src.all_dependencies()) - target_common_arch_libs +=3D {target_base_arch: lib} - endif + src =3D target_common_arch[target_base_arch] + lib =3D static_library( + 'target_' + target_base_arch, + build_by_default: false, + sources: src.all_sources() + genh, + include_directories: inc, + c_args: target_c_args, + dependencies: src.all_dependencies() + common_deps) + target_common_arch_libs +=3D {target_base_arch: lib} endif =20 if target_base_arch in target_common_system_arch - if target_base_arch not in target_common_system_arch_libs - src =3D target_common_system_arch[target_base_arch] - lib =3D static_library( - 'target_system_' + target_base_arch, - build_by_default: false, - sources: src.all_sources() + genh, - include_directories: inc, - c_args: target_system_c_args, - dependencies: src.all_dependencies()) - target_common_system_arch_libs +=3D {target_base_arch: lib} - endif + src =3D target_common_system_arch[target_base_arch] + lib =3D static_library( + 'target_system_' + target_base_arch, + build_by_default: false, + sources: src.all_sources() + genh, + include_directories: inc, + c_args: target_system_c_args, + dependencies: src.all_dependencies() + common_deps) + target_common_system_arch_libs +=3D {target_base_arch: lib} endif endforeach =20 --=20 2.47.2 From nobody Fri Dec 19 17:36:30 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=1747866930; cv=none; d=zohomail.com; s=zohoarc; b=IC6jgnYB84CIl1guSKofNyIICJbawAjjQzPCrwh1GIE8NjTBy/sG24txJfYFg8Y7BG3+nZXSn5WkMh1k51VunbjYHNdjVUJWvpawgALosImqaSDv1F9SN9mNuQpIdvCySyGHBCytjmonOD/8UQNvfKFekdp/rUOQV4WdeH8kuGU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747866930; 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=XcMZqX+X3S7WBvWq8oL7JumQfaZvZoqDW3SuB8BAdP2AJ4m0YkhxNLT0MZP11fJhUMxAtmZjHCnhie+YI1fAb82Gox3KdHCZgMOwDz6ustJ1UrHBuHG4Cqw0gtyxAM/1zXYPpvT8LS764W0cs5FDhqJl6tmjBmBfFJr6LzAdCk8= 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 1747866930445104.77441054908604; Wed, 21 May 2025 15:35:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uHs1F-0001VD-TB; Wed, 21 May 2025 18:34:37 -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 1uHs1E-0001UW-5O for qemu-devel@nongnu.org; Wed, 21 May 2025 18:34:36 -0400 Received: from mail-pf1-x42f.google.com ([2607:f8b0:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uHs14-0004zv-3X for qemu-devel@nongnu.org; Wed, 21 May 2025 18:34:34 -0400 Received: by mail-pf1-x42f.google.com with SMTP id d2e1a72fcca58-7399838db7fso6858657b3a.0 for ; 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.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 May 2025 15:34:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747866864; x=1748471664; 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=rnwccpqwyshXOHmOVwHIRvJqqBTo3EeTAnj0vI9yErL0UuuKpbTGH952D9QHmCIzv5 eoazqyXpQ01S3ux9gtKDlgwvfeNAPvgLHvmhEFYFy06nF/2BF8XDHbFj+KYaezYPDaPL lny4l7UZ8IQHciUyOJg4Dccbz15oiHej32vbCUQVI7xAUzdgmZGYHAtc4NXmBmovNogz /0QXFPMB0eeYo+0Okz/42x9Pq011zREU4+pSukkG5Y2bwG3Cp8078wFn7uu2zlMBbC9M +p+iGZhfJVrXnFRwSKeuspDs7xf/f1nqk7gROeAP0Prs7oXRCcSUNgFLE0PDKi2YlUlS ztOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747866864; x=1748471664; 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=ce1aDBkjwzGIw/NMh+M6r41vX0vjB1uXiSL5pfHJWiHpz62LIKlDf4/5PiU0/iLjnc /KCU6UOHAbauD0vSbRYF9OcCAB+oPP/vRVAKkJWak8DCyLshUNtyFCjtlgmROuk3YPdN 7sQV1s7lIJN7SZavI49ATeXh3ta2WpP4gvCuJAN9tlcPH7kYdrScvalK6TK7+JOrjrTE fWa3OoWhldncK2reMDb1Gbwt+NyLzt52kDjWloUYwguiepfeCLUVQzKxdARgemHEsHUm rMtPeAlaSQBHmd/xPUkBgSmA3Aan8W6lZQfrbysMah+A7N/dOVaJob1vZtO7wK0lg2Dk ao1A== X-Gm-Message-State: AOJu0YyCOQEYgLrPb1eCTJo/m9wflj5PbfrD+/U4igFA5QqUDwQ3TUZ1 4ACSeuSgQc0oq0ghSMk/ExhrWnnOB9qtJFMmBZrlC6FE4XqE99+05aqNYdEDlXqOTJp3eYW3vXP c4xiE X-Gm-Gg: ASbGnctu96/QbsxOHoHzzZey45ddvo9iZFyZiX2l1+I6dTjCLWGz/Ier+FjZPUp2OAe GYcL7Ule8SJnJlpwSKmyG5FlMg2PcqLT49x7mohdz7OvTq0t2aVnFIUodzdWIg+53LCNUYPlaCW TmTrlqTqFd3lP9n/sq5VxzEbRxHJvtXeKd8hgKeeNEeEwcaIRxjM4dPrfqoN9D5BGwEgc3+iQMk gF0GZ+63h4g5HIHa5ukIYkX07FRF4FxdEfVsysiRSz0h0kxGMt6pFFjVXHO5IkrU9J7Mq0yRPT7 ifo1pCmYxExwdWI0861iNH7yApDIQ4S4llEAArn8SUbc8syLRAA= X-Google-Smtp-Source: AGHT+IFdjnunZiQIyzgsaHRZc0F/SPWogZJpIGtwKYfkKfkd/u0QhNHZIQuXu/KB5R5fUNpHzORwkw== X-Received: by 2002:a05:6a00:1994:b0:736:4d05:2e35 with SMTP id d2e1a72fcca58-742a99fc950mr29699507b3a.3.1747866863720; Wed, 21 May 2025 15:34:23 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Peter Maydell , Paolo Bonzini , thuth@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v2 2/7] hw/arm: remove explicit dependencies listed Date: Wed, 21 May 2025 15:34:09 -0700 Message-ID: <20250521223414.248276-3-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 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::42f; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pf1-x42f.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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1747866932086116600 Content-Type: text/plain; charset="utf-8" Signed-off-by: Pierrick Bouvier Reviewed-by: Thomas Huth Tested-by: Philippe Mathieu-Daud=C3=A9 --- 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:36:30 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=1747866969; cv=none; d=zohomail.com; s=zohoarc; b=D1H8R2fpcK6aFN7j40IjJeYIBN1Y63c1pfE0LcE8HIhiEGdAVvAHZJnAD4b3san5n3PJOA8a1YpIhc35loKZUbpITBk2LWj+DnOiK/WagG0/5piVrzAn+/X8Oznqgg5l+GCA52hqpRre2WS6Jz1rfM9YK8gFW1HkxZ+sNYE2/dw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747866969; 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=Q3UiVXnwJ0Ml4t6F8Lj8UinEb+Bp6RhAtFzU0b8OLaYuPSyKPTc5eGQ5kCBfDmAncf9VlEudhEeCTpSHfjfeg5YU5uYdaj1IoXBtoAMK9+y+gPpkMg7hgewGZuUhVnw5mbBHACYzFtk0VQz12uXHB88OafaSW0VQgSvKNDu373w= 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 1747866968994475.65315682603125; Wed, 21 May 2025 15:36:08 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uHs1N-0001WU-6O; Wed, 21 May 2025 18:34:45 -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 1uHs1I-0001Vz-6a for qemu-devel@nongnu.org; Wed, 21 May 2025 18:34:40 -0400 Received: from mail-pf1-x432.google.com ([2607:f8b0:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uHs14-000503-Tq for qemu-devel@nongnu.org; Wed, 21 May 2025 18:34:39 -0400 Received: by mail-pf1-x432.google.com with SMTP id d2e1a72fcca58-742c73f82dfso3655230b3a.2 for ; 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.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 May 2025 15:34:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747866864; x=1748471664; 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=PLQzcQEYq4HE5yoJQGchMGBDTrbO8fpnN3kGUQlsLHFJLznPaJcbNNiNBdkREBD6Tq nIWJIeeK93GyAMwt4QKw+DCC5hYTGPgx84m42SsRmuJ7X3+SwUJfGrr2uE+/a5i9qUyD 4MpWzdLJYelc4lZ0ztuqM9LH+YBwpbTLgXonj7O1qyExHz+qjxh72YFH1g3howHUXnTJ WV7cnIDtnEe8wJVOqoiF5huO+L6duY3XfjeNT4OpmmAY+qcEnRhnFiMUyP5CknlwvD1Y +J+NemgDZ1GZm9ZiC/+/6bVYCPxur5NjP3Cuj9hgnEEVi5zEZWQiVZ5ZGFlXixlyWaZn x7HQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747866864; x=1748471664; 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=XXGOwgFssIflihkmvNq1c55UbEYdvOjpCSDqqzBqoAZeUFyCZO9GOLi43ug8GRI38U 28dgm+0A16fCytwgA1OEi04nUxKeqjVgI8OT6EVplimMwxoybwzzbDq3zO9EKFPtGUBu awovAVdTi0NmiadGC7KtsrYkbY6nsDJw3AXKXQgmhyEOHgoEEtRHSdI1O9feUtXrlxz0 HFVKXloVvyzE03k97W5tbekv/KH0yrXhkpSSxosTxwWYpEsl1MidtRmqgMmzZUYlZY7l Md/D8xpKPOa46AUlTyuLyomaPFiTtTYwSHoCgafdUncP1SLEaUqXrHJ5As3hUwkKF0iw WkMA== X-Gm-Message-State: AOJu0YyaOmefzg5y1c/n8NFCbkXBnKopKxwqLYiB0U/wOWUAhdarmbIg UqcakZUqLloJALoUbUO9Eko5yfrbZJTgKseIVFgwN6Xm2A2+WTOeVj5enLpc3WdWhy3d2HuoGBZ VgOvp X-Gm-Gg: ASbGnctQrt4IyrNJhUPFFSGCL+jdwDpyZ/i93bYjp0keSDICFxPIMY355baVPH/rOga UOmSETLOvBDPIaxNe/7C5/ljTDsHqTeHoxpRpAPkTiobd50/P1gZ+dzRvUg6OHdfHVh3CC41uFD Rsiknk6wYxwfMKejMSvA3f/H6fpQQebAtXBWezUfVIpHhXyrhs93yWEKjbc7WNrlP67yUXyxXxq q9SSFiJmZCG0kGBwOg9xn10cfR4WkaP21pJjtm66bhfjBncP3Zp+fkXzdA2VnZij8VoEBOt+tAO 3aaoC1NBMD1UlGKI3eckSvTrSxnxFBk5xD/Dg+7tyNBUR8ptHzs= X-Google-Smtp-Source: AGHT+IFp5eBquDdukOCBcywTwzFqFUvSkWp8GWgZfqUr2/xuGK15to7XhX+/j1winXGNyPRUvhRFQQ== X-Received: by 2002:a05:6a20:72a6:b0:1fe:5921:44f2 with SMTP id adf61e73a8af0-216219382c2mr31117037637.20.1747866864573; Wed, 21 May 2025 15:34:24 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Peter Maydell , Paolo Bonzini , thuth@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v2 3/7] target/arm: remove explicit dependencies listed Date: Wed, 21 May 2025 15:34:10 -0700 Message-ID: <20250521223414.248276-4-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 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::432; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pf1-x432.google.com X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, T_SPF_HELO_TEMPERROR=0.01 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: 1747866970487116600 Content-Type: text/plain; charset="utf-8" Signed-off-by: Pierrick Bouvier Reviewed-by: Thomas Huth Tested-by: Philippe Mathieu-Daud=C3=A9 --- 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:36:30 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=1747867036; cv=none; d=zohomail.com; s=zohoarc; b=fF6i9/yTYInkdFO5CPqgn30egwFq0u3mCSUvYDNYDvR/walLRvrZ1uPR0j+ehXEav8+VR+/Vnjm+oz2/yohzx/DXYr35ZVff8IoZwpI7bEym81M99gNtC9hQnW4vTObJzMpe/vlyKr1kInx2IBdn208cKB/PjfOJQVHXwKfKId4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747867036; 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=0FmrrYF727TSqjvHbt0O4AI+WunPG75VXnTztBP8v6U=; b=P1VuoTJ9HUXKYm7lXYXoFl1FLauGKbscnRwMkaV3gQ/okd9H8lHxxG9kgMfWVHu3eBdPfuNRr8tv54qxgGjHMT6Xk0s0k+gx3iNtTA1Vac4E6TSnuUw9D3OGU18q8Y2qcTcoQTlErlWFIW/m5SHm8dp7ugxCYfL3F0o+Z5Z1W4k= 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 17478670360441010.0372889912329; Wed, 21 May 2025 15:37:16 -0700 (PDT) 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) 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) 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-Google-Smtp-Source: AGHT+IHCjN4wu1Ve5jwAcG6NDtSisMrHkZVICZi5jAhsLz2hHOrNhC2SbNIn+milRCCrUwX/nDA/dQ== 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) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Peter Maydell , Paolo Bonzini , thuth@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=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 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::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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1747867037258116600 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: Philippe Mathieu-Daud=C3=A9 --- 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) =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 objects +=3D lib.extract_objects(src.sources()) arch_deps +=3D src.dependencies() endif + 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_type =3D=3D 'system' and target_base_arch in hw_common_arch_li= bs src =3D hw_common_arch[target_base_arch].apply(config_target, strict: = false) lib =3D hw_common_arch_libs[target_base_arch] --=20 2.47.2 From nobody Fri Dec 19 17:36:30 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=1747867012; cv=none; d=zohomail.com; s=zohoarc; b=OO/FK1g9i5xZaSkino4XkjFyVNW2PMUSVKdhJdYPbJn6VsWfJdpGTeIt5YHv8lQXttH2l9M7mIN9fUVaj74/n39CXnd+JCUnGkwPsXzdNaDjPo94SOvBBMQaeqEuVO8F0WBP8fBerwU81cwvLrGZP0uIC/FAWWMklc0B7ufViYQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747867012; 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=LDNP3RhUOghSEESTRNcI4qrBUgrMIzNRrDLa5dYfvc0=; b=HjF78LBJtMggovbs1/ioAMK/HMqkNIqVcz2X30vWTsLL+2OHyd1bWwIXWdqIK0Etn5M6zY0PdegjnQ/FkQg3bj3VurWj0KUcZ9dxjE0kHp1QGnJjduU+aRXoSi/BGTFfb4EjGlq5qM7yfFuRicNnMMZQl46gZSR8xdc+ZIcBBBY= 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 1747867012918137.76569148724514; Wed, 21 May 2025 15:36:52 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uHs1N-0001WW-6u; Wed, 21 May 2025 18:34:45 -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 1uHs1J-0001WF-Ga for qemu-devel@nongnu.org; Wed, 21 May 2025 18:34:42 -0400 Received: from mail-pj1-x102f.google.com ([2607:f8b0:4864:20::102f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uHs18-00050L-TU for qemu-devel@nongnu.org; Wed, 21 May 2025 18:34:41 -0400 Received: by mail-pj1-x102f.google.com with SMTP id 98e67ed59e1d1-30e7bfef27dso4900081a91.0 for ; Wed, 21 May 2025 15:34:27 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b26eaf5a31dsm10165224a12.2.2025.05.21.15.34.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 May 2025 15:34:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747866866; x=1748471666; 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=LDNP3RhUOghSEESTRNcI4qrBUgrMIzNRrDLa5dYfvc0=; b=W4otA+ypTiVpkBqMmMfI6ZvzTh68pinlCXVzKbb/CIW5q4FxowtiZ37pTlWUbmL7TN LK+Sw3dyjLM8eZMX9hAMt8jiowSEEJgaGoMhgtRd8GGq+3ku3EoGcVMdMJO+YV6ezE4c Xt9CCZTnDTcM/U5aOp/2kl5WoUcvIClVjYihWf/2Ho/amzNuIdVCJxZ0WYn26LlZcwSx AybFpjEfn7RR+klD/kQO/3gDXVzgn/o9YMK/InggXkdNYRksSDocT6YuijU2fH0zPE0y xSsG+tGqgUCwr+GXtQmOiFWARuuOlwp1/Dz7qmroLIuKyUHCu0UHIZF4dn6MLVv4JL5g BLfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747866866; x=1748471666; 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=LDNP3RhUOghSEESTRNcI4qrBUgrMIzNRrDLa5dYfvc0=; b=EZDOVJeicXeFOhyX4LqEvwIJooB5CzgE0semjhkwn8RRpSYAiGbOXdCZA8X9d0w4PM Qf810f/rL9a/RJXXRZ8U2afGxGGmGd6X77RZyrqwekfdfmXpILuvRaYfJPSuMkx1xPwB jpOPu2EFtVFpxFrnuqlA+DMc71x5OND6j4X7TRvtzh0dfrvLucbFlXNCX1FP7NkXUCqH Hmh1cdTQS0m/0D24/7tY1CaNVK/+f3LrKYXwwP+Sg6UJZMXfwcqj/TU4OCdh+N8N1WDP h3p7Sdp9PuXxZGnDLT2S+19ZVJv/th/W9fzEB3+iFaBvCiVNrwosK1c0UTXtlUmuMML8 LT6g== X-Gm-Message-State: AOJu0Yy5+I7Veh8t9dM09AFg+gg8nXe9aLqO4nCtoVpPXY96yfndM9Ky 82UQhNYVBGzopw10uTTbfAS4V8aUgDohr+oNGqDLvZBdH6mF8xJCBvuNnA7lLhvzHbeXb5CZLSf OJ3BS X-Gm-Gg: ASbGncuTNpsZHjHdo4JEWoz5gJJiCpvmfUueez0k5AasSND2/GB1c2l6T9pTpgq6eUh +EYr7+bHMtO0FSQgKg1i9HLJJClOHPm3URcbCtCH9d4Cjcrl7/qdwc5KrRauMFNGQWlMot+Uaip QdgPvkfoAJ9CMEkh7VclKF/sHt/vt2NL8gNJCfZ3Wx32ugIhxDaEO2VEZUekCO92tqWOW6ZWd4R 7dnPCki/5X4D4ODEhn8w2XdZK9gtxh8i/IHRP5Kd+vTtQYVzrGpv3LYnKRFOq4EHob2RjVnVH1/ FvjNg1CYM9ceM5mTDdqOs1eDtkEvki1O9F6fWOoUblfgBD66Qbo= X-Google-Smtp-Source: AGHT+IENkWyZiEavDs+DckIevAsE9eF4W2maKEu0Excq3LQXzB02x2GgnqlvbXLmcKEQPQ8glNdidg== X-Received: by 2002:a17:90b:5282:b0:2ff:5357:1c7e with SMTP id 98e67ed59e1d1-30e831b492fmr32994892a91.20.1747866866271; Wed, 21 May 2025 15:34:26 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Peter Maydell , Paolo Bonzini , thuth@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v2 5/7] meson: merge lib{system, user}_ss with {system, user}_ss Date: Wed, 21 May 2025 15:34:12 -0700 Message-ID: <20250521223414.248276-6-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 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::102f; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pj1-x102f.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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1747867015044116600 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. The only difference is that we'll now compile those files with -DCOMPILING_SYSTEM_VS_USER, which removes poison for CONFIG_USER_ONLY and CONFIG_SOFTMMU, without any other side effect. 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: Philippe Mathieu-Daud=C3=A9 --- meson.build | 38 +++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/meson.build b/meson.build index 22eb2f04e09..23815c916cb 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 @@ -4153,7 +4160,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 =20 @@ -4165,7 +4172,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 =20 @@ -4177,7 +4185,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 endforeach @@ -4358,12 +4366,12 @@ foreach target : target_dirs arch_deps +=3D src.dependencies() endif 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:36:30 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=1747867010; cv=none; d=zohomail.com; s=zohoarc; b=McnfHjOwIWBpn+iViFfCfgSShqKcBJCGIsbJhTB3/D+MSLUnRB8Hw22wAXxs26m1Wk+JJF1CTxqOJtYS/mVfK2C+dexImNknS4p8aBbybHghyooP4SGUF+sJpSEsMbb9PAnVfgGtDTZmOi0fnNptv7I/Qq2BdZnmUgSBF6H7XGo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747867010; 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=Ovqoyh1Z07q6U2ncxWKFORWZC8MsNQ9STTasIkxgjnk=; b=mwVP5TOC23bwhAhvATFfNqAUfT4HYlhpkNZKbk3HbJH38QMa3UNQWHdzmVzHhi+owHnX2aQcb7BXjU6N+RU/aJhVKr35VMMtbni5bQ3JCcz8KXFSlfp3eKQwwp4G5LKCrByzUSc1rAG3ukO01GILYB9aEFbWNwB+TRrQFhbZMQ8= 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 1747867010691937.7222969922121; Wed, 21 May 2025 15:36:50 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uHs1K-0001W0-A7; Wed, 21 May 2025 18:34:42 -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 1uHs1G-0001VU-6V for qemu-devel@nongnu.org; Wed, 21 May 2025 18:34:38 -0400 Received: from mail-pf1-x42a.google.com ([2607:f8b0:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uHs18-00050T-Mr for qemu-devel@nongnu.org; Wed, 21 May 2025 18:34:37 -0400 Received: by mail-pf1-x42a.google.com with SMTP id d2e1a72fcca58-73972a54919so6841899b3a.3 for ; Wed, 21 May 2025 15:34:28 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b26eaf5a31dsm10165224a12.2.2025.05.21.15.34.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); 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=1747866867; x=1748471667; 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=Ovqoyh1Z07q6U2ncxWKFORWZC8MsNQ9STTasIkxgjnk=; b=dRJdoAIqakLVGERvp+VkC6S0LLzWkjl6g3k/rCOOzTynRcZ3aHTMB6Cyba8gmoEXN5 DwYkTS7H19Y7+EolXWm26oSflUJw5moXK/2JhTG83xcR8ktGPoGfEXvvVExsAPGX0loM EFj3IWejaeaiPQ4hb10UfFjMYsUHhgUTJmTmoPGv75xQEZzx9jVs7+dbGrZHPGsRA98N t7YXAMTRAcLFAHuPOHrFTNEJC0mt9KKEs+35U1abXLMGsRoK9q87xdsxN5QGcpwLiv3g KPZJuyUyQH1Td8BEpe8ex2B8dQLlj/pm80NLUMsRs9E6r4tVl3CNzBMeSbS6NZNd57ne 4cLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747866867; x=1748471667; 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=Ovqoyh1Z07q6U2ncxWKFORWZC8MsNQ9STTasIkxgjnk=; b=fpjb0OVlHm9o2K+PTYJm03UHygE1oN08F9vTPXdCmTHv4h66Tqdx/f89G5i75+BALU tbdpMSZ/weSzzSRZfCSF4nudcmoVnM/32gsHPXBNyAOqsdHVFH7vqEzG1eddrRSW9r1K UAtka7dRIlqSnFoqC2P8/Q3/f3ZYIO/ZpP0v+rCDITndAsQexeeCDt5UfZaVupMrO6Zp eqLIwwAwShA7MFFm/4TVxPwtPUKDNHoPE6EwDMY9cllALh7/KkuVi8e9BXLy4WTLwgVM R4WZQMx3BzzgUwMQDISBLYN1c4gciBGdq6OuQQLiqU6eYeGfGpfJZQ5RadrmyTRTxULx FMqg== X-Gm-Message-State: AOJu0YwayJJPQ/jwpWJzJP1rBgWWSdCLNS4E1WYGQ3VwAuA/NXUkFSen 7EbYxAGMzCDsIvbJQdCcWDp3RN4/TZ0aXWj7RfDDhMaYCe/6NdCZbnyKL1OAbuC49GEkYQmveiP epYHc X-Gm-Gg: ASbGncsChBzASuHQF4pqRgJPMV6xaMcfba8nycHjfY3JwfsXSEoRctgHtNP/zqerTl1 Wb9P0HkRYDwUKRWzH0Sn3e8VOeIoBKdFSJC3bXF7G4maJBHyQSD0M88L+rIc5CgaXIY1YSRxfrw IVXIxg5w6bKvCC/S237n4/Rt4GhOgpyBxbS5jSJ/jljkCjxMOvfMLJZbcppIkq9IvqNHJVDR5UP oxW7hS/bZr6R053enCQjG1SPl60MZkPipKxPmaeJ+bXWSrURJQ5wMlIDoO2IW3cQF92hHGVVxkb p+1QUzA5T7nwyIgZRxkh4yL+XpE5p6KAGPHDaBSE9hEKcmlfRyA= X-Google-Smtp-Source: AGHT+IEa3Rqyn5MeyANSf94wB7yrKHXf4hzFFQQqXQazKt/PdQKCN5j4GMGaQHhJSAqgCHTQxaoveQ== X-Received: by 2002:a05:6a20:72a6:b0:1f5:95a7:8159 with SMTP id adf61e73a8af0-216218c643fmr31166007637.10.1747866867088; Wed, 21 May 2025 15:34:27 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Peter Maydell , Paolo Bonzini , thuth@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v2 6/7] meson: remove lib{system, user}_ss aliases Date: Wed, 21 May 2025 15:34:13 -0700 Message-ID: <20250521223414.248276-7-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 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::42a; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pf1-x42a.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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1747867013005116600 Content-Type: text/plain; charset="utf-8" Signed-off-by: Pierrick Bouvier Tested-by: Philippe Mathieu-Daud=C3=A9 --- 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 23815c916cb..087ce7dd20d 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 From nobody Fri Dec 19 17:36:30 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=1747867015; cv=none; d=zohomail.com; s=zohoarc; b=VcFE/sD+QJj0oowP+bBCj0bVSfmq1T58U0BNMWPbXGR5dwP5yfI+OunXe8BygtFE/iR+8BpzWiFHXl35NvHyOeiZSG0BQ7qxP48znaOruvwZiq/O/7dUnsLgkuWXDxYQcRVHcI/wlS0dPfKyIyNhDYHIkG0cjhFUNjzMleMpAmo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747867015; 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=BzbmByqdOkqyRMXARFIXus2CwGPGDwIxO/jwoX/CbXM=; b=Wm0jWt3CU0+BFT65jq0sVkQvQxNgbQQFWP+3YoNmRwCLcy1yG0Ma/YP/4JVRVNmKOYhkho8e+7qjLhExtivVHUTvwZBVxhrlbut5AzhHyF2MCETNPyDNy0q994yw2fW8V7XeJWUCcw0APPaJcp72FBWIAo9uVsLE7XmGxhTEaa8= 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 1747867015885296.7010125496321; Wed, 21 May 2025 15:36:55 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uHs1O-0001XL-LU; Wed, 21 May 2025 18:34:46 -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-0001WQ-Hc for qemu-devel@nongnu.org; Wed, 21 May 2025 18:34:45 -0400 Received: from mail-pf1-x435.google.com ([2607:f8b0:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uHs19-00050b-TL for qemu-devel@nongnu.org; Wed, 21 May 2025 18:34:42 -0400 Received: by mail-pf1-x435.google.com with SMTP id d2e1a72fcca58-742c96af71dso5322602b3a.0 for ; Wed, 21 May 2025 15:34:29 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b26eaf5a31dsm10165224a12.2.2025.05.21.15.34.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 May 2025 15:34:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747866868; x=1748471668; 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=BzbmByqdOkqyRMXARFIXus2CwGPGDwIxO/jwoX/CbXM=; b=mmodHKjAx3LGbFp11BFg0pud8tZnZ5QdR+3iU1I5ku7EpQGwd+kON6PA0uEFUzJXmQ F922vGiHNAQXMo7UowPM1ZVH2RXpBbvg7/jJv55RLUjbJQ7un6m0P8NTViUo3MXeedaC uk0iXPV4YVHnZpOiCNse0Gt0io2eSHiJoptW2x1/BxwvCW9Hp32O21dyi20W6IGlrtSQ v/2ZdvjxcmAZY+AyVDK/wnfURArcrodPccZKZO24ocRScwcqA1pXCmj1Jogwai8Q6Ptf kFFlUlMj+Hbj/cREKdesILN6mcSmZ9jvwPJ5x1YGTApe9+vhlGd9tsafXwNvqctnDmOO dlEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747866868; x=1748471668; 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=BzbmByqdOkqyRMXARFIXus2CwGPGDwIxO/jwoX/CbXM=; b=cRlvLILobtx3T6uGTuZ09i8avzyKda61+B/NiVZ7MxihL8/bXmZ1u5bMRmxdsjxakQ +CAJ5hgHik5IV5NOdJAeM3K9Fduzp6tp3w04Ah37Q3LnkQITwtox/ajIm4/7s8Um0no8 aYEaIbgNiQh++C67CoRUBJf7kQtpTgnX3+7K1NeC+Q22eXlZ4t5o4sWPH/hQVevp/QaT BTBDR41dVZYVggYCWIyDQhs8O4kIxGfwGc1O5034Z5u5kxRx641VR6ggVQnMmi0ioww1 Rppkhxt6YclUYnlgxbrok12ffigf8wpz3qaYed4HxaQhtfcuQHQkbQDy/fd9FE6i0JAx U8TA== X-Gm-Message-State: AOJu0Yw5aTRAZGUjJjZ/5DDSn8GWwadvjm3v35ZIGB2C/NSLO3mNGlFM baLEm9rhHh5B/lBEJy/im90pPynr8e68zuT7U2BSzPMUScuSxBZrJsuBjwl5nAR2rSGcEY5lhkK c81hZ X-Gm-Gg: ASbGnctXSEXjuh0BFAn9pdJrhY818WDaUXNOmRFw0KAdJQJGUFdiZkR4Xhz1IC8/uJ3 EWbbfkIzgEnKTlICXy9O3a9LV2VTDp6Z5yYZHAtWpliyOG+ZFGbBZI5BehGAro80oCxHJBpizRl ZY2rcHh2/hOkvMrovqAeRzz58Ypg+kpL0tNA8nK3hNBB3zgCJc8c4EghXtlJ8kemKvXFJdSagOV zNq5iBg32602LvSEjCg2MUF/brzkjmWjrv6OGk9CRRf1S++Gx0c2jc6LNaAimp300aXXjbKy1Rz BzeKYAgv6qiGCQvAmk+0KwBMx4ME8f5x8MfI9Ez0mGqLcCclOJY= X-Google-Smtp-Source: AGHT+IGMV2qNrOkZCutEZzQtXRCnh8SatdbIhZY1/S1cvReL3RJKd8edhUoLhBndd22BKq4rH20x3A== X-Received: by 2002:a17:90b:4a50:b0:301:98fc:9b5a with SMTP id 98e67ed59e1d1-30e7d500953mr32636482a91.6.1747866867942; Wed, 21 May 2025 15:34:27 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Peter Maydell , Paolo Bonzini , thuth@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v2 7/7] meson: merge hw_common_arch in target_common_system_arch Date: Wed, 21 May 2025 15:34:14 -0700 Message-ID: <20250521223414.248276-8-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 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::435; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pf1-x435.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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1747867017048116600 Content-Type: text/plain; charset="utf-8" No need to keep two different libraries, as both are compiled with exact same flags. As well, rename target common libraries to common_{arch} and system_{arch}, to follow what exists for common and system libraries. Signed-off-by: Pierrick Bouvier Tested-by: Philippe Mathieu-Daud=C3=A9 --- meson.build | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/meson.build b/meson.build index 087ce7dd20d..f57b051b3d4 100644 --- a/meson.build +++ b/meson.build @@ -4121,7 +4121,6 @@ common_all =3D static_library('common', dependencies: common_ss.all_dependencies()) =20 # construct common libraries per base architecture -hw_common_arch_libs =3D {} target_common_arch_libs =3D {} target_common_system_arch_libs =3D {} foreach target_base_arch, config_base_arch : config_base_arch_mak @@ -4150,22 +4149,10 @@ foreach target_base_arch, config_base_arch : config= _base_arch_mak target_c_args =3D ['-DCPU_DEFS_H'] target_system_c_args =3D target_c_args + ['-DCOMPILING_SYSTEM_VS_USER', = '-DCONFIG_SOFTMMU'] =20 - if target_base_arch in hw_common_arch - src =3D hw_common_arch[target_base_arch] - lib =3D static_library( - 'hw_' + target_base_arch, - build_by_default: false, - sources: src.all_sources() + genh, - include_directories: inc, - c_args: target_system_c_args, - dependencies: src.all_dependencies() + common_deps + system_deps) - hw_common_arch_libs +=3D {target_base_arch: lib} - endif - if target_base_arch in target_common_arch src =3D target_common_arch[target_base_arch] lib =3D static_library( - 'target_' + target_base_arch, + 'common_' + target_base_arch, build_by_default: false, sources: src.all_sources() + genh, include_directories: inc, @@ -4175,10 +4162,20 @@ foreach target_base_arch, config_base_arch : config= _base_arch_mak target_common_arch_libs +=3D {target_base_arch: lib} endif =20 + # merge hw_common_arch in target_common_system_arch + if target_base_arch in hw_common_arch + hw_src =3D hw_common_arch[target_base_arch] + if target_base_arch in target_common_system_arch + target_common_system_arch[target_base_arch].add_all(hw_src) + else + target_common_system_arch +=3D {target_base_arch: hw_src} + endif + endif + if target_base_arch in target_common_system_arch src =3D target_common_system_arch[target_base_arch] lib =3D static_library( - 'target_system_' + target_base_arch, + 'system_' + target_base_arch, build_by_default: false, sources: src.all_sources() + genh, include_directories: inc, @@ -4373,12 +4370,6 @@ foreach target : target_dirs objects +=3D libuser.extract_objects(src.sources()) arch_deps +=3D src.dependencies() endif - if target_type =3D=3D 'system' and target_base_arch in hw_common_arch_li= bs - src =3D hw_common_arch[target_base_arch].apply(config_target, strict: = false) - lib =3D hw_common_arch_libs[target_base_arch] - objects +=3D lib.extract_objects(src.sources()) - arch_deps +=3D src.dependencies() - endif if target_type =3D=3D 'system' and target_base_arch in target_common_sys= tem_arch_libs src =3D target_common_system_arch[target_base_arch].apply(config_targe= t, strict: false) lib =3D target_common_system_arch_libs[target_base_arch] --=20 2.47.2