From patchwork Fri Apr 21 19:36:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 97924 Delivered-To: patch@linaro.org Received: by 10.140.109.52 with SMTP id k49csp474338qgf; Fri, 21 Apr 2017 12:39:23 -0700 (PDT) X-Received: by 10.99.9.131 with SMTP id 125mr13960635pgj.88.1492803563623; Fri, 21 Apr 2017 12:39:23 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 7si11134597pll.102.2017.04.21.12.39.23; Fri, 21 Apr 2017 12:39:23 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1425459AbdDUTjS (ORCPT + 13 others); Fri, 21 Apr 2017 15:39:18 -0400 Received: from conuserg-11.nifty.com ([210.131.2.78]:60258 "EHLO conuserg-11.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1425426AbdDUTjO (ORCPT ); Fri, 21 Apr 2017 15:39:14 -0400 Received: from grover.sesame (FL1-111-169-71-157.osk.mesh.ad.jp [111.169.71.157]) (authenticated) by conuserg-11.nifty.com with ESMTP id v3LJapaV016563; Sat, 22 Apr 2017 04:36:55 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com v3LJapaV016563 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1492803415; bh=9poJ2gK6wj/hPYv0xoF6m35t95XY+uOQhj/zQQUmYPE=; h=From:To:Cc:Subject:Date:From; b=OI5Dir1/cGA2HGgBmre4XCaCkHmCdLhmR1k8TKid5dLYMEwH9P55Q9wAMgws+PgZM RDlJLm7eFKxML3gVAkH34lcw17GrRFTd+oJjjvxe8LsHnw8CdEXa0UugZCzJ2vFG4c i2XG05uszdGWwp4RNMg0vmdzQbzRfa7R5kTBo2EJUOpnzr1GazTDXR70rFV8O+2Gfo yVYrJuVf0ZHtnYj8RkLwKMSIdV6OZsADLlEA2MOwYWGsvzbxHLBtYbltE0NqmvCc/9 b4RzOvXyCil8hUFJtA/B/XWQWpvRqqxqQqgvngGcl3jewqjYZAH+838XhW6PREOWRr 6SvQinhdz1psA== X-Nifty-SrcIP: [111.169.71.157] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Andrew Morton , Greg KH , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, x86@kernel.org, Michal Marek , Sam Ravnborg , Linus Torvalds , Masahiro Yamada Subject: [RFC-b PATCH] kbuild: redefine __FILE__ as relative path from $(srctree) if possible Date: Sat, 22 Apr 2017 04:36:44 +0900 Message-Id: <1492803404-17837-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Since Kbuild runs in the objtree, __FILE__ can be a very long path depending of $(srctree). Commit 9da0763bdd82 ("kbuild: Use relative path when building in a subdir of the source tree") made the situation better for cases where objtree is a child of srctree. ($(srctree) is "..") For other cases of out-of-tree build, filenames in WARN_ON() etc. are still an absolute path. It also means the kernel image depends on where it was built. Here, the idea is to redefine __FILE__ as the relative path from $(srctree), but doing so causes a compiler warning: warning: "__FILE__" redefined [-Wbuiltin-macro-redefined] We can suppress it with -Wno-builtin-macro-redefined. However, this option is not recognized by old compilers. So, __FILE__ is re-defined only when the option is supported. I am adding stringify helper because '"..."' wrapping is the same pattern as in KBUILD_BASENAME, KBUILD_MODNAME. Please note __FILE__ is always an absolute path for external modules. We can strip KBUILD_EXTMOD from the path if we want, but I am not doing that. It would make it difficult to figure out the module in question in case of WARN_ON(). Signed-off-by: Masahiro Yamada --- This is another possible approach. Please see these as well: https://patchwork.kernel.org/patch/9693559/ https://patchwork.kernel.org/patch/9693563/ Pro: this is only touching 3 makefiles. Con: this does not work for old compilers. Makefile | 3 +++ scripts/Kbuild.include | 4 ++++ scripts/Makefile.lib | 6 ++++-- 3 files changed, 11 insertions(+), 2 deletions(-) -- 2.7.4 diff --git a/Makefile b/Makefile index 8804aae..293ef6d 100644 --- a/Makefile +++ b/Makefile @@ -798,6 +798,9 @@ KBUILD_CFLAGS += $(call cc-option,-Werror=strict-prototypes) # Prohibit date/time macros, which would make the build non-deterministic KBUILD_CFLAGS += $(call cc-option,-Werror=date-time) +# Is is possible to redefine __FILE__? +KBUILD_CFLAGS += $(call cc-disable-warning, builtin-macro-redefined) + # enforce correct pointer usage KBUILD_CFLAGS += $(call cc-option,-Werror=incompatible-pointer-types) diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include index 61f87a9..7fc3841 100644 --- a/scripts/Kbuild.include +++ b/scripts/Kbuild.include @@ -31,6 +31,10 @@ baseprereq = $(basename $(notdir $<)) escsq = $(subst $(squote),'\$(squote)',$1) ### +# Quote a string to pass it to C files. foo => '"foo"' +stringify = $(squote)$(quote)$1$(quote)$(squote) + +### # Easy method for doing a status message kecho := : quiet_kecho := echo diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 9e70196..1d789df 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -96,10 +96,12 @@ obj-dirs := $(addprefix $(obj)/,$(obj-dirs)) # Note: Files that end up in two or more modules are compiled without the # KBUILD_MODNAME definition. The reason is that any made-up name would # differ in different configs. -name-fix = $(squote)$(quote)$(subst $(comma),_,$(subst -,_,$1))$(quote)$(squote) +name-fix = $(call stringify,$(subst $(comma),_,$(subst -,_,$1))) basename_flags = -DKBUILD_BASENAME=$(call name-fix,$(basetarget)) modname_flags = $(if $(filter 1,$(words $(modname))),\ -DKBUILD_MODNAME=$(call name-fix,$(modname))) +filepath_flags = $(if $(filter -Wno-builtin-macro-redefined, $(KBUILD_CFLAGS)), \ + -D__FILE__=$(call stringify,$(src)/$(notdir $<))) orig_c_flags = $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) $(KBUILD_SUBDIR_CCFLAGS) \ $(ccflags-y) $(CFLAGS_$(basetarget).o) @@ -163,7 +165,7 @@ endif c_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE) \ $(__c_flags) $(modkern_cflags) \ - $(basename_flags) $(modname_flags) + $(basename_flags) $(modname_flags) $(filepath_flags) a_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE) \ $(__a_flags) $(modkern_aflags)