From patchwork Fri May 16 05:27:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 890608 Delivered-To: patch@linaro.org Received: by 2002:adf:e58d:0:b0:3a3:61c9:c5d4 with SMTP id l13csp82149wrm; Thu, 15 May 2025 22:28:40 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVj3vRSegpHtRbnIzXAOQk/2MHBbYeC7YzsxI5lhy5wj+bnbz7zFkjHtnbeve7wV1x33gWnCQ==@linaro.org X-Google-Smtp-Source: AGHT+IEU3GG/GVEQh2Vk3mRz5Ju/HW9nHrPB2w88KVNRG3157HQjic7jiBOfazjMc0ehk3eb4AR/ X-Received: by 2002:a05:622a:1c10:b0:494:a4b4:a21f with SMTP id d75a77b69052e-494ae366aacmr40143291cf.1.1747373320041; Thu, 15 May 2025 22:28:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747373320; cv=none; d=google.com; s=arc-20240605; b=NP+A65+R0NgkppeiEa84t9qX87Xpms0QDiXcDFnnYmgFGX/y0oVY+dZpRUrEtBx3Vj rx9IqoapB3UFDW5X7sDSb2xiMs/HZy8QkpKT6Abr/FXsMrqbMD4zz+WPBozUMRzum26k h18g4Qqd0wMa8vlTTYGLNypNqOWtj0KZlP5l304IZ3txV+cNzduIT4OIzn2MrsK5xSAE Wr4/HnjABeMraovQC+AH8VgoIuiQZCaqQDcY03bMmHMLiKmvbMhsosXjmUqZQaxUdv2e pjnp/ZjIEw9jw1dWt2+iZR8RsYpQrg2SyoxutCCl+qJoBnOz5oajvbg2NEXLBXglQyMB cczQ== 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=kEF4F6w/QQ4yK0T92qmZBuHANuJnFGe0fNZ2771Yy/Q=; fh=a6UbtOiHwyJoMPV3UeNgHrbW2rQ4OdKN6ZJtoRFzk44=; b=YHze3jX5N+zJtdOLkfXYh1jtYx6DCdKnhKP5hnZ8hEFi88y49ZQHeTj32jZNmsTCM9 eXo6UYtoGcP3OHiUUi8kVJ1HB/g4UKVZGWjad7bG58I/JinrxqjCYlb8PZKRwhIqSW+e EGnHwdn7fp/Y6GanEbq6HqOtQ4Z6TuH+ogJcr9djYilhLQlobNqKPb2mdgHnhFD+UAsb VDEzZUoiIwAdAFIC8v9Cwh34Tk5+2icUrWPCSVKFvyKqeDsE0EuHEbRSqwnA9OCeKJWE ub+0ROKj3ip4TdC51Cd8imFIikX7wrqobIFJIa8lNLnSqO0hWF8SPgay29u/j2kpxO8Q LYAg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rVa5Mla9; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-494ae593eddsi14681691cf.484.2025.05.15.22.28.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 22:28:40 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rVa5Mla9; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uFnbO-0006Fw-J3; Fri, 16 May 2025 01:27:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uFnbM-0006D5-OI for qemu-devel@nongnu.org; Fri, 16 May 2025 01:27:20 -0400 Received: from mail-pg1-x535.google.com ([2607:f8b0:4864:20::535]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFnbL-0001Mb-4a for qemu-devel@nongnu.org; Fri, 16 May 2025 01:27:20 -0400 Received: by mail-pg1-x535.google.com with SMTP id 41be03b00d2f7-af51596da56so1281229a12.0 for ; Thu, 15 May 2025 22:27:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747373238; x=1747978038; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=kEF4F6w/QQ4yK0T92qmZBuHANuJnFGe0fNZ2771Yy/Q=; b=rVa5Mla92LYkP8LjojtiTtRaSW0X/c6swHheVMT456CGqntskJvoWTj659jPQR3RZS vy5XgqD1XnrswYhAO8OVmGEoyJLFBFdVHywREcMNCpBmuuyjwGFXQYib2N7Pv4Ehe5qq Sa3mf4A55DjJMjE+7FUVTaoldpKxkYqUC8/W9yP+ikL5yzHAgfS2rZWBg4BdT5TKS+tG HHJd1OCxqobSKzFlkBPrstjzPIec2l0zIFyQrwq/o3rV2Hg626EbsAA9A+2rdffh0ng5 uNqAOG+E4J15CneeLO85XKG0WUlWrs3EHe+DpixTbNdGffDp0f6v20kMZc0fO1fNHKDz PJcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747373238; x=1747978038; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kEF4F6w/QQ4yK0T92qmZBuHANuJnFGe0fNZ2771Yy/Q=; b=fASfMrgWDURzVRQn+s02t3JjVa0U5aZC1RrKpnlJz7/g4ofcnYY9e1KICs8vQjR1BU FjFILRA+EH7jKwIwQDY/ICkrortXrmPOICM08fICZMJ7kh+ZFnLeOrLj4uke7+08k7PA EWRZoo/55tHsUr02F9wuw/Ui0pK+rBufJNxvSScl25/oMmW31GYPL7wvCODqeOGSMOb/ VOUVMPdd2J//eAIhjs6VWFxcRdlHaNsuNqZfoyi2Futq9PUt3HWmzb9xRxwaeuYO8Jhl ed8HK7clKzA/vUkUGZvJ5IBthDG2T/kQqj0RgjeYCLfVX5A21z7n6bs44/PcB6EzyUN6 RFhg== X-Gm-Message-State: AOJu0YzRzw6dcwu5YdrrrqgRngaf4NWRD0O+B+0l7ngeCavCBSwZVV54 8PFHftqQH/dfo0HBixrHfeiPSWK5o9oW4zyKgiHzcJ6mMVuYCRNjFwI1ffJbQG0wV4Cp54lOPSj R+tCT X-Gm-Gg: ASbGncsG6w0LwYKXO2tmGrNMfILxSukEGuJRMcnDIEivEUEZvMXW4FkVppnrYNYRW9R nQ1RcaY7LWmZHIwlWYjcVTXOZg2/YSp4drqsTilhZRpMJ9OxRZsHW3HyULkxyVvbztJuo3/mb2u GE+k+OQB0JLQXhMQkodChspdq9k7FJqcXXAzR/CRZpqDzUxKbm/5J3iN6lddBAKE/QyNDzOAzmf Ts87TXWkS9AE0DXNmXS8XXcIifQY2pz8WH5U+yTnxMVdZApIuL8P7CPf4nS0l1mVdIjO7n/L20N st+fmmsUM6ih9mKEiwgLGFTegtskVOelVFV9Xcz7/IyhG0enyAQ= X-Received: by 2002:a17:902:d4d1:b0:224:721:ed9 with SMTP id d9443c01a7336-231d45ab656mr29851825ad.44.1747373237831; Thu, 15 May 2025 22:27:17 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-231d4ebabfesm6539135ad.174.2025.05.15.22.27.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 22:27:17 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Richard Henderson , Paolo Bonzini , berrange@redhat.com, =?utf-8?q?Philipp?= =?utf-8?q?e_Mathieu-Daud=C3=A9?= , thuth@redhat.com, Peter Maydell , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Pierrick Bouvier , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH 1/6] meson: build target libraries with common dependencies Date: Thu, 15 May 2025 22:27:03 -0700 Message-ID: <20250516052708.930928-2-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250516052708.930928-1-pierrick.bouvier@linaro.org> References: <20250516052708.930928-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::535; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pg1-x535.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org As mentioned in 20250513115637.184940-1-thuth@redhat.com, dependencies were missing when compiling per target libraries, thus breaking compilation on certain host systems. We now explicitely add common dependencies to those libraries, so it solves the problem. Signed-off-by: Pierrick Bouvier --- meson.build | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/meson.build b/meson.build index 49c8b0e5f6a..197fdc1c210 100644 --- a/meson.build +++ b/meson.build @@ -3259,6 +3259,7 @@ config_devices_mak_list = [] config_devices_h = {} config_target_h = {} config_target_mak = {} +config_base_arch_mak = {} disassemblers = { 'alpha' : ['CONFIG_ALPHA_DIS'], @@ -3451,6 +3452,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 @@ -4131,12 +4137,17 @@ 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'] @@ -4151,7 +4162,7 @@ foreach target : target_dirs sources: src.all_sources() + genh, include_directories: inc, c_args: target_system_c_args, - dependencies: src.all_dependencies()) + dependencies: src.all_dependencies() + common_deps) hw_common_arch_libs += {target_base_arch: lib} endif endif @@ -4165,7 +4176,7 @@ foreach target : target_dirs sources: src.all_sources() + genh, include_directories: inc, c_args: target_c_args, - dependencies: src.all_dependencies()) + dependencies: src.all_dependencies() + common_deps) target_common_arch_libs += {target_base_arch: lib} endif endif @@ -4179,7 +4190,7 @@ foreach target : target_dirs sources: src.all_sources() + genh, include_directories: inc, c_args: target_system_c_args, - dependencies: src.all_dependencies()) + dependencies: src.all_dependencies() + common_deps) target_common_system_arch_libs += {target_base_arch: lib} endif endif From patchwork Fri May 16 05:27:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 890610 Delivered-To: patch@linaro.org Received: by 2002:adf:e58d:0:b0:3a3:61c9:c5d4 with SMTP id l13csp82212wrm; Thu, 15 May 2025 22:28:55 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVWqaxV7JVEfu+hb66osxhwm8rnc/4x2t4lM6Q/qTPmgoy5z5YVQKr4Xqzl1j7LCpZeX/8aGQ==@linaro.org X-Google-Smtp-Source: AGHT+IHRRDnnKH2PYqWLV8VVNnYwj7bV68wocL8MS97EPCnRbGipFlcQw9bxs3+TygbEncmqEbUF X-Received: by 2002:a05:622a:5408:b0:474:f4a4:2ca9 with SMTP id d75a77b69052e-494ae3850e7mr33383461cf.25.1747373335275; Thu, 15 May 2025 22:28:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747373335; cv=none; d=google.com; s=arc-20240605; b=ih/knaYzJmqqjFYTeGSVCeEEM3UXQJW9rcHv3tAHSdVrMsGN66f1QOA6I5Pc+YLOo9 iUB4RKTLjFo/LWFLelAInG/eoF+0w9nyY/pQZFu6VLlXlwSR2c3O2dYsRiKFDUTqLTk5 FWKNrQApzcK8q3ohhm6Ygk6qsG0G9EscERxbhxgI13cmyZZd+wT/outHPRXNDKVgxE/0 92UDYamYgqkD/cgxlVGwjYHosVZomVHrjz2wMJJAOZRe0V5HseF7i6RnF9+Qrmf1Yrxk AXIXiOp1f3iAVHS7fT3I6sx3lKRQsqsRolZ+A5Q1uC+5NAoHAnpRcuRuoLSw3ZxQcGxf Znxg== 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=IEdpnrBOTPtpx4cupcWYpTpp82dk3nMUunAlRdaZgS0=; fh=a6UbtOiHwyJoMPV3UeNgHrbW2rQ4OdKN6ZJtoRFzk44=; b=YNKgYgSAw1fT1KeIoffgXFNxRUkQVVQRojT2B/GzdIikUwz2nbzeuZiFmnc8503bBC dcbDnrfFchBXVpJDLstvu5oAaIW5l6iGmZSeAzEOtS3zJybUflYYX8nKs+UEPy0dgOOe 6MC8iPMJk0+xljfGDdvnj+fNlTi4Xy7gNJSmgjrF1J/Udvdg48DDsn+Vs4jO/DeGTCsr 8/wQDAt+7Zp3EzkJKNdC/dRAeFQtYe8FiICB1HU7zEHW/N1AZo8gHKX6f5gyKXKjmJZn GhkRQflDCpfbdoreROeBe1P4TysqXmLLiTM0zrd3ClzuUsPik057oZluzyr158xSNgAy dzyg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=KgeZZyRt; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-494ae592f5bsi13361811cf.543.2025.05.15.22.28.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 22:28:55 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=KgeZZyRt; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uFnbP-0006Gc-CR; Fri, 16 May 2025 01:27:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uFnbN-0006EM-Gx for qemu-devel@nongnu.org; Fri, 16 May 2025 01:27:21 -0400 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFnbM-0001Mf-22 for qemu-devel@nongnu.org; Fri, 16 May 2025 01:27:21 -0400 Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-22fbbf9c01bso14480655ad.3 for ; Thu, 15 May 2025 22:27:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747373239; x=1747978039; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=IEdpnrBOTPtpx4cupcWYpTpp82dk3nMUunAlRdaZgS0=; b=KgeZZyRtsTn1pbfWbPf7OmFekLJstXb4va4oM6wYmwW6nVDY9AYlN2jHAIhG9c2KtA ZFW9f8Fg5AWrKUHYSM1p45C33wykYEtBzFfCy/dglCm63OvSlUh7whYGwqJ65NgRqQaQ ERcuC/roUxOgaNKRY4xueCVwiMci66ipuA1piGp34VyGcwPM1XduGWsyIDbjzVGRnWGL IR6YuZtsZDmdziGo/2/6TX/DyWKagql8zOtGn/QityS4kqSjn61akrvq4uCA9jFHsPdE W9gMcQFQdJ8EFoxISj/sO5KAE5PnZVzxCB/3h7zu4gGhoFHrchpAfrcCuLlwJ2Xbc4JT KcrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747373239; x=1747978039; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=IEdpnrBOTPtpx4cupcWYpTpp82dk3nMUunAlRdaZgS0=; b=P3u7U3p4jXQl7Ti8xNlfIrv2nVH8USCfE8lYQM9ikMfjfl5+ZfBK1i21unnw0EzDXx 4Rmml8bJFy4dvhhLNVitaTgHwdiwJSC6mRZAMpfwWuj7jtZ4m0VSV7RlwznXAmn5ALOz xFl4BOI3QqQyIM8Q0NQJgle1PQYz57jojz2WuCZBkgl9XNwMEHr3mCBneDjuu9dAao8F nQ+TWE8jF71ZP2u7nny7Eq4LyNTv4RC8yArrSeWx3zO5ZFBaCUMLb0N832T1tnX7CVqe gZ3kYp5MCmbdWa2RQfoRqoxG7eXABjEYzLZ4aIJGB9b1Emfdzb90c0SeIuOG/pOSEvwC prUw== X-Gm-Message-State: AOJu0Yx4zLUhPK4vvfISPACrqnlxmN++wl69iLlwlGUoEH33DmWBdgyb rmatzOVT2yFQAQ6wQgN9dX4R+3X9uzpGq1nRg2Ia4Y27owfxo2Mbt8ojqgSXYEd6lsXztjr43nW lCL6T X-Gm-Gg: ASbGnctVBP1WCoD4Fudhg/d3VoQiVAqwnfJcuIQnvsnZk+B0nPgNHQCADz1FFpMp3B/ zQu5568bMJ/nOJDJu1aPfs+PQnP7EC0QmavAPzeHdkKPlFgUT62/dw1+2oZBny8W1PA/latB71L wd9XSH/RXg75yZ7rLg1WBjTxoFbxONnkPLJRZwsIiLcaQjwGv6w7gM+rcu5kspVHyOoMsixTcFv zKevK5nUMeukxyYzxw2zV2mi9wo92vemZOQ2/yLEo8wYObzmUn96z+LJ025OJ8v4pdfWLmifX+Q b3Yx0jaa2jINsFlLbs7V2SvtHZwBne/IvqxQox6+6twiPRdeBsw= X-Received: by 2002:a17:903:1ace:b0:231:c90e:292d with SMTP id d9443c01a7336-231d45af19fmr28322365ad.44.1747373238737; Thu, 15 May 2025 22:27:18 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-231d4ebabfesm6539135ad.174.2025.05.15.22.27.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 22:27:18 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Richard Henderson , Paolo Bonzini , berrange@redhat.com, =?utf-8?q?Philipp?= =?utf-8?q?e_Mathieu-Daud=C3=A9?= , thuth@redhat.com, Peter Maydell , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Pierrick Bouvier , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH 2/6] hw/arm: remove explicit dependencies listed Date: Thu, 15 May 2025 22:27:04 -0700 Message-ID: <20250516052708.930928-3-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250516052708.930928-1-pierrick.bouvier@linaro.org> References: <20250516052708.930928-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::636; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x636.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Signed-off-by: Pierrick Bouvier --- 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 16 05:27:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 890609 Delivered-To: patch@linaro.org Received: by 2002:adf:e58d:0:b0:3a3:61c9:c5d4 with SMTP id l13csp82168wrm; Thu, 15 May 2025 22:28:44 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWrvpdiq2ViRk/nhQ8ev7U8CnodI2tlT3murS3HGl+EtJx0ln49ZOPxGM5KD45mEUl0PZ4wvA==@linaro.org X-Google-Smtp-Source: AGHT+IGgU/+xs3yHUe5HVM8TfHJFX3ROI53CwVlAU7U14pt3+AlsG2doAnmmhb0uSdpy/VlW8eYz X-Received: by 2002:a05:620a:44d0:b0:7cd:35:52d0 with SMTP id af79cd13be357-7cd460b921bmr299861785a.0.1747373323766; Thu, 15 May 2025 22:28:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747373323; cv=none; d=google.com; s=arc-20240605; b=fFc409QLsAbHXitVnWz3ehhkhLQEAnDqLF4U/ykbkALykW/b8CXpuLzv2dGMqtBvEU iEhPJfkELxFDcdR0J+n1MjUT2g0WjGpp907lRa1cuHYJK32h45tWcy0Aejx+4ahhwFEQ 2eUgKJHQHLvV4ch+mkJrI+l9h6nRpPAiAYKLzxwgxBL3zXcQNzsCvhfSUI4LcFZDvXyi MCi3DTnLQZtzQbmyR42t6o342WG7oOd0zBMuHv9zm/tA1niwagS09tLs3IKpAzwn6xa0 CWiyBRiAZ1yflQMeLg/YKlRnAE9CR3g+kRKnHJygJ0H4+YXXElUR2ZXwp4BbJqdwAsIu o9Kg== 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=dU3iAcSQrpRQtiTX04EuYFPrLnsx+BhMT5SxU3B5tJI=; fh=a6UbtOiHwyJoMPV3UeNgHrbW2rQ4OdKN6ZJtoRFzk44=; b=AYytR35b9mNqBlwC7g7r0YHNyZclR2gA3PlkCGbagTsaTV2LO2VI7o0tZiHog9UnQu 8jDp4EdFBGm6pHuA2cYNZ8FDaJmC38Ol7n1pk7ep4xGVMdo+Rv+LuRaeU141fnp+2zOW F3p0WlBdE6YvondDU9Fnhe2AWuDfMfrZn8TDHYh5qOR3yzGCkLnSoaEusBQxKpR60HT9 mWPHzwMghgGtXTItZT/JVChmgbVd3KZME+d5Ac6jDXtUVtvF36vuCYDo/uo2ifqS3ppY ylynlXFTtMeGQFZFJX/pfmpngv8q4H07EUZEnvF1Z0vhh5Js7GKVtA6oKHfOpSAvmaTt R00w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=P3DH1mix; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-494ae40d70csi12523131cf.59.2025.05.15.22.28.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 22:28:43 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=P3DH1mix; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uFnbR-0006HX-EL; Fri, 16 May 2025 01:27:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uFnbO-0006GF-Qs for qemu-devel@nongnu.org; Fri, 16 May 2025 01:27:22 -0400 Received: from mail-pl1-x62b.google.com ([2607:f8b0:4864:20::62b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFnbN-0001Mn-E5 for qemu-devel@nongnu.org; Fri, 16 May 2025 01:27:22 -0400 Received: by mail-pl1-x62b.google.com with SMTP id d9443c01a7336-23198fcdeb0so16710435ad.2 for ; Thu, 15 May 2025 22:27:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747373239; x=1747978039; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=dU3iAcSQrpRQtiTX04EuYFPrLnsx+BhMT5SxU3B5tJI=; b=P3DH1mixMNf1IpGmQEV6E5ztBn3TKr61GoD3e4IEVmKeQLnyGpc0vpPPiOR8TX5JIB uErv0FiANSpvBJpk/wLq6+uIvGtR/XaimM8yussrzNWpouxrVNtlKazBes0i0jDoIfTj G78DI7DGaR1Jf3ao1Xfq0ZWc/udOz7etZ2K3fKssGk1INVt8HO5mh2ie0i/7KPQQfPR6 rxiOXzLEBIftsCTQdCsp2HC5QkXJMUPHZKV2JPm2+hKVpRzwHn5TT1roi0IJ24urkdg0 lORYwOKDTc56eYp0u3TByyE0EAD6scesrGYG9KxeNGeJhHgomyq9+Ymddkd1lschowW2 Wzog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747373240; x=1747978040; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dU3iAcSQrpRQtiTX04EuYFPrLnsx+BhMT5SxU3B5tJI=; b=sVmPqR5lFy6eQ2ux0/xpqcWSO30Wex96p066h30BlTI6SO3iE3YttyC7smwFUJFzOG Yk8ihJhpaK+lPuRG8GuIrsAUvpUsVmtxZRlX6++RrDYBmADdF/CYE32m8neq72UK5VP5 gZ3rx6+0p03Z4yeTiG1o5RTLXYCwEsTPeM5IYbsX1Hf/Rdt9VQn8peg6g7H1wOULJlL/ XF838SrsQ0k3I3JCzIBHw2lGsykoIx2/gogeO9fOG2e0P2UIAlky+8lYZIxQCwFQ3SsZ taLMfvuHE2Bys1YlImLATG1AY3V82B5oYv/VrM1h2ddFenRBY6aSnUSnn/KfPVAb+RHF hlgQ== X-Gm-Message-State: AOJu0YwbY1M1kfJWop887Gotn3QxOUNNKuo7237OJy8ohFwaCNbIZpP2 Sw9QUQoqE444D4QU4/pTAxYcYzPFd0KoiMxI8fik5MPNYh+PUKuLgWO6xTQ4g0JcUhzTJyXq+0a +uVi0 X-Gm-Gg: ASbGncspRrE40+SRdeZUjsFFm4n164PQdRZ9GqEE7JR1mISZB9C3f3CFDSCUOOC+Mx9 txL2n808YULV2HhGXkUmflNPClRxvWExrG3gdp5XvcQrXIIwikJN5D7gvyuKPbKJqldK1jaBmb4 iYLodFeYx7onh9wq+2ka8/pEp0Bi4gtZJFnyITD3N1/ou/o3OKlTw6n3NDyZ5GP1uLdXKmC1TeA 99ntpG2rO0e002lGKte377R8B04v831GCNuGONL9Nu5+x+mLeL/hpfwI0SazvCPPoiD5IBnrFtb FE3O/yonQkNcfThZt7yUB/s0j0/Up3tS3zqrLUyPGxV+RfVMjBa8aT/usbL63Q== X-Received: by 2002:a17:902:e80c:b0:224:78e:4eb4 with SMTP id d9443c01a7336-231d45a9c3cmr24389565ad.39.1747373239691; Thu, 15 May 2025 22:27:19 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-231d4ebabfesm6539135ad.174.2025.05.15.22.27.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 22:27:19 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Richard Henderson , Paolo Bonzini , berrange@redhat.com, =?utf-8?q?Philipp?= =?utf-8?q?e_Mathieu-Daud=C3=A9?= , thuth@redhat.com, Peter Maydell , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Pierrick Bouvier , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH 3/6] target/arm: remove explicit dependencies listed Date: Thu, 15 May 2025 22:27:05 -0700 Message-ID: <20250516052708.930928-4-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250516052708.930928-1-pierrick.bouvier@linaro.org> References: <20250516052708.930928-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62b; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x62b.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Signed-off-by: Pierrick Bouvier --- 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 16 05:27:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 890607 Delivered-To: patch@linaro.org Received: by 2002:adf:e58d:0:b0:3a3:61c9:c5d4 with SMTP id l13csp82086wrm; Thu, 15 May 2025 22:28:29 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXhGZa0+XNXqkjOhDh3Tkyr6sr3TRemGldgygxh3LxK6O+yj/N3/tmwD3EL9WKC5zW6PGiE3Q==@linaro.org X-Google-Smtp-Source: AGHT+IH2f4WEv4HvwarUlyu7DA0D33gH9cgB4IE+Dv5XMxiQj9a5oNwE8eA+qXUIDE7e1IgMKwg+ X-Received: by 2002:a05:6214:62c:b0:6f5:438f:f4bc with SMTP id 6a1803df08f44-6f8b1249598mr34037956d6.7.1747373309134; Thu, 15 May 2025 22:28:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747373309; cv=none; d=google.com; s=arc-20240605; b=OisoyIfguRnTrwzj5WpBnAloVvB8eB8XF9BqJq5BE1ppBy00RTv1Hc+GtumVdMlYmB KsKNwCt/ZViIAUUS8t4EUzB5ahwuSroEbEC31lBlJcbZFUDYpMI4AVANQN4dM20cj03S VJx7hLdRzJjGpURJP19BiVpLc0fN1lafCQ+M+f9aO1EjE4LplCKZqLx1/zgx36NpqI48 PuxI2Z6M6pIRiTZ/cZvCrNTn3e9j0vInEPi+uIukceX87X4Ac0Y/HsgHnk5gQ6UaKUsy fNBH/3KUTZgECiVZIWQGKTHCIoP5P28Xcfcu5YYdclNVjhm/mPxI0SNbPeETYVzkZgix ujpA== 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=RZ2uL7bC3soA9y6EO90cuXo0NZXixq/mNNsFQ78SaEM=; fh=a6UbtOiHwyJoMPV3UeNgHrbW2rQ4OdKN6ZJtoRFzk44=; b=QLmTY1s/KPVu/K9C07ip+fMznKvEQ7IFQd2vOFkDGPt8MwL18yJrv1Ng2gfG0zDY2/ YkY5XR0GAoOQHJVnPkkKvqTBTEB/R2XlyTdi2GjhhCIrxr6htSbPrA9OZ8Xm7R85jtnc j/Ff4PTLXo/H+C/tk/8LDCaz58fp3Of9ZFWwK7LVoYqZKrpwZipsotI89Vzz7zAR0H6Z dUg22KCJaSFO0J4DFVbu11EZ1ykZfnFUBrXFIIpgmvImdU37pHLm7FLaj9cI2t8/8ByC 3RgmSV5cgIHYYn34HvOGnSpEWbuKxEkQAvtSpUUemBCcWzE1pnpIBLTcliuJgdcpWSdp 249Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rdBWn2Gn; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6f8b099bf1asi15808186d6.248.2025.05.15.22.28.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 22:28: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=@linaro.org header.s=google header.b=rdBWn2Gn; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uFnbS-0006Hj-3n; Fri, 16 May 2025 01:27:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uFnbQ-0006Gs-9S for qemu-devel@nongnu.org; Fri, 16 May 2025 01:27:24 -0400 Received: from mail-pl1-x634.google.com ([2607:f8b0:4864:20::634]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFnbO-0001N5-7d for qemu-devel@nongnu.org; Fri, 16 May 2025 01:27:23 -0400 Received: by mail-pl1-x634.google.com with SMTP id d9443c01a7336-22e16234307so18470005ad.0 for ; Thu, 15 May 2025 22:27:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747373241; x=1747978041; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=RZ2uL7bC3soA9y6EO90cuXo0NZXixq/mNNsFQ78SaEM=; b=rdBWn2GnTsFFoPiozSjitPKmd/j6s6FaWNvGDCbJjqxt1ps/3diE2lQAlE0pmPUCV0 YtAPHXTJvEvH0xQP/s2rUogF3A5tg7Z2R4qxk6kNiZ6d2sFC5mcyfQ9t/Jhganoq7UQd SlLfx8KVYmfpDG/7nc4OZFyqtQK3zTLOn2+9CKf0KXaYbdBwP4hcsMeL3vjOR9FZfwxd QybL1Top15PJFsDEVJ56ficEGqZGxisDoNz107U3y0i4tHDtJ3lqxcOcdFuaekZQHmOk n4KZmcixNFxXyXpzh57y5iIXZdJiPqq3xkoTCVNT0nOPtO2MBNlPy+NOo836FNt+jxr7 nYgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747373241; x=1747978041; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RZ2uL7bC3soA9y6EO90cuXo0NZXixq/mNNsFQ78SaEM=; b=q+DnRszRVFX/GxoIvvOd+sUEqmPCcMrFPZxTofYiYmFTO4diaY5vJ+Rci9L39YrM1Y 77uKhp3W08oNbTLslCP77T9ofDK9TQEBOXnVW7AYKtp0LEkK6g06MxmJQqEtZg5OHxkM TKHcX/rzEBkUoWBfLlz+U4w/btaZ2hxd4yUCEYgCXh6qX0NuOptNW+fmWRZ6o/enRuOc U2TbCM4fUS7oZiOVeORcrf0eGETfNfyYkNWynm2bM5UqxWFL+hLyaP0f2Olh5lRcsicB tkthVDQ1OhAXLhsCZQwHV4qKKz+kDcCwAXOxyWjYGBmAZnTTFDF0SAGyEWnDMEie49Ts csEg== X-Gm-Message-State: AOJu0YyC53dF/wjLQAVr8U4Zb7lem6BVGcyPzWzoRnAa3Msev0NnZdJi p4aVIO+rQ+9NYf8uKMjG/ODi5GDaeL47dupJC5gL5STmNnzWusEYJKykX/5K9Nsl+fUOCFJhEdz zy+r1 X-Gm-Gg: ASbGncsu0W4CGl9xMbWB+eNcusSFaJTLwijy71iNwziwl28mPTaw6CgJsHKEsO3n/ZA 7deSRFf6bvfi+afZz60pDN9a83XC2MYo23PqtYsFoEE91PYDnhPYbGzSex7wtZqvpe8KJICNCxU CQMJsPjDvAQ++wCQ+HBVtQIN1FFhxoGeXCfp+8n70ug+KuoGKgGjF3+uoRsJ7oCd/5suM32v1L8 ErV2zqDKdTTKmhvlFIG2lNnr9yJ3FiFfP09UhLxeou+KcSHAdF2dB6rVIrFwg8q+i7M1jeAC0le Jclf3Kh0l2KrBjDZXnkXOgMVbhYYT9XDXRJtXnp5mmux6jhER9Y= X-Received: by 2002:a17:902:e803:b0:21f:2e:4e4e with SMTP id d9443c01a7336-231d4ae1dbemr24621885ad.5.1747373240683; Thu, 15 May 2025 22:27:20 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-231d4ebabfesm6539135ad.174.2025.05.15.22.27.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 22:27:20 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Richard Henderson , Paolo Bonzini , berrange@redhat.com, =?utf-8?q?Philipp?= =?utf-8?q?e_Mathieu-Daud=C3=A9?= , thuth@redhat.com, Peter Maydell , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Pierrick Bouvier , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH 4/6] meson: apply target config for picking files from lib{system, user} Date: Thu, 15 May 2025 22:27:06 -0700 Message-ID: <20250516052708.930928-5-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250516052708.930928-1-pierrick.bouvier@linaro.org> References: <20250516052708.930928-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::634; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x634.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org semihosting code needs to be included only if CONFIG_SEMIHOSTING is set. However, this is a target configuration, so we need to apply it to the lib{system, user}_ss. As well, this prepares merging lib{system, user}_ss with {system, user}_ss. Acked-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- meson.build | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/meson.build b/meson.build index 197fdc1c210..fadee0f29fa 100644 --- a/meson.build +++ b/meson.build @@ -4101,27 +4101,19 @@ common_ss.add(qom, qemuutil) common_ss.add_all(when: 'CONFIG_SYSTEM_ONLY', if_true: [system_ss]) common_ss.add_all(when: 'CONFIG_USER_ONLY', if_true: user_ss) -libuser_ss = libuser_ss.apply({}) libuser = static_library('user', - libuser_ss.sources() + genh, + libuser_ss.all_sources() + genh, c_args: ['-DCONFIG_USER_ONLY', '-DCOMPILING_SYSTEM_VS_USER'], - dependencies: libuser_ss.dependencies(), + dependencies: libuser_ss.all_dependencies(), build_by_default: false) -libuser = declare_dependency(objects: libuser.extract_all_objects(recursive: false), - dependencies: libuser_ss.dependencies()) -common_ss.add(when: 'CONFIG_USER_ONLY', if_true: libuser) -libsystem_ss = libsystem_ss.apply({}) libsystem = static_library('system', - libsystem_ss.sources() + genh, + libsystem_ss.all_sources() + genh, c_args: ['-DCONFIG_SOFTMMU', '-DCOMPILING_SYSTEM_VS_USER'], - dependencies: libsystem_ss.dependencies(), + dependencies: libsystem_ss.all_dependencies(), build_by_default: false) -libsystem = declare_dependency(objects: libsystem.extract_all_objects(recursive: false), - dependencies: libsystem_ss.dependencies()) -common_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: libsystem) # Note that this library is never used directly (only through extract_objects) # and is not built by default; therefore, source files not used by the build @@ -4365,6 +4357,16 @@ foreach target : target_dirs target_common = common_ss.apply(config_target, strict: false) objects = [common_all.extract_objects(target_common.sources())] arch_deps += target_common.dependencies() + 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_base_arch in target_common_arch_libs src = target_common_arch[target_base_arch].apply(config_target, strict: false) lib = target_common_arch_libs[target_base_arch] From patchwork Fri May 16 05:27:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 890606 Delivered-To: patch@linaro.org Received: by 2002:adf:e58d:0:b0:3a3:61c9:c5d4 with SMTP id l13csp82066wrm; Thu, 15 May 2025 22:28:25 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVGeNuZ82kScsvuOT6ym+BteDwn9i3Ax1+Ym99P0lKwl1RgdhiOGuiuY1CdeTJ94uVz9fi/bQ==@linaro.org X-Google-Smtp-Source: AGHT+IGgu1ODiz1TIz9lEf6v9zxye3UrzfTps3vxsZI6c987L921FQWM+OuVxJwUpexEE9LQ1/Cl X-Received: by 2002:a05:622a:598f:b0:476:850a:5b34 with SMTP id d75a77b69052e-494ae3e6282mr36395881cf.30.1747373305525; Thu, 15 May 2025 22:28:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747373305; cv=none; d=google.com; s=arc-20240605; b=FRomZRb5h+6onN/Vca6BsnPTa+4tiTB1Y1H1jg9fcIGNfCDJHetITilm6E2VomjoGS Bj01OhJ0d9ZFCAJ3jvEJCGZjwvepKNzhS5vWd//xJcb3P4k7dSzqea1X8CIufconudtl uVDg3OQI7AtNTSJOGthAH+px7iisO4EI6dpdiVWO7gYLMyCz6nMDyw+L0SldVBRTttnD ttk44TipPIwNN0blH5xbGc1pRxUn/EeprMjuJU4LqvKYKfkgtWLZunzLYaQRFbUp37UO vw0JEfSJ+PQr83gDHrkh9cxXJFLM+nM38yOks5DibkvaCA4dGivPcOC0RPbPVWHVyIDN XJZg== 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=kXBESZVUZ0qJuwgxJHdI3VR+MEIbN3bpMpEGJ/yalXg=; fh=a6UbtOiHwyJoMPV3UeNgHrbW2rQ4OdKN6ZJtoRFzk44=; b=RXCXXCVGg/36zZDWgjq8rV5wqlDEtYeCESb8cPLTS/3P/bkSRstJg5LHA3SrqVjrZR GivkjEoqTJu5s0XyCnUTSLCpkJM7l6QD9vLGeWS9kRtYV2sE9+ZhRAM1ky9f+8kzvN2+ dUIZzCNiY4YS5AchvGlEL15vINC+anSqYBIk8YfcCmDiQO6EEfqJ9y15w5KkRVdV/Gc1 VIJL4no/rcHwA3Kqt7Ad0ijEab1VUl/y29zN+zpqHTxyeZWIVXPwfme3SMfFO9OGeuna R7tYcnnxB7aRACo2qc2Bgl0MV/Mvs082IU/+NlAquybtweDkTN6kA8JYlGWsQzq0TEyw oC4A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=OV6+ghR4; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-494ae592c06si13258451cf.482.2025.05.15.22.28.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 22:28:25 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=OV6+ghR4; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uFnbT-0006Ie-2Y; Fri, 16 May 2025 01:27:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uFnbR-0006HW-Ao for qemu-devel@nongnu.org; Fri, 16 May 2025 01:27:25 -0400 Received: from mail-pl1-x634.google.com ([2607:f8b0:4864:20::634]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFnbP-0001NL-Et for qemu-devel@nongnu.org; Fri, 16 May 2025 01:27:25 -0400 Received: by mail-pl1-x634.google.com with SMTP id d9443c01a7336-231d4679580so4642245ad.1 for ; Thu, 15 May 2025 22:27:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747373242; x=1747978042; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=kXBESZVUZ0qJuwgxJHdI3VR+MEIbN3bpMpEGJ/yalXg=; b=OV6+ghR4XJLqcSAEn7IvPpjnpDkZpDcHFvAsHDGDBFFxsAQvIPbFr2y0zKMczmaBQw rEeBHKBBGqMCToQAUqf+JFlXNBORK9XnVmUafS1t3TDJcIDPJkO9zzGlg+a8F4LgQIQt wU8fkwDiYr/XPPXw6y4izJnu/OHaJJwYAVNUw2zGlAKu7cJBqnD8zaFbGsa9Rt1WxRzv Rhtq+DD2XVey5X/gkBOIjICTPNbFzjeLNm4tvx6L/JktivAFdiZl9V9aA9qg4im6v0dN 9nJfE96rjr3A2qLCxXTfK0mUqhvykIdLJJy9cD4GZk6I9ZdpZHwC6ndmjb9uWsCbe56w tJzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747373242; x=1747978042; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kXBESZVUZ0qJuwgxJHdI3VR+MEIbN3bpMpEGJ/yalXg=; b=UCR1ji1u2fiMEMkhQXGCqCufZOzVNeo6djnDbKQ5BMecyoKEHYQtxA/Fqo35lUAVcy pVGKpZ13XTnX4vcwXwKkLUPtfAVqKa8Sxnf6C+qp2obwS2r/B3AbNVhcGBQKidXe23EP wkytwVs509JW2tSQ6BOxLFf9+loLT3FNq8lyoJ/saTHmi/Ifcx22p+ggf1WIQHMpJnJD iw3bHElqszqWhCnS+3lbGbP8YnkzLNQTztK4GZpHuw407Am/zVWiWTDn30RpMfEd7dh3 EHNP9ltKgJeCK/qJaR2nYraVXwu/twWNVskUJLkku/2hnwcwm3FW4nw9v2EDMt/qygS6 vjBA== X-Gm-Message-State: AOJu0YxgIiLPNynWTP957UbPYTGfAfZyvZEnJDuvi2REo8tPol4HZ9hP OTAdfbai2i2ZMXEP9CnApX2i26oI0pVI2QPkMYjkRiGDj6DXnQ8f4wsokgp+ePGs3ocAVd+u89/ 2HS1S X-Gm-Gg: ASbGncsO8iMQGYSeDHZYNAQJS5xHvTc6D1x8F8DXSZBQS7icVzRm7ILOakkz0Z0yfaK eZdBq3EloAfwSO/B4qLIdpyeBLF8W/pWdmK3N4FTn2WpNuQ05+RZmQWgZuA03jis4hCHSgiFFNb ewcDyatTCNxF8rzdEkhwLLaOdr/Hvst/6v6+aUSqhmVq/cjuNbYZVGyHC1BTqonliy9YS7jeLEA GrlDi86/XKm/e2G+JRvrK2KWvG4hGS9FsU3hDKBnSUPT0mF6dapA2NPYMGs++2Oma5PXYhhJ0N5 z8nh7z3kOxQOSSXZfncD8csxF1EyBDvZsEhatDA+rWIevFOCGP8= X-Received: by 2002:a17:902:c948:b0:22f:c91f:d05f with SMTP id d9443c01a7336-231d45c99c7mr26113395ad.46.1747373241875; Thu, 15 May 2025 22:27:21 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-231d4ebabfesm6539135ad.174.2025.05.15.22.27.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 22:27:21 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Richard Henderson , Paolo Bonzini , berrange@redhat.com, =?utf-8?q?Philipp?= =?utf-8?q?e_Mathieu-Daud=C3=A9?= , thuth@redhat.com, Peter Maydell , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Pierrick Bouvier , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH 5/6] meson: merge lib{system, user}_ss with {system, user}_ss. Date: Thu, 15 May 2025 22:27:07 -0700 Message-ID: <20250516052708.930928-6-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250516052708.930928-1-pierrick.bouvier@linaro.org> References: <20250516052708.930928-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::634; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x634.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Now that target configuration can be applied to lib{system, user}_ss, there is no reason to keep that separate from the existing {system, user}_ss. We extract existing system/user code common common libraries to lib{system, user}. To not break existing meson files, we alias libsystem_ss to system_ss and libuser_ss to user_ss, so we can do the cleanup in next commit. Signed-off-by: Pierrick Bouvier --- meson.build | 38 +++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/meson.build b/meson.build index fadee0f29fa..98b97fd7ba3 100644 --- a/meson.build +++ b/meson.build @@ -3712,14 +3712,14 @@ io_ss = 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 @@ -4098,21 +4098,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) @@ -4121,7 +4119,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()) @@ -4135,10 +4132,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 @@ -4154,7 +4161,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 endif @@ -4168,7 +4175,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 endif @@ -4182,7 +4190,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 endif @@ -4358,12 +4366,12 @@ foreach target : target_dirs objects = [common_all.extract_objects(target_common.sources())] arch_deps += target_common.dependencies() 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 16 05:27:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 890611 Delivered-To: patch@linaro.org Received: by 2002:adf:e58d:0:b0:3a3:61c9:c5d4 with SMTP id l13csp82214wrm; Thu, 15 May 2025 22:28:55 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVJNJsFeCBzMc3LEeevvB7UYmD8/m36IygGqHkKtVaVDOx+9e2LME6VC6T/AIawmzykILY1Hg==@linaro.org X-Google-Smtp-Source: AGHT+IHxEH+p9EO2Y6XFjPd8VK0nrmXDhfYTtqHlfHl9vLNn/EbGj51FPyVSKGqYwjwywRQdXNAM X-Received: by 2002:a05:622a:428a:b0:494:a30b:e27c with SMTP id d75a77b69052e-494ae407bb0mr35686961cf.39.1747373335452; Thu, 15 May 2025 22:28:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747373335; cv=none; d=google.com; s=arc-20240605; b=JKAyoeQfuxa1KLtvDkD52un4GPvcclA6unoJvcSYwu+Ww6ZG6STyevWKawzZZcU2X9 dfScizHaWL5/erwyvToSTOtLcm42xh+0zyPRN5emPmQuBs8JLBNhdfZ3VB0cJDvNFsI/ ArGhb0E+0n54xQwHO0kegVm3y/lgzglgQt2zBqQs8OmC0tccKv99d6wUiF2NWzqhEErH 0ovGsNd7fB5a6L79HmEUxbxCuYiM+fh2eKuPYRcpQ+BBZprcShEc27zbyh1izienx+BQ sorBcdHdV8mFUsux0P2kMtlTF9OPQiNiAI0uYup7axZ3GTCBO+cp1az6/w2QC3k8wmmb UVHw== 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=bqGoY+CilUPAjO+dXO+6qxpClMsZaBn+YNo/aP57Mxk=; fh=a6UbtOiHwyJoMPV3UeNgHrbW2rQ4OdKN6ZJtoRFzk44=; b=lkSZcxD8puLqXP1mM5L58TicZVSSdsV7KJpPDHP8riA6T6vtvL2mR0Y+/XGpvn2oHG gQ0HBCk5rDgQKRWgmoPviIN+E+pHh6Gk72EksUnItUycBaQA7AV+9KApkhYPanenrlmE 8rVdqxZy6aqxvZvL8Wm0MdXIHdvdeEbp0OOM1Nj+oE/qfgrI/M7gDgJRreoxSoDSaCzL 0XlUleWjAWTxo5rzh2lVkXCnjoD7tQOsMoHlHkpjk8cOGlDnGky0JQEkSIx2s3p+Tvpt BsXv7oXVlTdFIhSPO2EFKk4TAeKz7cnFTQuuhmqXgPDloq4Wb903Tt+LZBXsa7mO/f9D 66ew==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="NYo/HDAt"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-494ae5919dasi14976161cf.513.2025.05.15.22.28.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 22:28:55 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="NYo/HDAt"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uFnbT-0006Ji-MY; Fri, 16 May 2025 01:27:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uFnbS-0006I1-Dd for qemu-devel@nongnu.org; Fri, 16 May 2025 01:27:26 -0400 Received: from mail-pl1-x62b.google.com ([2607:f8b0:4864:20::62b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFnbQ-0001NX-HN for qemu-devel@nongnu.org; Fri, 16 May 2025 01:27:26 -0400 Received: by mail-pl1-x62b.google.com with SMTP id d9443c01a7336-2317d94c9cdso16327785ad.2 for ; Thu, 15 May 2025 22:27:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747373243; x=1747978043; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=bqGoY+CilUPAjO+dXO+6qxpClMsZaBn+YNo/aP57Mxk=; b=NYo/HDAtRxweDrkzLG7bg/UxrwrXIo1yZGfzHBffiIUHQDhEr8IetP0iF+SWorwuI7 QL76fRy4069miCmjtmyrganlE0T8cuS6SKCirOAxq0Os5QcGTedH+v5dO8R1zWjBNKcC PQ7DFn1FV0obcIu7VsBICpAUp+xcPxms9iKMq4hpAMvZPGsM+nDDKd9aM3t/7fSjFSpQ RAZLr3XPK+//CiO0HumkWt05MjtuxRyJehligkKJEoAUUgZyrtsH+5qY2kvFlO6PjZx4 65Ij+q95ptdIitnBMGuU+qngA6DC5Zni8lV64tBIQvkWFgzuBXot0c2PuvvWLX6D9Oiq cB/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747373243; x=1747978043; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bqGoY+CilUPAjO+dXO+6qxpClMsZaBn+YNo/aP57Mxk=; b=qQDxWO5QX/JULw78AJtp0MMHd7xLX4Ah/Ei1Xqy4ii4XmOQyWcwh3V6ATLVHYVmbpT 5VH4UQlmaIAO2VoGlqBC00DNl9uShjBqzxSsJAGB0cyUBSLGm7a49yjf/0zTe/xe2bAN m2SEpFcFsbfXJuIO6N6U+ue+4g5EO4LEC4iYLUjzP8OeBh3gYp0o9NzG2SsSedSPv3oQ CA1RSBoPBU2Ad+0M6fnR7YlnUQ/1BvOTkZydm+lorg/4S+fQwZ8PH8ir/MkwrBFYdjST +6bAIyxR/8bLl842nKgYHDKZM40nYQA9YTzuO/C6nUS/cdNlahzVZ7QRFK1AZ8LXCP3V MnRQ== X-Gm-Message-State: AOJu0Yy7CGTB4mUQFgQnozDfttoOYW3lUBB97BK32vCLdtb7gC75Iv7c d117+c8UfO7YskMc6nHagIhcS6uJYAuiluQedAo23sVRdPYs24yVKZOYO1HTH6XI3XwAvGALc7U MD+BR X-Gm-Gg: ASbGnctL/eGAd2R29jrdp/QFRT1ola9Sd5wCJPr+GT3P2vGrxSbLDI+HkFsDG4nryce yWCfFAOsvPgW/p4pnqTt4LnDfxGDbOQ5MVJ9o+vmLhPGSAS3WG9tZlG6FPX+9LmHRHJU/n3mtOz hIe9kGplc5cy0CynaopmFch/UJVOI+Xkjipc30BQh09i1mta+yN8Ytecoxwdq8MumGG/AfA47DA gu2KIyyp+3TMU3Dgt+mThcqtsWiSwX78kXn0vGp3NlheQ8ci4JUNTz4vfi43E4BrdAfMUhpnn7Q u+++XhP9t2+VSZQOehmBtCOTlqvwRmrE8VvTE84104IrvF92upA= X-Received: by 2002:a17:903:94f:b0:220:ea90:191e with SMTP id d9443c01a7336-231d43d9ca1mr25398015ad.4.1747373243077; Thu, 15 May 2025 22:27:23 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-231d4ebabfesm6539135ad.174.2025.05.15.22.27.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 22:27:22 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Richard Henderson , Paolo Bonzini , berrange@redhat.com, =?utf-8?q?Philipp?= =?utf-8?q?e_Mathieu-Daud=C3=A9?= , thuth@redhat.com, Peter Maydell , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Pierrick Bouvier , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH 6/6] meson: remove lib{system, user}_ss aliases Date: Thu, 15 May 2025 22:27:08 -0700 Message-ID: <20250516052708.930928-7-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250516052708.930928-1-pierrick.bouvier@linaro.org> References: <20250516052708.930928-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62b; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x62b.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Signed-off-by: Pierrick Bouvier --- meson.build | 2 -- accel/tcg/meson.build | 8 ++++---- gdbstub/meson.build | 4 ++-- hw/core/meson.build | 4 ++-- plugins/meson.build | 4 ++-- system/meson.build | 2 +- tcg/meson.build | 4 ++-- 7 files changed, 13 insertions(+), 15 deletions(-) diff --git a/meson.build b/meson.build index 98b97fd7ba3..7aca61a1e8f 100644 --- a/meson.build +++ b/meson.build @@ -3712,14 +3712,12 @@ io_ss = 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)