From patchwork Fri May 9 08:48:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilias Apalodimas X-Patchwork-Id: 888805 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp262265wrr; Fri, 9 May 2025 01:48:47 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXqOkF0rkY7sGnMgMttIT8EkS1dFdZ9CR3MZzb8e2ueU2/sDXAy9cldtv7rOqkqgHd8OCuZxQ==@linaro.org X-Google-Smtp-Source: AGHT+IGicL7lXlTRKyti0TaK3+RiMCs4Mk8vWzO5ALzKDWUN2MDTrApqIrGbwon7MYCQGBoKNhgb X-Received: by 2002:adf:f687:0:b0:3a1:fa6c:4735 with SMTP id ffacd0b85a97d-3a1fa6c4838mr659010f8f.35.1746780527679; Fri, 09 May 2025 01:48:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746780527; cv=none; d=google.com; s=arc-20240605; b=DMtpQsJnDgeydLQPRUm02EnxKPFwTTGTznEEyv3nIo3cywjdu9vaeHdwbfpG/0A//g Spyy3e875pSV1dgbGUQeJnuaehQXecmnV1EJw3GiSEI0cAZUupMfbqxWH0ytkvuURV0c /yZxb2C9VeQ972Ks8Z44oVi6sZinucPm8nPCs38i3kWlUhYGTjIicUcnoBiOZxtZWJmh JuboATlDEijANKXmVhvu62t3TZE6fBxBnNjgvuni3/P1GplELW32S6PqXvCiqkg5rTzF CPLhZvMVvYLtRCJE99CKTBR7g7iwz2ynSyZCDyWkCW99HMeTiM+bOopDi0nvInqyBLhA BSjA== 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:message-id:date:subject:cc:to:from:dkim-signature; bh=QfQ1a4M1KVIw2CBwf7u747pnSGqTK3IwJyxpzizwiWQ=; fh=4et9locfdjA2P/olCoWIuvO29jCLvKLW1KZkXNK1/Po=; b=WgILUKmPjPxW8COL6TZxc4BtuVYmK62EQXYn31LsE101fuKNcevnBoEUPu+NKm3Lbq qkGy6pyXX7Sc2dTmSUeQ/Fx8vjLKejdUbDaU9Y/fdXQC5k1vx0lIOtUwHOQ2mxif2n4k ZeSKFN5PifA9G6sElSbeWTw01XKGnHyLMkiHFHNnRG07a/IVQEHb63gNewsEdAwGvkPF 5Btj7pyN+1u9lo8CGDUtyrJzV60Ks1ttDmiZkhpZwAIpaqCSK2lnuuDNETfnEEAwQYLM UcrRffpKIVmVAcYT7HxlkVSdJ9pyaC0cNCjD4frN76AJ49wtKwhZyUmUajzo6tVbsigk tJ0g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mYti25ax; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [85.214.62.61]) by mx.google.com with ESMTPS id ffacd0b85a97d-3a1f5c000e6si1354636f8f.458.2025.05.09.01.48.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 May 2025 01:48:47 -0700 (PDT) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) client-ip=85.214.62.61; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mYti25ax; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 84978806D8; Fri, 9 May 2025 10:48:46 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="mYti25ax"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 36AFB8210D; Fri, 9 May 2025 10:48:46 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 336E88059D for ; Fri, 9 May 2025 10:48:44 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=ilias.apalodimas@linaro.org Received: by mail-ed1-x534.google.com with SMTP id 4fb4d7f45d1cf-5fbfdf7d353so2426419a12.0 for ; Fri, 09 May 2025 01:48:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746780523; x=1747385323; darn=lists.denx.de; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=QfQ1a4M1KVIw2CBwf7u747pnSGqTK3IwJyxpzizwiWQ=; b=mYti25ax4I7pjs/n/aSNLjnKGCX1aiMsfcGalJ/kV61rwYaiESyBn2JJtoiNL9vpm4 F2Nt06HJzw/vsH0qCUDYkKPG2y74Z+rpaElyva3knaW45lGSF/6eETcNoXZbvOxmm36D Cxc4nI8DY2uONZGgsHEie69yvOIU33ZwZy0YO3D6R2ttwBNKPFZplofIrkrjRUTKLAwe H3i01/HZWWpv7BYCjdQaADw+QTGRY1sg4nE0I7TNg9Y5vrx9nOzozcOIj7DbII18oT07 PDTnwHHxg9IanPDRMQF4X2FTOObwQfyC77YTUOe0xy6p6AzbTwb+xTyBuQRMlP83034a bPsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746780523; x=1747385323; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=QfQ1a4M1KVIw2CBwf7u747pnSGqTK3IwJyxpzizwiWQ=; b=BiLULAakSVnFe/aunx0sV6RRRYNqYJBamjO01JLzwYdzuRoMMcZ7CVxtlvR/MRN1T6 lMEqGxYwnRPd5f5+sy1bMt5tSlYmaFCsOtkKVVlhXtlbyyOb8P/c9+spKb1K2iBbqgnG AUcNuZWTfM8tl2+Qd9ULBHGOejHrt5njUncUQQkpRNbHzdDFk0KFuijjYYKKzNeiAZPZ 2lUA+GvuQQ6L7tZ1tQR2giLVdVj99CqxtNg0u89TJl6kDenAm97AtnleScqfTQFyPCFL 59pjP1NxGwjlU3prMZXuu/FfhaV1phzsSEKy/9YZbDtYzZckHox5ya1bmvMbg6ySz1tZ fAWA== X-Forwarded-Encrypted: i=1; AJvYcCX7sbeZjW+d7Vjzn82eVOEM1QRrYidCaaRlTqlSVxH13fjdVt55Ak6RKn8TRHNuAnh+LKi6J2k=@lists.denx.de X-Gm-Message-State: AOJu0YxHB+4KKdF3UlAsZB9vWmcvrmQnDqrTtmhupRIZMVyTh3huJSb4 fFE51Ohr/3jKh7DLagHztP2KUL0tMxgu3xxv0ucmpnwrrRRIvLrAASLVtJqH+0UclmxAOU+Ajmb r X-Gm-Gg: ASbGncsgqRtH0uloXIKZ23OKm+llBBc332xsQd9ymMuivI41kpbQgWCp4NMarZWXLZb papFwmCtQ1+th/Npe6AoM1DkvCbURGuw5z8YLDQ+SEaw2qWYuvw3nElCeqjEb2v555ZJgy5yQjK 9dfCmhI8g95Bfi17dUthUhQmHGIWJhOByQ0g4Za2jmA0Uj4BJz1evIWTvDWEhHGF+kZnorbk6Rb 6kdhxwrxJvZ96wjOuq9KVAJDM60TkzI4ZDWBo48ItGKhMyVlLn5j4v/rKGXr2vpMHRWuybO6Jzp AkWiJUC4A7ngcO0wIzDjI8Ai8SugXGaCaQYZXu0m30xUSvstlxHCiH8DzwOxJ+jM X-Received: by 2002:a05:6402:84a:b0:5fc:9759:3958 with SMTP id 4fb4d7f45d1cf-5fca07a0129mr2000336a12.20.1746780523470; Fri, 09 May 2025 01:48:43 -0700 (PDT) Received: from localhost.localdomain ([46.198.180.244]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5fc9d700e92sm1060038a12.55.2025.05.09.01.48.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 May 2025 01:48:42 -0700 (PDT) From: Ilias Apalodimas To: trini@konsulko.com Cc: Ilias Apalodimas , Simon Glass , Michal Simek , Prasad Kummari , Jiaxun Yang , u-boot@lists.denx.de Subject: [PATCH] kbuild: de-duplicate fixdep usage Date: Fri, 9 May 2025 11:48:28 +0300 Message-ID: <20250509084828.645814-1-ilias.apalodimas@linaro.org> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Backported from the linux kernel commit e4aca4595005 ("kbuild: de-duplicate fixdep usage") A lot of the kernels kbuild depend on that patch. Backport it and pull in the 'rule_as_o_S'a rule as well. This might end up being unused but it doesn't break anything and makes diffing the files easier. Signed-off-by: Ilias Apalodimas --- scripts/Kbuild.include | 5 ++++- scripts/Makefile.build | 17 ++++++++++------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include index 054dd157485c..7468223d3233 100644 --- a/scripts/Kbuild.include +++ b/scripts/Kbuild.include @@ -266,10 +266,13 @@ if_changed = $(if $(strip $(any-prereq) $(arg-check)), \ # Execute the command and also postprocess generated .d dependencies file. if_changed_dep = $(if $(strip $(any-prereq) $(arg-check) ), \ @set -e; \ + $(cmd_and_fixdep), @:) + +cmd_and_fixdep = \ $(echo-cmd) $(cmd_$(1)); \ scripts/basic/fixdep $(depfile) $@ '$(make-cmd)' > $(dot-target).tmp;\ rm -f $(depfile); \ - mv -f $(dot-target).tmp $(dot-target).cmd, @:) + mv -f $(dot-target).tmp $(dot-target).cmd; # Usage: $(call if_changed_rule,foo) # Will check if $(cmd_foo) or any of the prerequisites changed, diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 90aed148c44b..10f31a57a0f9 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -241,14 +241,17 @@ endif define rule_cc_o_c $(call echo-cmd,checksrc) $(cmd_checksrc) \ - $(call echo-cmd,cc_o_c) $(cmd_cc_o_c); \ + $(call cmd_and_fixdep,cc_o_c) \ $(cmd_modversions) \ - $(call echo-cmd,record_mcount) \ - $(cmd_record_mcount) \ - scripts/basic/fixdep $(depfile) $@ '$(call make-cmd,cc_o_c)' > \ - $(dot-target).tmp; \ - rm -f $(depfile); \ - mv -f $(dot-target).tmp $(dot-target).cmd + $(cmd_objtool) \ + $(call echo-cmd,record_mcount) $(cmd_record_mcount) +endef + +define rule_as_o_S + $(call cmd_and_fixdep,as_o_S) + $(call cmd,gen_ksymdeps) + $(call cmd,objtool) + $(call cmd,modversions_S) endef # Built-in and composite module parts