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