All of lore.kernel.org
 help / color / mirror / Atom feed
From: Masahiro Yamada <masahiroy@kernel.org>
To: linux-kbuild@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org,
	cocci@inria.fr, Masahiro Yamada <masahiroy@kernel.org>,
	Nicolas Schier <nicolas@fjasle.eu>
Subject: [cocci] [PATCH v2 08/11] kbuild: support -fmacro-prefix-map for external modules
Date: Sun, 10 Nov 2024 10:34:36 +0900	[thread overview]
Message-ID: <20241110013649.34903-9-masahiroy@kernel.org> (raw)
In-Reply-To: <20241110013649.34903-1-masahiroy@kernel.org>

This commit makes -fmacro-prefix-map work for external modules built in
a separate output directory. It improves the reproducibility of external
modules and provides the benefits described in commit a73619a845d5
("kbuild: use -fmacro-prefix-map to make __FILE__ a relative path").

When building_out_of_srctree is not defined (e.g., when the kernel or
external module is built in the source directory), this option is
unnecessary.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: Nicolas Schier <nicolas@fjasle.eu>
---

Changes in v2:
  - Check building_out_of_srctree instead of VPATH

 Makefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 38ce19747728..5488aa96b46b 100644
--- a/Makefile
+++ b/Makefile
@@ -1041,8 +1041,10 @@ ifdef CONFIG_CC_IS_GCC
 KBUILD_CFLAGS   += -fconserve-stack
 endif
 
-# change __FILE__ to the relative path from the srctree
-KBUILD_CPPFLAGS += $(call cc-option,-fmacro-prefix-map=$(srctree)/=)
+# change __FILE__ to the relative path to the source directory
+ifdef building_out_of_srctree
+KBUILD_CPPFLAGS += $(call cc-option,-fmacro-prefix-map=$(srcroot)/=)
+endif
 
 # include additional Makefiles when needed
 include-y			:= scripts/Makefile.extrawarn
-- 
2.43.0


WARNING: multiple messages have this Message-ID (diff)
From: Masahiro Yamada <masahiroy@kernel.org>
To: linux-kbuild@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org,
	cocci@inria.fr, Masahiro Yamada <masahiroy@kernel.org>,
	Nicolas Schier <nicolas@fjasle.eu>
Subject: [PATCH v2 08/11] kbuild: support -fmacro-prefix-map for external modules
Date: Sun, 10 Nov 2024 10:34:36 +0900	[thread overview]
Message-ID: <20241110013649.34903-9-masahiroy@kernel.org> (raw)
In-Reply-To: <20241110013649.34903-1-masahiroy@kernel.org>

This commit makes -fmacro-prefix-map work for external modules built in
a separate output directory. It improves the reproducibility of external
modules and provides the benefits described in commit a73619a845d5
("kbuild: use -fmacro-prefix-map to make __FILE__ a relative path").

When building_out_of_srctree is not defined (e.g., when the kernel or
external module is built in the source directory), this option is
unnecessary.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: Nicolas Schier <nicolas@fjasle.eu>
---

Changes in v2:
  - Check building_out_of_srctree instead of VPATH

 Makefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 38ce19747728..5488aa96b46b 100644
--- a/Makefile
+++ b/Makefile
@@ -1041,8 +1041,10 @@ ifdef CONFIG_CC_IS_GCC
 KBUILD_CFLAGS   += -fconserve-stack
 endif
 
-# change __FILE__ to the relative path from the srctree
-KBUILD_CPPFLAGS += $(call cc-option,-fmacro-prefix-map=$(srctree)/=)
+# change __FILE__ to the relative path to the source directory
+ifdef building_out_of_srctree
+KBUILD_CPPFLAGS += $(call cc-option,-fmacro-prefix-map=$(srcroot)/=)
+endif
 
 # include additional Makefiles when needed
 include-y			:= scripts/Makefile.extrawarn
-- 
2.43.0


  parent reply	other threads:[~2024-11-10  1:37 UTC|newest]

