From patchwork Fri May 30 07:11:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 893326 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e0d:0:b0:3a4:ee3f:8f15 with SMTP id p13csp895214wrt; Fri, 30 May 2025 00:15:57 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUolfHXnEiNnksh/x1NzRkCvxm5wJvGxH3OsariPgDt09ypdBLGrlJFP2AZHRmCyB4Gx6Koyw==@linaro.org X-Google-Smtp-Source: AGHT+IHXvXZXrrxP+8sZAbaMM4bLla/nolpsKpnEixCW52jBL/daN3O1k4KoChIGqDVeRkbqUMmB X-Received: by 2002:a05:620a:170d:b0:7d0:96e8:4797 with SMTP id af79cd13be357-7d0a201690fmr336523785a.45.1748589357224; Fri, 30 May 2025 00:15:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1748589357; cv=none; d=google.com; s=arc-20240605; b=DapelA6g0Kz6yBWPBlvptlNf8OT97CaDYmNHOsp6UhZQirUR0QXtb/pnOFZbLBcLTX q3ugMcz7rvi6Qw5lxicY5+J/53ohbP67VJPlR0e48OeKTRXpSC1BNkBou1XtIegHXVY3 Qi/PLlQT+B2fMkOaZCKcm1qbAVHvjquRXeRtVyUwKVRM2b+9AEYb0LL3laKG3SKItkB0 io0z9bhnZr1uPhd+ouR41vd0atkc0yR04RKN0BkPhpQ/asv8Ha5pQN3Z7boDoW2/8Mrs gGhrN5Jnbj1Pdmv5JRW8RRkKRJrji1hrFdjTXXU1Ded+/PQ5cCqu8Z0fgGTqD493I/jp 8nkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=3+XE4e8aMSeFFSFNL/218gsKkgHYSEQyHzUsqXaoYHs=; fh=eOEWLrf/WbVHOv1zPh0zddJGbycVgtoooqrrcOdYPPM=; b=TJVjtsDk0La+hMN+0Fv+ZxEM3b14URrzJVEj/Bqki3CUPBxIxO9eDz1cR8LFSqwAX0 D07YVdedO28sYW9VdQsCZ4F6WIMhHZifUrsN7BETOMHBDkyvF2avmTOTQWZsci4MoxQ1 1qdxPreG8eMP2W/+goGfgRsJrEX2Qx9K4SJ34U9n2OB5jjD/P8I5foqi3vq8RNkT7Rri CoGKIAg7SJNuA8VB/FP5DyQGJFdzKpEuaBTCaqU7TVM1xgApP1MyajLu78eGWvDcjDmt bWVEL8SbUEWhsnvcbxFlvIti/ITqvKoZs1RJXgEA1w3zU7ktRnoKCxpWJRvF7AuWKSPS jWzw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Pv7UT9F9; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7d09a1e0a15si309182285a.286.2025.05.30.00.15.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 30 May 2025 00:15:57 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Pv7UT9F9; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uKtvL-0008D7-CT; Fri, 30 May 2025 03:13:03 -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 1uKtvJ-0008Cl-T2 for qemu-devel@nongnu.org; Fri, 30 May 2025 03:13:01 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uKtvH-0006na-NY for qemu-devel@nongnu.org; Fri, 30 May 2025 03:13:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1748589178; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3+XE4e8aMSeFFSFNL/218gsKkgHYSEQyHzUsqXaoYHs=; b=Pv7UT9F9AwCZCPsjdzICFUz05Yqy7FqnRG9Khm55pOlzRbARto4N3doPvsZ0SzXrE8erwG 4QllJr0w5f6dYRAbT3kCBxBrvDibliksU+2vI8VnRZDehbh6SiMNOIa+vP0eh7GwnCL/ZK LA+xH4G+j0yqCOkXDqbS5ogtLG4/pfM= Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-138-SWjkpCdhPv2s1yPVQBCbNA-1; Fri, 30 May 2025 03:12:56 -0400 X-MC-Unique: SWjkpCdhPv2s1yPVQBCbNA-1 X-Mimecast-MFC-AGG-ID: SWjkpCdhPv2s1yPVQBCbNA_1748589176 Received: by mail-ed1-f71.google.com with SMTP id 4fb4d7f45d1cf-604630fc735so1237771a12.3 for ; Fri, 30 May 2025 00:12:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748589174; x=1749193974; 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=3+XE4e8aMSeFFSFNL/218gsKkgHYSEQyHzUsqXaoYHs=; b=LZdwF85N+Dkt/NNmbGHYSwvLhBPEgqXgYT5sOZIvzoVhiSJf0g3HgxppoPGDN035oP YFibAIDQp5o1WA8wGM0lQ+cIaiyS4hi+vpIRq1WV8ZhV49b2dvFMmrtlheHR4u4yN8ki qMsCbbOLX96wovBXqwMJO7Vj8dLUXkONQGAdkS7/JIsK13TD9wMUktYf6WNgPlpcWWHI WA64kAKfE9emMzB3H/lMsxlYl9IMvfLNbwfErlnFqbo7Ngqss0p/MPmEmukwpayr3K02 0qhyNDj1c6zxnpRgsg4/umKEk64RP7fW0JKDoM18lZlDTOQ676DRGCPgKUFgyt7lemkn 4gAQ== X-Gm-Message-State: AOJu0YwE2X86QC5vO3ldt8xEsu6RWxzt5RtvqiMUDD/CCg8PjiAlyajg DHkj9GyEvl124Z1aN6alysiKJAkLgoA19eN3qqW301RFJIZFxPrsXM9vLF0j/QfHTS+qCAvhUtM 0cnTWkdordiBK0F4arqOjN71If821h6Cig8WPkNlcvSPM8b2xAuATTupHtNttKNMzw5SOzLIMZD 3uFlBDpLIczsO4HN2C7bzu5XVs6fe3s+ULs9+kmiHG X-Gm-Gg: ASbGncun+z0ds4oUMYUuRHHyzzCEDUL4xWYF9iaHZNvuhWYYpuLDs1XANDtaahOeF40 If4KRM3D3hsr3SMgkeikUSB/n/7dzypBChBpTibWAAxPXr31pqylJUEbscwd4CB8Nxogbw9PquD 2ZXy0hP3XCgpeb069jtaZHpI5XJDbIOfW2W9fGaPUx1DFjGXE5hdklsER3KKtNtdqDGy1udC9k1 Ntr7jTSHKQi9i7tPYtUThP8+7IjBcvufBpMONy2eXLyBBvSFZ3uQPnU+I/wa0bgsdRLXGqcPOIq A+WCfCBOgd7yWQ== X-Received: by 2002:a05:6402:35c6:b0:5f8:357e:bb1 with SMTP id 4fb4d7f45d1cf-6056e1597eamr1732657a12.22.1748589173889; Fri, 30 May 2025 00:12:53 -0700 (PDT) X-Received: by 2002:a05:6402:35c6:b0:5f8:357e:bb1 with SMTP id 4fb4d7f45d1cf-6056e1597eamr1732633a12.22.1748589173465; Fri, 30 May 2025 00:12:53 -0700 (PDT) Received: from [192.168.122.1] ([151.49.64.79]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-60567169e04sm1185863a12.79.2025.05.30.00.12.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 May 2025 00:12:52 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 01/77] meson: build target libraries with common dependencies Date: Fri, 30 May 2025 09:11:31 +0200 Message-ID: <20250530071250.2050910-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250530071250.2050910-1-pbonzini@redhat.com> References: <20250530071250.2050910-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -49 X-Spam_score: -5.0 X-Spam_bar: ----- X-Spam_report: (-5.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.902, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Pierrick Bouvier 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é Link: https://lore.kernel.org/r/20250521223414.248276-2-pierrick.bouvier@linaro.org Signed-off-by: Paolo Bonzini --- meson.build | 75 ++++++++++++++++++++++++++++------------------------- 1 file changed, 40 insertions(+), 35 deletions(-) diff --git a/meson.build b/meson.build index ad2053f968b..cbb22f60d1f 100644 --- a/meson.build +++ b/meson.build @@ -3242,6 +3242,7 @@ config_devices_mak_list = [] config_devices_h = {} config_target_h = {} config_target_mak = {} +config_base_arch_mak = {} disassemblers = { 'alpha' : ['CONFIG_ALPHA_DIS'], @@ -3433,6 +3434,11 @@ foreach target : target_dirs config_all_devices += config_devices endif config_target_mak += {target: config_target} + + # build a merged config for all targets with the same TARGET_BASE_ARCH + target_base_arch = config_target['TARGET_BASE_ARCH'] + config_base_arch = config_base_arch_mak.get(target_base_arch, {}) + config_target + config_base_arch_mak += {target_base_arch: config_base_arch} endforeach target_dirs = actual_target_dirs @@ -4111,57 +4117,56 @@ common_all = static_library('common', hw_common_arch_libs = {} target_common_arch_libs = {} target_common_system_arch_libs = {} -foreach target : target_dirs +foreach target_base_arch, config_base_arch : config_base_arch_mak config_target = config_target_mak[target] - target_base_arch = config_target['TARGET_BASE_ARCH'] target_inc = [include_directories('target' / target_base_arch)] inc = [common_user_inc + target_inc] + target_common = common_ss.apply(config_target, strict: false) + common_deps = [] + foreach dep: target_common.dependencies() + common_deps += 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 = ['-DCPU_DEFS_H'] target_system_c_args = target_c_args + ['-DCOMPILING_SYSTEM_VS_USER', '-DCONFIG_SOFTMMU'] if target_base_arch in hw_common_arch - if target_base_arch not in hw_common_arch_libs - src = hw_common_arch[target_base_arch] - lib = 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 += {target_base_arch: lib} - endif + src = hw_common_arch[target_base_arch] + lib = 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 += {target_base_arch: lib} endif if target_base_arch in target_common_arch - if target_base_arch not in target_common_arch_libs - src = target_common_arch[target_base_arch] - lib = 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 += {target_base_arch: lib} - endif + src = target_common_arch[target_base_arch] + lib = 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 += {target_base_arch: lib} endif if target_base_arch in target_common_system_arch - if target_base_arch not in target_common_system_arch_libs - src = target_common_system_arch[target_base_arch] - lib = 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 += {target_base_arch: lib} - endif + src = target_common_system_arch[target_base_arch] + lib = 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 += {target_base_arch: lib} endif endforeach From patchwork Fri May 30 07:11:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 893323 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e0d:0:b0:3a4:ee3f:8f15 with SMTP id p13csp894317wrt; Fri, 30 May 2025 00:13:28 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWRnINny0YKh5o2QzCG2NItVxKxBcW6yRrKjDn9WQCd1s+wnmVtvXIndcwVGP9m/qCLhwdi6g==@linaro.org X-Google-Smtp-Source: AGHT+IFtUT0cOIXkL/B5u6Ff0tJyAzeHqyWaN5wcjw8cMTnERnxoP96Dbb8an/j59qs4tyH9TGmo X-Received: by 2002:a05:620a:2987:b0:7cc:fddb:74d9 with SMTP id af79cd13be357-7d0a4bf58efmr156403085a.22.1748589208594; Fri, 30 May 2025 00:13:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1748589208; cv=none; d=google.com; s=arc-20240605; b=JsfgxGLoa+DcOFSy/OFk0Q1kxb+HQwH2Sfr9EIKH1eiaIlk/++uBTEiewRvP8gqEdS N45JWnoQFbEjVQPzD9yWMYFglWkTs5BTL5gri7n5yi0nOScT3EMi9nhdG7B4mjimfgs6 JLs2RLPwIJAOg4waUTrcPZn2Th7IW1MYAIP+FzGdCRsIclpqngmOzfHob8w4xQQGnxOY or4ccwD7OEma57f+5TqH45hkh//ydc/bX2anZciltbk3sL6OpIUOqsA7Ir8E+tl4oYXm IAQYIdI+KQ01/9FKTNZ6t+ZH2gxN8jt1L5MRJQ0a2s6EgJPulvLDkfa0yTCpHaxZdeGA 0yOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=WZDhYgEn25ajyWYlR9Nt+PSW6BB/943ujLlEl7VIT5Y=; fh=eOEWLrf/WbVHOv1zPh0zddJGbycVgtoooqrrcOdYPPM=; b=FOIfLGyV8mCR7nAi3plXT74IOV6LUujtre/UVh8lDZV9trMf1b47YStUGRAQiUSmKh Kp+ncnbDIQBQPgcdo4a4+XdR4XGcFhitlEwg7FVPfWedCb6NKecP2z43oXl3xfw8R0ZP 267F5KJzs5Rc4953EEwqNo5BNuu8YuGoz64ZNjG4Ap6Hj7tZy+f/pps50J7zj1jLKUm8 Brhg+OaJsAAtfP/KwEuCVHmWHvprmfUq/3Gm9dev/b4unTlw/lovMYRaHv8/RFFgzLxE cn3R+OeKqMtQuMAWtMEo8jQEH5dBtOU3787iL/UKNP8IhiU1dJvbMM3FtkzljJ85x9Ds hryA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=PiTDdrhj; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7d0a33a2dd7si109859085a.593.2025.05.30.00.13.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 30 May 2025 00:13:28 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=PiTDdrhj; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uKtvN-0008Dr-5Q; Fri, 30 May 2025 03:13:05 -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 1uKtvM-0008DP-3K for qemu-devel@nongnu.org; Fri, 30 May 2025 03:13:04 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uKtvK-0006nl-6H for qemu-devel@nongnu.org; Fri, 30 May 2025 03:13:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1748589181; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WZDhYgEn25ajyWYlR9Nt+PSW6BB/943ujLlEl7VIT5Y=; b=PiTDdrhjp5DTu79nVsVTCpPupt8ndWlmgKMSQthJYwYfyPPv5sZZMbNNjgOe/6cow1Jyxi cJ3RfVrULxt5D/+a2x1LTof2k9LTE4UrHEaxevGuif+V2H64/pHaGT3htNxrq/4p7GaBTG QbY42MNakqQZYmpi0eqCcmO+Fk0SdPI= Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-663-Q7UuKHNVMZa3K6VjbDl0aw-1; Fri, 30 May 2025 03:12:59 -0400 X-MC-Unique: Q7UuKHNVMZa3K6VjbDl0aw-1 X-Mimecast-MFC-AGG-ID: Q7UuKHNVMZa3K6VjbDl0aw_1748589178 Received: by mail-ed1-f72.google.com with SMTP id 4fb4d7f45d1cf-604639a2715so1509621a12.0 for ; Fri, 30 May 2025 00:12:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748589177; x=1749193977; 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=WZDhYgEn25ajyWYlR9Nt+PSW6BB/943ujLlEl7VIT5Y=; b=YUvUCAzRO7fUat5/aehMJrU5wefiINcRPKSte0BrQeQK7R9KJe1iUTt9ZrzDwaRjgh E4tKMP/wT+gcIFL/Tvv25OXKq1H3V0LMMhhoAbUK9xbRaLTBxt/fh9oLScqTbTEd6Y8K 5nB0Hlu+hGWAjAfiWLr/m4aZIeL+bT+qSpfvFGaqlQdqifhfvr1VfkK4TLl1U/rNSbr/ JazsELyDXTjlcUtwyRrF3qYRoar9z96iGcgxD9VrwseGsfkNLLzAuMYkZIhQQsLfSaYw yaMXngkhcdtXXSbyaHekFNjPx7BoMDAlh7DILOcI7IjihdeDV1z+jYYxCfTFJDcLn3ZD uv2g== X-Gm-Message-State: AOJu0YzsRVvtb3JMZkiR4pPGdZHSAVmj3K9bc9RQ7udXxrpAM0+Gcx+B U45fw81Ve+h3YAbA+nF84rTMVj/ufIWxah8CG9OjTNxB6BfdiwLl5Z7HAnuPh9bkMrVatPEs6cI Iuo12CHX5/aJOdhshdBDs1vpN8I0synPwX/uybsjxvMLPpYAnduD0q4wImLQE5lUzfQHT/6TjeF 9Nl9rHy4QizErOMtfhirn6jzhRfFflM1mqUACI8LXW X-Gm-Gg: ASbGncsAfu0mYPS4qIokp7zNOYYlEuzcIIvBqUITwJFYEjrvILJVoPmxk95gqd0t8YP kE9xfmqC1r8iU9rrV24cWGq4RhHfGvYgENJRl/49Ps3IL6ArXuFCPGs/zaUftUvazyqWO9CLoMr RfHRtM40lLj9IjQO6Fai1PlieU2V6urvRGbmczIZVsFwOq3L309lxcEJGH4HVVH+FSn104M2iOb b4GAbdcOJjgrzsYCkjdX3+u42E34jYCUFmJcAiIq7BoRRa3yyoSzQEtdm6lHxgcU0HgdekB/L+o WntvQ0+6UwNBLw== X-Received: by 2002:a17:907:7203:b0:ad5:8594:652e with SMTP id a640c23a62f3a-adb36ba4b75mr91270166b.35.1748589177056; Fri, 30 May 2025 00:12:57 -0700 (PDT) X-Received: by 2002:a17:907:7203:b0:ad5:8594:652e with SMTP id a640c23a62f3a-adb36ba4b75mr91268066b.35.1748589176692; Fri, 30 May 2025 00:12:56 -0700 (PDT) Received: from [192.168.122.1] ([151.49.64.79]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ada5dd04551sm275580066b.93.2025.05.30.00.12.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 May 2025 00:12:54 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 02/77] hw/arm: remove explicit dependencies listed Date: Fri, 30 May 2025 09:11:32 +0200 Message-ID: <20250530071250.2050910-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250530071250.2050910-1-pbonzini@redhat.com> References: <20250530071250.2050910-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -49 X-Spam_score: -5.0 X-Spam_bar: ----- X-Spam_report: (-5.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.902, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Pierrick Bouvier Signed-off-by: Pierrick Bouvier Reviewed-by: Thomas Huth Tested-by: Philippe Mathieu-Daudé Link: https://lore.kernel.org/r/20250521223414.248276-3-pierrick.bouvier@linaro.org Signed-off-by: Paolo Bonzini --- 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('musicpal.c')]) +arm_common_ss.add(when: 'CONFIG_MUSICPAL', if_true: [files('musicpal.c')]) arm_common_ss.add(when: 'CONFIG_NETDUINOPLUS2', if_true: files('netduinoplus2.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', 'npcm7xx_boards.c')) @@ -79,7 +79,7 @@ arm_common_ss.add(when: 'CONFIG_SX1', if_true: files('omap_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')) -arm_common_ss.add(fdt, files('boot.c')) +arm_common_ss.add(files('boot.c')) hw_arch += {'arm': arm_ss} hw_common_arch += {'arm': arm_common_ss} From patchwork Fri May 30 07:11:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 893324 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e0d:0:b0:3a4:ee3f:8f15 with SMTP id p13csp894598wrt; Fri, 30 May 2025 00:14:15 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVxUHOtX0iOeZqy7NHttK6fm9j4Sb83If6/AMBo9SvPX9iM8dRndyxNlQ3lzHa/1qiNY23jgA==@linaro.org X-Google-Smtp-Source: AGHT+IEkJai01QwTN4VeF8703MkifPsHC0+4COQU2dLqE1EmMVWYmIU72CcC0WjQCSRuaenXfN39 X-Received: by 2002:a05:620a:4385:b0:7ca:f349:4265 with SMTP id af79cd13be357-7d0a1f982aamr366718285a.4.1748589255406; Fri, 30 May 2025 00:14:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1748589255; cv=none; d=google.com; s=arc-20240605; b=ME8ud/0a5QR7zd5j4raKL9/HLJVIlJ/euerwMb4mx6h8xBalWKX0tWu9qrKGselSQh CDshUcIjOJ9TJ7ahK6iygHWZqpeTcA+uTSx+5fun0k7fA8LCV0wQ12dgemFaeamccOK1 m3O+xzRBe58SPNsaqfDDUvEnQe0319iEFNlpEQiUFEPokYkeef5+BjvqvRiHkUiOOn8/ ZLZmpXFHxG63Tj7EeHuhmcT9XrcEH35s7LAUWWl0isB9cgxXOZiK1sFzEA1gsiEJrbv9 wZ4ZpgUbALf8uzC4nRRGXE8rDo23KDbZ9yAp8h5mZz5CQWj5YbSLbU4EyaTriUHC05VA BZrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=8iytk596qFvoq4XGuuczZdwRmvPFNDnfKNqPGLwBtZI=; fh=eOEWLrf/WbVHOv1zPh0zddJGbycVgtoooqrrcOdYPPM=; b=leTo6PV8JTW1MS7S5P/Gd4VQn7kjXQ6NWq0B0dLAyYhp0HMjKvmS1/Nj0hb/x4EBBF o8eEYpavsO6/8HQON5aQdniyNEsYaPV3gExHZQ2EI3o1HrdvoDTPp5sQsUhkpmJNHC+Q f3OOmSrxmc5g/wja5DGCPJMSx674XqQ18fTNaeqLI6K1jSHj0w/SF6WKyNWmDuG7Za0c kBrUPtB7B+qjxrlhbflzfXmh4CUZnnOcggtC72W6WmKGmY1D41pcnxX77Qi1kXfrI0ts LffP160aSnCVJZ9Bk0bwiocjg/vYz8ymfhc2ZdkZHbboW6+E+/A1mzxfH/JMhJOcIpQB NcYQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Wwhmhjmi; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7d09a1e0e69si324177385a.295.2025.05.30.00.14.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 30 May 2025 00:14:15 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Wwhmhjmi; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uKtvR-0008FF-OY; Fri, 30 May 2025 03:13:10 -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 1uKtvP-0008Ea-Dc for qemu-devel@nongnu.org; Fri, 30 May 2025 03:13:07 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uKtvN-0006o1-Ng for qemu-devel@nongnu.org; Fri, 30 May 2025 03:13:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1748589183; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8iytk596qFvoq4XGuuczZdwRmvPFNDnfKNqPGLwBtZI=; b=Wwhmhjmiwpaq4U9AQmp7J8n3kA3qc9RO3KnMtoIhp3yKZYvUhuwmRzq7hczVlwwUykdrlm 6mcIDeImDqcPj3Rr/8hZ/l0wt6ADWf/0hiczlqbLKoVLJt/j8XtWMGTsSPkYoobCc5Tpo6 v8+KXu6FUdE0gWLxCbj0st3J47q1NJI= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-615-zy5x7KYzM9i-iKb5t8xO_g-1; Fri, 30 May 2025 03:13:01 -0400 X-MC-Unique: zy5x7KYzM9i-iKb5t8xO_g-1 X-Mimecast-MFC-AGG-ID: zy5x7KYzM9i-iKb5t8xO_g_1748589181 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-ab68fbe53a4so87509266b.2 for ; Fri, 30 May 2025 00:13:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748589180; x=1749193980; 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=8iytk596qFvoq4XGuuczZdwRmvPFNDnfKNqPGLwBtZI=; b=S2WEwWoyWy6mk7ZYITEkKKy390o78OIOwla/6AcWxnMZxDPE4MwJgsEkpHQJUGRhsO XJJYfZ0mJVkNTV85erppNjC2uUQJ2J3v6IBt13S3bOwqpOk9R7SR3ZqZvFOL2XeVIU67 ZBMBqbfQBuyYjzEx+Rarv5RALeWIkO3FbQ6OTy+gj8hlYMEqJwVqIkuwlvCiqkMRQ+H2 lzvIAD1Idz6eDq7MXDhnSOaxAUL2nOuPNBGdOcQeC9c+lUF9RqwG8QnZjQhlQ4ITdF20 wEan/pLBQBETOvpbn9C3QsNjqP9mtYvQ3MBThJ6bCbURV9k8Z8mcBmPGfOb9xSPnsymo uj3Q== X-Gm-Message-State: AOJu0Yyhybd/DUbb5xA2FdT3rYxcBN9REvfTaA+QMXNF2Zc5D44IXTLx pjwXoGXArKj1l0sCisYJGwMmSryDZZU4WSQBu61owRNBfTMXrzJo6LMew1UqCuZVf7wQ3r0BJ1i ACNUpnX0xlYiR+ZrkxWyWBLmAoQOHazJiMrjCFtoSeK3BF39WQ3VB4nPFofAZ/+u706RTwacpAP B/4LMf3KZjkw5Ihrh6wjM/K7yN2MpE5JL7FSoVXDmB X-Gm-Gg: ASbGncvMQrs/OBNC9HolDcjdjSOHsbWQ9a0X3O+V3utenxT7rU0+N6hsPi86ov2NBd1 VzFkfUUY09xlIgFwsS564sJHNMr/NoJS7363pyOIJ9oXCbsMrN0Ijuc/B2JLhoOmG3wpQuE4UOL YSpL5cwqNBrnahTSoNBYwF28Inxv4EWtmDUIi178mtfsE3OBcqj4XRyER1S4VaFMkzU0O2oYPjC prnZkhB2EtHJm2/QRqdmJJpfGKYzvpwBx+mTPegFRcy54m1RQiV9SapEIwnNfx+I7Vd9Tj0YRMA 87BhhuBqf3SQjw== X-Received: by 2002:a17:907:6d06:b0:adb:300a:bcc0 with SMTP id a640c23a62f3a-adb36bfb72bmr112628366b.46.1748589179884; Fri, 30 May 2025 00:12:59 -0700 (PDT) X-Received: by 2002:a17:907:6d06:b0:adb:300a:bcc0 with SMTP id a640c23a62f3a-adb36bfb72bmr112624366b.46.1748589179395; Fri, 30 May 2025 00:12:59 -0700 (PDT) Received: from [192.168.122.1] ([151.49.64.79]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ada5d7fed96sm275835866b.32.2025.05.30.00.12.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 May 2025 00:12:57 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 03/77] target/arm: remove explicit dependencies listed Date: Fri, 30 May 2025 09:11:33 +0200 Message-ID: <20250530071250.2050910-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250530071250.2050910-1-pbonzini@redhat.com> References: <20250530071250.2050910-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -49 X-Spam_score: -5.0 X-Spam_bar: ----- X-Spam_report: (-5.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.902, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Pierrick Bouvier Signed-off-by: Pierrick Bouvier Reviewed-by: Thomas Huth Tested-by: Philippe Mathieu-Daudé Link: https://lore.kernel.org/r/20250521223414.248276-4-pierrick.bouvier@linaro.org Signed-off-by: Paolo Bonzini --- 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', )) -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')) From patchwork Fri May 30 07:11:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 893325 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e0d:0:b0:3a4:ee3f:8f15 with SMTP id p13csp895040wrt; Fri, 30 May 2025 00:15:29 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXmxuMG2uBp1Mn5jIDGT/vTn9mE43666f75WWGhiSVovtt0XsmpfbdnBmKWIf29fGRn5tbgQA==@linaro.org X-Google-Smtp-Source: AGHT+IF13evObh2veevtuaO95IFbINGzTB/ugoh7ndQRUI1y21Xu3inpjMHvoGzXqseNZbYO5FS2 X-Received: by 2002:a05:622a:90a:b0:494:7970:f27c with SMTP id d75a77b69052e-4a443f0d926mr17568941cf.27.1748589329439; Fri, 30 May 2025 00:15:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1748589329; cv=none; d=google.com; s=arc-20240605; b=dbtts5lOoliQiiVjdEJMAEq6k+YGc4/CpCS7mevPepJf28WqXuZ97DQviTSJiqFumc z/rr0mj91hsWi3S6xL/Re1E+YnlsR6iQ8Z2BCdrG31235shPuwzQP99PCMXVHHjeCqa3 fn7+M7haB46dd8HEZNOoT8DCP8yIPX/ZJtX+C775tspus/dKK8sKF5VMQbJ3GJpN61yg 7nDRDsWZlDyyIg6VkeC9j+mZHKHzviqvWsAYlSGpWM3CSf/bXyhKsT113N4N086zM2GC YZS2dmbE51JGALFziXl46q8f+atiWqI9gXdr97Nh76Nu65eeVqgRKArfHihKTQ29tYQ7 hHfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=rt0eddSET8TsQkzt6gddNyhEsfEq4B60hTzxAZmgf9w=; fh=pgRJImLGStw4JiZaQ8tZ6Gx4wEkoSwwNn1cV112GpBk=; b=M3GPnsZmo4dMM8QJiIxj9LsxviSYBAA2mrOeJfy8gSvTZW+PpvLAMBTNkrbJp1QB4x WgjSPl0w0ChWoSq9aeUqefJB9a1OWVu7QPIK3FVX61NmECyt0J5IRO5ixp6CS0XDjxL9 3jvl7+H8DVIxJXbJLVZYwGqzlOeaMUsj56vKGh5gyduOPChgDspW+hcz+5PJrIXvVjnz G/J+ps1oqGEJINRFegl5AYSjjqlvZeAbQpFHGsL7+JF+uoOgI9tMAJyslPuES+2TR3Ei tHUe4qriKzuRLPZZ+J/ehHlANZM/RyB6VLpjXQWkpzKb5eXQLA39riEcE9GVIewXNbNV ryGA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="Z5np2JR/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-4a435a211d7si32177701cf.354.2025.05.30.00.15.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 30 May 2025 00:15:29 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="Z5np2JR/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uKtvR-0008F0-Mg; Fri, 30 May 2025 03:13:09 -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 1uKtvQ-0008Eh-3B for qemu-devel@nongnu.org; Fri, 30 May 2025 03:13:08 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uKtvO-0006oA-Cf for qemu-devel@nongnu.org; Fri, 30 May 2025 03:13:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1748589185; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rt0eddSET8TsQkzt6gddNyhEsfEq4B60hTzxAZmgf9w=; b=Z5np2JR/RX6PvxaH2EcIOGM4j40fLBuIKcTYcBeok0BdESp8v0jpv6Uaa+LrYkV7EzpcHQ eB9rFDcB0bbownLBG6v7JwHi4ulMyzMDdP9DQC+qKg1PRIacC6ufWWAoxABxsg4hdCf7og pqXO1Q3hAuzNM58NTvgR133Mobh+rGE= Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-679-VM40-wheNuOTXrT1UxptbQ-1; Fri, 30 May 2025 03:13:03 -0400 X-MC-Unique: VM40-wheNuOTXrT1UxptbQ-1 X-Mimecast-MFC-AGG-ID: VM40-wheNuOTXrT1UxptbQ_1748589183 Received: by mail-ej1-f71.google.com with SMTP id a640c23a62f3a-ad9a8a5ecc6so186260066b.2 for ; Fri, 30 May 2025 00:13:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748589182; x=1749193982; 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=rt0eddSET8TsQkzt6gddNyhEsfEq4B60hTzxAZmgf9w=; b=Kxet+FNf0sLehT8Q+9osBCz7hNY+B8RW5x/kEqjnKl2W9MnNWs5b3QnbID/UcIqRqK eOaAE535/ou0K3FDt3Gdk9RBwXtOFipm5G36Br3Fm9jibpMJQkS6DKNuYgFUbXscQZEU RvqPvudblQvpP1dVrkIgV2gptUFBmc58YaZ1hFcgsvHb+af8nRkTkXNNHBn9wpFG0J50 qdjiQwUugvQxuhZuz05P1PfAyZcnI2z2/RKUVGcij+p8vkqyFImjkUSi7f+mXbwB1EtD aScnDSMfWogvpo8RE4xEEszYWSEmcsgTxkjLxB3aJQmSeYXF62VEvIEbHzMVGhADb5d5 JqNA== X-Gm-Message-State: AOJu0Yx0lKTaBITzEgVUTL+Z6PO4bjpU92IiVmokyiUBMTRhkiivz6L0 96CHZYT6NKqidAyO9CqrSl83kV2mYLsnI2MO4JaL2e3lTerv4T4VtSph7hqZd5+XZRXfWjmtQvL 2EOTevpGP0wwNh5jFMo1dvAt584OUBLrVsYmS0M1HKzajhcXCHpqxxVPvyASw6dWhwX/ZMeXzeo RQ+cr8cXn3k/3RrNTsIY5MAY26414KTXVTh+ZMiqX8 X-Gm-Gg: ASbGncvVophqsYAg/PgZbQmYX4BnHpkYEBV2m+Sy6Qy5DUBnQDlQF4GRl/lU1tRyKWU IMEgSzDPLRmbxM7uiCCSxvbwANrby5LGiQfxg7YhCkAJojGlxa8Q/bHFNzcEHWU6tfQQ8T0TE98 AxDrAf78oC66ytT0iwlBAtFm0/ZscXv4mcyBiA75+gZMn+Szmlm+vOvWh9a2AZ+ZvCDOnI8C1M3 4MxB6GZRwfNCsW8bRFrYv8qXByCe7M5mSm1M7OegxesyqACm3/PCXsbYqwGkw9G7B8e8PqTkCfy 7hzkCuxob3qn7Q== X-Received: by 2002:a17:907:3d9f:b0:ad5:6928:1492 with SMTP id a640c23a62f3a-adb3242f4e5mr193474366b.45.1748589182304; Fri, 30 May 2025 00:13:02 -0700 (PDT) X-Received: by 2002:a17:907:3d9f:b0:ad5:6928:1492 with SMTP id a640c23a62f3a-adb3242f4e5mr193472066b.45.1748589181852; Fri, 30 May 2025 00:13:01 -0700 (PDT) Received: from [192.168.122.1] ([151.49.64.79]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ada5d7fee13sm274322966b.26.2025.05.30.00.13.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 May 2025 00:13:00 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Subject: [PULL 04/77] meson: apply target config for picking files from lib{system, user} Date: Fri, 30 May 2025 09:11:34 +0200 Message-ID: <20250530071250.2050910-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250530071250.2050910-1-pbonzini@redhat.com> References: <20250530071250.2050910-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -49 X-Spam_score: -5.0 X-Spam_bar: ----- X-Spam_report: (-5.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.902, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Pierrick Bouvier 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é Link: https://lore.kernel.org/r/20250521223414.248276-5-pierrick.bouvier@linaro.org Signed-off-by: Paolo Bonzini --- meson.build | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/meson.build b/meson.build index cbb22f60d1f..79d123c50ee 100644 --- a/meson.build +++ b/meson.build @@ -4081,27 +4081,19 @@ common_ss.add(qom, qemuutil) common_ss.add_all(when: 'CONFIG_SYSTEM_ONLY', if_true: [system_ss]) common_ss.add_all(when: 'CONFIG_USER_ONLY', if_true: user_ss) -libuser_ss = libuser_ss.apply({}) libuser = static_library('user', - libuser_ss.sources() + genh, + libuser_ss.all_sources() + genh, c_args: ['-DCONFIG_USER_ONLY', '-DCOMPILING_SYSTEM_VS_USER'], - dependencies: libuser_ss.dependencies(), + dependencies: libuser_ss.all_dependencies(), build_by_default: false) -libuser = declare_dependency(objects: libuser.extract_all_objects(recursive: false), - dependencies: libuser_ss.dependencies()) -common_ss.add(when: 'CONFIG_USER_ONLY', if_true: libuser) -libsystem_ss = libsystem_ss.apply({}) libsystem = static_library('system', - libsystem_ss.sources() + genh, + libsystem_ss.all_sources() + genh, c_args: ['-DCONFIG_SOFTMMU', '-DCOMPILING_SYSTEM_VS_USER'], - dependencies: libsystem_ss.dependencies(), + dependencies: libsystem_ss.all_dependencies(), build_by_default: false) -libsystem = declare_dependency(objects: libsystem.extract_all_objects(recursive: false), - dependencies: libsystem_ss.dependencies()) -common_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: libsystem) # Note that this library is never used directly (only through extract_objects) # and is not built by default; therefore, source files not used by the build @@ -4343,6 +4335,16 @@ foreach target : target_dirs objects += lib.extract_objects(src.sources()) arch_deps += src.dependencies() endif + if target_type == 'system' + src = libsystem_ss.apply(config_target, strict: false) + objects += libsystem.extract_objects(src.sources()) + arch_deps += src.dependencies() + endif + if target_type == 'user' + src = libuser_ss.apply(config_target, strict: false) + objects += libuser.extract_objects(src.sources()) + arch_deps += src.dependencies() + endif if target_type == 'system' and target_base_arch in hw_common_arch_libs src = hw_common_arch[target_base_arch].apply(config_target, strict: false) lib = hw_common_arch_libs[target_base_arch] From patchwork Fri May 30 07:11:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 893327 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e0d:0:b0:3a4:ee3f:8f15 with SMTP id p13csp895554wrt; Fri, 30 May 2025 00:17:00 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXICndEBh5zMM98zF2n4xwSilbiumWOWbi2pyDLbQzuVpbTLo+lq+vvTfuFcCAhpKr6Cog05Q==@linaro.org X-Google-Smtp-Source: AGHT+IFsqrqqWyylbwxu3C3ayEYlIbnbk8t8s8w1l1mhkNBewkjoiBsR3181Z/xtHn2NWqYihkSF X-Received: by 2002:a05:6000:3113:b0:3a4:e706:532b with SMTP id ffacd0b85a97d-3a4f7aa65e5mr1546591f8f.43.1748589419859; Fri, 30 May 2025 00:16:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1748589419; cv=none; d=google.com; s=arc-20240605; b=cLWTD5FRdxf3H0s07319I+KEwtjVjQSGxH5nnP9uBfcHj47P8jXVlcAK6licF+DSWF Se7g2SXiUYF3QRyK9VFxpPKhyl2RLK44w4Lpz7IvNG/wzLrgxb9WwSmHta7J7Fno96UB 485cnTwjLtNnj7DXBVLWnSAT/YUxlwb2sTZSJ0d75rXj9YEnEQWpS2+OLJyJsxTuP3ti G3UqIhWkSKHHbKSbxanM2f/8tj2/nrpmVnJiEtOTZIZM7pmS1HXVQLcISpE3GvJGg3nw IQw+ERrSHJCIg2I7pal9/UAjLrrVMHHQRP9J0XKqXxAgW7llMDUldGDymd5RYU399/t1 Kerg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=eTt+ijUG9kBQToPAyx24wWv7Og7qKej64dv1M2DfvhE=; fh=6Iy23zC9AdgEjl8BT287tms7OsCTNhvcMTX6iUEgWw0=; b=JEX1SBv+gYez7LAlgXVW4z4vUHRXn1pRtzO7jk98RYVJLnZuCJ7Tpz+5Hp8fW8tGOw JyXKCTduYztJ1kNricjw47oYNXg1BB1UESV7u4YFonb4XABOZXkbII0p6H21k+8S/ohB i30fUxD18koAs6l8x1UZSC98PRiptFC52Z1sP4C7kLGv9qAXH+XcaoXk/uCdQvKoz5Ww Ir/aBukFTuBNjd1/Q30iAA+X5Wuq2kbgu9BUqio4gomB196PL6zb2BMDLGylcl6YgZ7P we4yRV4Z+KTuOoPP958/bIWV55Aff+5QJoNASGPGYbJ3vu32Gvu8cHAe38raZ9K2LObu Ehhw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=giwndl0b; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 5b1f17b1804b1-450d64017e3si11376305e9.162.2025.05.30.00.16.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 30 May 2025 00:16:59 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=giwndl0b; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uKtvY-0008GH-4w; Fri, 30 May 2025 03:13:16 -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 1uKtvS-0008FY-UQ for qemu-devel@nongnu.org; Fri, 30 May 2025 03:13:11 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uKtvQ-0006oS-Ug for qemu-devel@nongnu.org; Fri, 30 May 2025 03:13:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1748589188; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eTt+ijUG9kBQToPAyx24wWv7Og7qKej64dv1M2DfvhE=; b=giwndl0bRcen3IU0dLMklWeRFlkF7a0y4X57CN/N3cscSQXvelbyglNHHwpBv3ltI450ON t2SoRCkLtoRBxhqzqRp9C/N1ZURi6VVL3r6S3VEk7zQ77dIT22sUSf0Ifse9i3CwrWk08R dKhiz6EOFPdDHnViJFcIXKLUK/iC3Uo= Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-98-3QIkPAbJMuWIJPeenv9wEA-1; Fri, 30 May 2025 03:13:06 -0400 X-MC-Unique: 3QIkPAbJMuWIJPeenv9wEA-1 X-Mimecast-MFC-AGG-ID: 3QIkPAbJMuWIJPeenv9wEA_1748589186 Received: by mail-ed1-f70.google.com with SMTP id 4fb4d7f45d1cf-60498322443so1674249a12.2 for ; Fri, 30 May 2025 00:13:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748589185; x=1749193985; 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=eTt+ijUG9kBQToPAyx24wWv7Og7qKej64dv1M2DfvhE=; b=MPnqGBk/Ra02ZYHEqmitr+C2M7+60ejXiEI6KuJ9IhrD4HgKsaRH6XsoIaMyFajhV8 TWOnWKrU0JnsoJ74d8jvQJZT4j1pn0CE9kkjtAw0EzWgtR+EUyAnra2hQXVC5JJBh67o Do5CDTqlt8vf0MB6IgTeCPAylmjPF3V/7+veM3jNFgrYzELrvcOXDJt0HOiz8CZoOAwt LvY1vnt4VJOObZgUFGqTXT6jp0jcQntH4AP7Q4yyBlJXRj8PTdUx6szdRg8DOwMC11ca 4XOB5IEf1MEGzYSZ0nMXqqsBgutYalkwFqxJal0MBN6zyBFyap5leOIK90az4gBJMFyu JR1w== X-Gm-Message-State: AOJu0Yyn4Y5DPh/amjvM9PDNHWXvVsrz7Yt6E3zFDp/w1Ur4XV4Y4tA5 ZJAIoDlioe5V97FVGnov3Oa++ELCOKVy0lB+YQ0okWxn+qnC5/TJ4PjIgcs2zBUdWTrAIO+7UAb y8mIrotkscyTX9MFV16cJOsWRbZSgnpIzGe07BL26CsWtnVGehbYTWddUTktK+kw5ZUGLfORUjn c6QQ+CsFKbtXuRGauq4wBnUM7ma6+01iocpZUXN1mz X-Gm-Gg: ASbGncsV3lPGEt6ivWEiH4BZ92CuLmFKVo+jU93hVitCrNNHcdKRL6iTx7PUamXnPLf Uw4N0JzKqb/4Nm8hkxyFOzBHtUvVqCs3YKN16tGPLmqeammnFTnUSZZ6ibVMoecd349t+5B2iHl wTwT47RC/qGCi5EDPG9+xrcmT75yGTG1PDevTpDQnTeF4z4Gm/3mBMVwoF6sYdx/Dnx2YFKXfmh ZSHkRycaFLDiQN2r2rvBIQRyOwnY7ttEa6NqKm1FNpf2gzR3+ZrDN/uXztAJc7NNU+aIrGkwyBR pyZIauyMiFCNkw== X-Received: by 2002:a05:6402:280d:b0:5fc:bff8:c60a with SMTP id 4fb4d7f45d1cf-6056e15e00cmr1835967a12.26.1748589184817; Fri, 30 May 2025 00:13:04 -0700 (PDT) X-Received: by 2002:a05:6402:280d:b0:5fc:bff8:c60a with SMTP id 4fb4d7f45d1cf-6056e15e00cmr1835936a12.26.1748589184323; Fri, 30 May 2025 00:13:04 -0700 (PDT) Received: from [192.168.122.1] ([151.49.64.79]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-60566c756f5sm1216983a12.45.2025.05.30.00.13.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 May 2025 00:13:02 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= Subject: [PULL 05/77] meson: merge lib{system, user}_ss with {system, user}_ss Date: Fri, 30 May 2025 09:11:35 +0200 Message-ID: <20250530071250.2050910-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250530071250.2050910-1-pbonzini@redhat.com> References: <20250530071250.2050910-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -49 X-Spam_score: -5.0 X-Spam_bar: ----- X-Spam_report: (-5.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.902, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Pierrick Bouvier 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é Link: https://lore.kernel.org/r/20250521223414.248276-6-pierrick.bouvier@linaro.org Signed-off-by: Paolo Bonzini --- meson.build | 38 +++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/meson.build b/meson.build index 79d123c50ee..ea54d15f4a6 100644 --- a/meson.build +++ b/meson.build @@ -3694,14 +3694,14 @@ io_ss = ss.source_set() qmp_ss = ss.source_set() qom_ss = ss.source_set() system_ss = ss.source_set() -libsystem_ss = ss.source_set() +libsystem_ss = system_ss specific_fuzz_ss = ss.source_set() specific_ss = ss.source_set() rust_devices_ss = ss.source_set() stub_ss = ss.source_set() trace_ss = ss.source_set() user_ss = ss.source_set() -libuser_ss = ss.source_set() +libuser_ss = user_ss util_ss = ss.source_set() # accel modules @@ -4078,21 +4078,19 @@ common_ss.add(hwcore) system_ss.add(authz, blockdev, chardev, crypto, io, qmp) common_ss.add(qom, qemuutil) -common_ss.add_all(when: 'CONFIG_SYSTEM_ONLY', if_true: [system_ss]) -common_ss.add_all(when: 'CONFIG_USER_ONLY', if_true: user_ss) - libuser = 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) libsystem = 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) # Note that this library is never used directly (only through extract_objects) @@ -4101,7 +4099,6 @@ libsystem = static_library('system', common_all = 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()) @@ -4115,10 +4112,20 @@ foreach target_base_arch, config_base_arch : config_base_arch_mak inc = [common_user_inc + target_inc] target_common = common_ss.apply(config_target, strict: false) + target_system = system_ss.apply(config_target, strict: false) + target_user = user_ss.apply(config_target, strict: false) common_deps = [] + system_deps = [] + user_deps = [] foreach dep: target_common.dependencies() common_deps += dep.partial_dependency(compile_args: true, includes: true) endforeach + foreach dep: target_system.dependencies() + system_deps += dep.partial_dependency(compile_args: true, includes: true) + endforeach + foreach dep: target_user.dependencies() + user_deps += 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 @@ -4133,7 +4140,7 @@ foreach target_base_arch, config_base_arch : config_base_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 += {target_base_arch: lib} endif @@ -4145,7 +4152,8 @@ foreach target_base_arch, config_base_arch : config_base_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 += {target_base_arch: lib} endif @@ -4157,7 +4165,7 @@ foreach target_base_arch, config_base_arch : config_base_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 += {target_base_arch: lib} endif endforeach @@ -4336,12 +4344,12 @@ foreach target : target_dirs arch_deps += src.dependencies() endif if target_type == 'system' - src = libsystem_ss.apply(config_target, strict: false) + src = system_ss.apply(config_target, strict: false) objects += libsystem.extract_objects(src.sources()) arch_deps += src.dependencies() endif if target_type == 'user' - src = libuser_ss.apply(config_target, strict: false) + src = user_ss.apply(config_target, strict: false) objects += libuser.extract_objects(src.sources()) arch_deps += src.dependencies() endif From patchwork Fri May 30 07:11:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 893328 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e0d:0:b0:3a4:ee3f:8f15 with SMTP id p13csp895572wrt; Fri, 30 May 2025 00:17:02 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXyqALNlMuK/6wo3UN+h/LSjxdoZ5IRrGJEVhKZOKDDutukTBMyxY/TpMuSvw1Tv4f6gzIPNQ==@linaro.org X-Google-Smtp-Source: AGHT+IGVNC95+nTUb0/kHMm5Fk9oPIzlxGvBNMIBK0GceZqQUFd+87MaK3kGFnCXtX6zrOlNnymM X-Received: by 2002:a5d:4952:0:b0:3a4:fa09:d135 with SMTP id ffacd0b85a97d-3a4fa09d246mr238763f8f.54.1748589422498; Fri, 30 May 2025 00:17:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1748589422; cv=none; d=google.com; s=arc-20240605; b=XaI7/Zqu/kjMNOUZx0f9Drs7DQBjIiahmoNPP1kqVUtLF+s74kH6H0Z/+sVIUPAIjS Gyp9lVU5RolGUiXFUcq3EmlUDSsqeJjJ4r4MJSF/S2GXfidLHtoUtMPuLO4a8I648I2C 2lbJ1ZcfqRbHHpfJOXFbDkczU+wf6/IZVPeJguqX3LcvTe7bV68z853G9QhHBXvRNedD 4W8dtHXHCUyZ3fnRTa/Zx8fjYeQILcEyrnLgmZuIM6SXRtaboksQPlM2DVAKnHuzK2Zb gRiKy+T/AW2AmvdadCeOT7fNbCeuDAcMsUWp/ijU0V2it9rCoJ+G6Jjs089vYnvbWMzr JB3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=x9Qiw9/YXri1KnMzbUzTnIRkOWa6GS585f0+J5lbOu8=; fh=6Iy23zC9AdgEjl8BT287tms7OsCTNhvcMTX6iUEgWw0=; b=TYi6t762+r+ppUaDHboVCohRcgIFs4WOEpJVmHTIPQgW6CIyWlrDlDPM3IhqqcB14W fFg6DbmGWRUnozuar54EnLEKJi/F7qQnjhPm7QoONcEsbHE73ojT41emwe8q7T9lto5p 8+XeS4E0HzqVouh9iH0WMNeZEMMDFrkRZCEjl5LHUJCU0hM7Myol7xzmusuY2dZTZuLJ bqer7U6sVFj9uWSGUxxDOmGt3SHbY5RFZ8k7cRyrlOKgnDGHYSZymUgz79TiMWSC9OzR x+BZoRZXpNByL/M3IP4UZWLG400PsahJUl3uhLkUD7WFxh3xjt0hPdmmEVunZSaEr8op u8oA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=HFwebqxL; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ffacd0b85a97d-3a4efe85e54si2203453f8f.417.2025.05.30.00.17.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 30 May 2025 00:17:02 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=HFwebqxL; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uKtvY-0008GJ-C0; Fri, 30 May 2025 03:13:17 -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 1uKtvV-0008Fs-3Q for qemu-devel@nongnu.org; Fri, 30 May 2025 03:13:13 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uKtvT-0006ob-Ed for qemu-devel@nongnu.org; Fri, 30 May 2025 03:13:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1748589190; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=x9Qiw9/YXri1KnMzbUzTnIRkOWa6GS585f0+J5lbOu8=; b=HFwebqxLbYt/Fz9PP4czzYdRVMWMySVNMvvRh2FBHhvsnKXwoxqCc4F5pfJ4HO10uSrfO6 xZYwtEW7spMNP0QHO2LhaWBlT46gq8xGW5YwzjwAr6JgUrkwbUGCvAT6eSCuNcMrW+AbSs tNkRqaBPjOAec3y9G12/D2yeUpV7lx0= Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-171-FuwmfpuyPhOJ7l3m8YTpVA-1; Fri, 30 May 2025 03:13:09 -0400 X-MC-Unique: FuwmfpuyPhOJ7l3m8YTpVA-1 X-Mimecast-MFC-AGG-ID: FuwmfpuyPhOJ7l3m8YTpVA_1748589188 Received: by mail-ed1-f69.google.com with SMTP id 4fb4d7f45d1cf-601f3f35b88so1668360a12.1 for ; Fri, 30 May 2025 00:13:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748589187; x=1749193987; 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=x9Qiw9/YXri1KnMzbUzTnIRkOWa6GS585f0+J5lbOu8=; b=l/EgbM6ejWiXXoJBubRVVIWxhVBn+UnakazpUU03FY5oXEfZzj6z9UrjcmXDjiNU+N LffCSCtPTd4CtBZnrQmaMlgrcVqY+xGDJL4dzpXA5FZFu+5FEifpCJirm7/p09DonmNP T6rwTxBtnt4dLz25fjtkfvP/7NeoXCgr2RebeZ2vwcihb96BdXamcyG9QCo4jmKhGyB+ RDmDGZaMZM/KtObqi1lhcyU1GhHUhkMOrKT8Dtr18KXPoUJTtgS3U7xZf6aA08L84SVT 5eeRJl3QS88Bk4YVlk8wfktKnsNvAngvq3mElxSS4jmTb5Nnd0LzSuNw5q52WYfGIQAR JzGw== X-Gm-Message-State: AOJu0YyhRO9ABTwRYN/t8ZDGf+xglvVH0laMhY0WhhZYSo7gxFC1S4Or tfI4Dz6F4kG6vpgsRGxaxo6LZi9QIN5hid69H2NqR+80FyY88FGcNlHOiLkTGtkNbQ82FuNySqf /7RNG0CR7xYBKqwUDO1zSeRoUZqAGTGEnxzVlqnznOssubuK8XT2U2qlquSusZ9sFiMbqyda3Cj t/xzQnpuR4ppU717/BgyPvMlNXhX/otuQhzIGXxjUq X-Gm-Gg: ASbGncv1ORoNDTh5LjblO41KYpZ+CBiXWmFfPp7oHHqSm52DznSevPETlqrvHYMfYb8 atoYNMBORLlXrq35ikfabUnzgGf6l/xm93G1bqEwVYArD1//N5hGj3i2+V3s7lp6pXJsGDXAmBl RcCXTz7Ihh/Wy2VPtW5mk5Jq/BxuHFoTR9L3ppaJPNgcn20jv56ewB2zwVFdvFz+uUT+uMGz/G9 fbN2TPCxnoNzNgovWE1PsaBEWeOZxK0f4ZoXLyg8R29zI85XYPzYGccGXVkA3ajqB4qaaO0FB5z iVUzaU80WQdhNg== X-Received: by 2002:a05:6402:4313:b0:5ff:abf8:3563 with SMTP id 4fb4d7f45d1cf-6056db32012mr1814547a12.14.1748589186977; Fri, 30 May 2025 00:13:06 -0700 (PDT) X-Received: by 2002:a05:6402:4313:b0:5ff:abf8:3563 with SMTP id 4fb4d7f45d1cf-6056db32012mr1814520a12.14.1748589186512; Fri, 30 May 2025 00:13:06 -0700 (PDT) Received: from [192.168.122.1] ([151.49.64.79]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-60566c2a0d2sm1187414a12.5.2025.05.30.00.13.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 May 2025 00:13:05 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= Subject: [PULL 06/77] meson: remove lib{system, user}_ss aliases Date: Fri, 30 May 2025 09:11:36 +0200 Message-ID: <20250530071250.2050910-7-pbonzini@redhat.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250530071250.2050910-1-pbonzini@redhat.com> References: <20250530071250.2050910-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -49 X-Spam_score: -5.0 X-Spam_bar: ----- X-Spam_report: (-5.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.902, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Pierrick Bouvier Signed-off-by: Pierrick Bouvier Tested-by: Philippe Mathieu-Daudé Link: https://lore.kernel.org/r/20250521223414.248276-7-pierrick.bouvier@linaro.org Signed-off-by: Paolo Bonzini --- 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 ea54d15f4a6..1c9f1aa91e7 100644 --- a/meson.build +++ b/meson.build @@ -3694,14 +3694,12 @@ io_ss = ss.source_set() qmp_ss = ss.source_set() qom_ss = ss.source_set() system_ss = ss.source_set() -libsystem_ss = system_ss specific_fuzz_ss = ss.source_set() specific_ss = ss.source_set() rust_devices_ss = ss.source_set() stub_ss = ss.source_set() trace_ss = ss.source_set() user_ss = ss.source_set() -libuser_ss = user_ss util_ss = ss.source_set() # 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 -libuser_ss.add_all(tcg_ss) -libsystem_ss.add_all(tcg_ss) +user_ss.add_all(tcg_ss) +system_ss.add_all(tcg_ss) -libuser_ss.add(files( +user_ss.add(files( 'user-exec.c', 'user-exec-stub.c', )) -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 @@ # # We build two versions of gdbstub, one for each mode -libuser_ss.add(files( +user_ss.add(files( 'gdbstub.c', 'syscalls.c', 'user.c' )) -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]) -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')) -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')) common_ss.add(files('loader.c')) 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) -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 == 'linux' tcg_ss.add(files('perf.c')) endif -libuser_ss.add_all(tcg_ss) -libsystem_ss.add_all(tcg_ss) +user_ss.add_all(tcg_ss) +system_ss.add_all(tcg_ss) From patchwork Fri May 30 07:11:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 893329 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e0d:0:b0:3a4:ee3f:8f15 with SMTP id p13csp896119wrt; Fri, 30 May 2025 00:18:58 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVnezbTsIyL/yVh+2RWno/netZW1ZyQqSrZ8cCTC57ST8Oaq6pGZ4dDjgwGjStCgBNP46HF1g==@linaro.org X-Google-Smtp-Source: AGHT+IHJ1zCCT2NuHMYpMyeSm2T5FNFw1dah5YeVpGZeQcbpn90QdCVwqqKKg+n81O/okIajpexr X-Received: by 2002:a5d:64c9:0:b0:3a4:e60b:7c63 with SMTP id ffacd0b85a97d-3a4f89e2a49mr817281f8f.42.1748589538288; Fri, 30 May 2025 00:18:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1748589538; cv=none; d=google.com; s=arc-20240605; b=IGSkVyasvvOf8B2MXEm06IjToa36gj7SM0NrvDSTyGDe/Kv/ahcONkuj2+w62mO1/R 5I+L21w0GPqWM20QfbiAUgrfepmVKLOylhz83wLeiOUgYQPK0E/arvf+DXrWnN4v3fnU TCfXXKJpE1hEDRuYOHbYXl4IInx2H82pLwRX8bz21a60PZoAf+lfHNShBlUZyz5/Ufh0 osiU0vxGww9cidQJhXJJCGmQq5dmZOJ8wbhYr2QmnPLBxcp15GY6Xbtf8o6ngbWTXOZM 7am4w2JcSegRSHy/RY5S6VpV4uAkloEixNqvaG6Gz7yjlfENb/mgM+4w+GRVwNiiMMju lyWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=XuGM+7MdwY4mWdwDSJvhZdiW4JgFJnWIC6vsozdV364=; fh=6Iy23zC9AdgEjl8BT287tms7OsCTNhvcMTX6iUEgWw0=; b=AsB29d8qk1VH0ru0DcUsk3kmsZsNW3IZAWN0lWuhLKvOJb0/qPCeGInXW4G8jbAXN4 SxzMa9bQ1RVBDD0AvJbqn14whW5s9yWvrjIDyJHAX22t90rVlD9UsDAIDDGBAjvyfeJ4 t8h1ZITUbTyr6Bu/oaNNBm/PG79CAGxy4ceRZwUkfQUHOR67w42T0owTrXIKCj+a4apk 7gd2uMxl9zOdlAdwM19oU7CHjjRgAX/Al6U8T6OVMl17KLetLiJ+1LZUMnfDrr3wB/at PsgW/QnKh2KHEC22Q80UlJeVn9lPUPNTkfkp963UuFXEQ7VHT3pI9boeBw8+cEmLkiHs Xj+g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=ZqU4c0sw; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ffacd0b85a97d-3a4efe57b5bsi2404147f8f.163.2025.05.30.00.18.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 30 May 2025 00:18:58 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=ZqU4c0sw; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uKtvc-0008Gt-06; Fri, 30 May 2025 03:13:20 -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 1uKtvY-0008GM-AJ for qemu-devel@nongnu.org; Fri, 30 May 2025 03:13:17 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uKtvW-0006ou-F8 for qemu-devel@nongnu.org; Fri, 30 May 2025 03:13:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1748589193; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XuGM+7MdwY4mWdwDSJvhZdiW4JgFJnWIC6vsozdV364=; b=ZqU4c0swFqon/lic2dGmYptq5XJWwY1DRRe6Dvp85C5yTrZZtfG6WUxO9tojBXNXpafcXX U3HSTw3eZqWKmFmYFaZK2nofgoeWOSj35viRsllCFniL+bplsKBs6OtBswn4WasqUDqNbd eujBz0HiAmn+GNMSiXjltTbFt/lSKzc= Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-551-Pz0UYwPXNmK5Fp2TaM22TQ-1; Fri, 30 May 2025 03:13:12 -0400 X-MC-Unique: Pz0UYwPXNmK5Fp2TaM22TQ-1 X-Mimecast-MFC-AGG-ID: Pz0UYwPXNmK5Fp2TaM22TQ_1748589191 Received: by mail-ed1-f72.google.com with SMTP id 4fb4d7f45d1cf-603f71f6432so1477261a12.3 for ; Fri, 30 May 2025 00:13:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748589190; x=1749193990; 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=XuGM+7MdwY4mWdwDSJvhZdiW4JgFJnWIC6vsozdV364=; b=f9ekO6LHGG5aWfBen97+bMzJP80k5PcnHWKXBl8WJPSTYMBRH97NL7Eaq4OvsndMdU p2goBsMPAxQnhlpBnRSi+1fijh1n46UNQim681o5cO9kvxh+/JO6dwYKOcYqKuU55l7D YfQ/Uxeofgx5kwAfJ0i5kaL2aqxmb9bo2i+T1B3eiEvgBMBlhFb+lJKH36xQ/y/RGo5C D7rFISViMuLL93HFQ13+V7QoHDwkDPXN9xrSnnu+FbtHfCIF069Db8EM/7FZKPfc4gAJ vTmTXM2MFtQr0fR/U7TuL/ORnNcXHzpHIDN7MpRv7fnYLhpdbAvPagI76nOZLGu5qoKJ wlfQ== X-Gm-Message-State: AOJu0Yw+cr4eV4OnltgsxMgCk/GzM9O2YNw5jJ/W//7GgIpQ0bb0xcao YcKq5NkOVuIQ4X4BJ9Bf4tP9k5k2SndA+WaBYN4fW86i+N+I3JE4sNMtKLtUNsIW5t6XB7NeqMz yovF8r2MDTmL5t5ltp4Tfl5uqh+SiGRSFdFYdTnQq9rb2KHDI2hsPBRIw2rzWCROX1C82dUY8DU sGk21Uj8x4JOMlgUaLeSPphjRPi/JSWhFTvM+aHz+B X-Gm-Gg: ASbGncvjtgCTgYB6O2fYWLTaFaVFvf3UL+xCR4+YeHEjbxkuK7cz325HdFX9uNeE7Tx ss38qqz69GxOAbHnLwpjevJM5JLs3epEwPSXRheDcRQgnfQfh0FwuI7hZz8x50sYVhO+6RdmrtT Sc0U0VwkXTVw2M6bjHJx+W0bgiQBQB/EqbzYlV1TsPp143qdEp370q7fhi5wfpxKA8iYMF+x5Ao MxXoUi++XlQEPKEZbpmEIGct+U4fXFsW69XpefBPnN8WFfhFLbsxB+BeX9uiYhacHi0xTUhTQzU ByIsNiCLgZUsGg== X-Received: by 2002:a05:6402:3514:b0:604:5a44:a5c4 with SMTP id 4fb4d7f45d1cf-6057c60519bmr1055176a12.16.1748589189868; Fri, 30 May 2025 00:13:09 -0700 (PDT) X-Received: by 2002:a05:6402:3514:b0:604:5a44:a5c4 with SMTP id 4fb4d7f45d1cf-6057c60519bmr1055155a12.16.1748589189372; Fri, 30 May 2025 00:13:09 -0700 (PDT) Received: from [192.168.122.1] ([151.49.64.79]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-60566c31885sm1185639a12.10.2025.05.30.00.13.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 May 2025 00:13:07 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= Subject: [PULL 07/77] meson: merge hw_common_arch in target_common_system_arch Date: Fri, 30 May 2025 09:11:37 +0200 Message-ID: <20250530071250.2050910-8-pbonzini@redhat.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250530071250.2050910-1-pbonzini@redhat.com> References: <20250530071250.2050910-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -49 X-Spam_score: -5.0 X-Spam_bar: ----- X-Spam_report: (-5.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.902, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Pierrick Bouvier 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é Link: https://lore.kernel.org/r/20250521223414.248276-8-pierrick.bouvier@linaro.org Signed-off-by: Paolo Bonzini --- meson.build | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/meson.build b/meson.build index 1c9f1aa91e7..f614d112192 100644 --- a/meson.build +++ b/meson.build @@ -4101,7 +4101,6 @@ common_all = static_library('common', dependencies: common_ss.all_dependencies()) # construct common libraries per base architecture -hw_common_arch_libs = {} target_common_arch_libs = {} target_common_system_arch_libs = {} foreach target_base_arch, config_base_arch : config_base_arch_mak @@ -4130,22 +4129,10 @@ foreach target_base_arch, config_base_arch : config_base_arch_mak target_c_args = ['-DCPU_DEFS_H'] target_system_c_args = target_c_args + ['-DCOMPILING_SYSTEM_VS_USER', '-DCONFIG_SOFTMMU'] - if target_base_arch in hw_common_arch - src = hw_common_arch[target_base_arch] - lib = 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 += {target_base_arch: lib} - endif - if target_base_arch in target_common_arch src = target_common_arch[target_base_arch] lib = static_library( - 'target_' + target_base_arch, + 'common_' + target_base_arch, build_by_default: false, sources: src.all_sources() + genh, include_directories: inc, @@ -4155,10 +4142,20 @@ foreach target_base_arch, config_base_arch : config_base_arch_mak target_common_arch_libs += {target_base_arch: lib} endif + # merge hw_common_arch in target_common_system_arch + if target_base_arch in hw_common_arch + hw_src = 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 += {target_base_arch: hw_src} + endif + endif + if target_base_arch in target_common_system_arch src = target_common_system_arch[target_base_arch] lib = static_library( - 'target_system_' + target_base_arch, + 'system_' + target_base_arch, build_by_default: false, sources: src.all_sources() + genh, include_directories: inc, @@ -4351,12 +4348,6 @@ foreach target : target_dirs objects += libuser.extract_objects(src.sources()) arch_deps += src.dependencies() endif - if target_type == 'system' and target_base_arch in hw_common_arch_libs - src = hw_common_arch[target_base_arch].apply(config_target, strict: false) - lib = hw_common_arch_libs[target_base_arch] - objects += lib.extract_objects(src.sources()) - arch_deps += src.dependencies() - endif if target_type == 'system' and target_base_arch in target_common_system_arch_libs src = target_common_system_arch[target_base_arch].apply(config_target, strict: false) lib = target_common_system_arch_libs[target_base_arch]