Thread overview: 59+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-11-10  1:34 [cocci] [PATCH v2 00/11] kbuild: support building external modules in a separate build directory Masahiro Yamada
2024-11-10  1:34 ` Masahiro Yamada
2024-11-10  1:34 ` [cocci] [PATCH v2 01/11] kbuild: replace two $(abs_objtree) with $(CURDIR) in top Makefile Masahiro Yamada
2024-11-10  1:34   ` Masahiro Yamada
2024-11-10  1:34 ` [cocci] [PATCH v2 02/11] kbuild: add $(objtree)/ prefix to some in-kernel build artifacts Masahiro Yamada
2024-11-10  1:34   ` Masahiro Yamada
2024-11-10  1:34 ` [cocci] [PATCH v2 03/11] kbuild: rename abs_objtree to abs_output Masahiro Yamada
2024-11-10  1:34   ` Masahiro Yamada
2024-11-10  1:34 ` [cocci] [PATCH v2 04/11] kbuild: use 'output' variable to create the output directory Masahiro Yamada
2024-11-10  1:34   ` Masahiro Yamada
2024-11-10  1:34 ` [cocci] [PATCH v2 05/11] kbuild: change working directory to external module directory with M= Masahiro Yamada
2024-11-10  1:34   ` Masahiro Yamada
2024-11-18 14:47   ` [cocci] " Nicolas Schier
2024-11-18 14:47     ` Nicolas Schier
2024-11-18 17:02     ` [cocci] " Masahiro Yamada
2024-11-18 17:02       ` Masahiro Yamada
2024-11-27 15:29       ` [cocci] " Nicolas Schier
2024-11-27 15:29         ` Nicolas Schier
2024-11-27 23:15         ` [cocci] " Masahiro Yamada
2024-11-27 23:15           ` Masahiro Yamada
2024-12-04 20:51   ` [cocci] " Alison Schofield
2024-12-04 20:51     ` Alison Schofield
2024-12-05  2:33     ` [cocci] " Masahiro Yamada
2024-12-05  2:33       ` Masahiro Yamada
2024-12-04 23:35   ` Charlie Jenkins
2024-12-05  2:48     ` [cocci] " Masahiro Yamada
2024-12-05  2:48       ` Masahiro Yamada
2024-12-05  6:27       ` Charlie Jenkins
2024-12-05  2:06   ` [cocci] " Masahiro Yamada
2024-12-09 13:46   ` Thorsten Blum
2024-12-09 13:55     ` Thorsten Blum
2024-12-10 10:47       ` [cocci] " Masahiro Yamada
2024-12-10 10:47         ` Masahiro Yamada
2024-12-10 11:06         ` Thorsten Blum
2024-12-11  2:36           ` [cocci] " Masahiro Yamada
2024-12-11  2:36             ` Masahiro Yamada
2024-12-10 15:34   ` Jon Hunter
2024-12-11  2:39     ` [cocci] " Masahiro Yamada
2024-12-11  2:39       ` Masahiro Yamada
2024-12-11 12:21       ` Jon Hunter
2024-12-12  2:08         ` [cocci] " Masahiro Yamada
2024-12-12  2:08           ` Masahiro Yamada
2024-12-12  6:00           ` Jon Hunter
2024-12-12 15:49             ` [cocci] " Masahiro Yamada
2024-12-12 15:49               ` Masahiro Yamada
2025-01-27 23:08   ` [cocci] " Qu Wenruo
2025-01-27 23:08     ` Qu Wenruo
2024-11-10  1:34 ` [cocci] [PATCH v2 06/11] kbuild: remove extmod_prefix, MODORDER, MODULES_NSDEPS variables Masahiro Yamada
2024-11-10  1:34   ` Masahiro Yamada
2024-11-10  1:34 ` [cocci] [PATCH v2 07/11] kbuild: support building external modules in a separate build directory Masahiro Yamada
2024-11-10  1:34   ` Masahiro Yamada
2024-11-10  1:34 ` Masahiro Yamada [this message]
2024-11-10  1:34   ` [PATCH v2 08/11] kbuild: support -fmacro-prefix-map for external modules Masahiro Yamada
2024-11-10  1:34 ` [cocci] [PATCH v2 09/11] kbuild: use absolute path in the generated wrapper Makefile Masahiro Yamada
2024-11-10  1:34   ` Masahiro Yamada
2024-11-10  1:34 ` [cocci] [PATCH v2 10/11] kbuild: make wrapper Makefile more convenient for external modules Masahiro Yamada
2024-11-10  1:34   ` Masahiro Yamada
2024-11-10  1:34 ` [cocci] [PATCH v2 11/11] kbuild: allow to start building external modules in any directory Masahiro Yamada
2024-11-10  1:34   ` Masahiro Yamada

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20241110013649.34903-9-masahiroy@kernel.org \
    --to=masahiroy@kernel.org \
    --cc=cocci@inria.fr \
    --cc=linux-kbuild@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=nicolas@fjasle.eu \
    --cc=rust-for-linux@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.