On 04.09.2025 13:41, Marek Marczykowski-Górecki wrote: > Use -fdebug-prefix-map in preference to -ffile-prefix-map, as it's > available in earlier toolchain versions. But use it together with > -fmacro-prefix-map (if available) for hypervisor build, otherwise it > still contains some paths in out-of-tree builds.
I consider it wrong not to use -ffile-prefix-map when available. That already covers more than "debug" and "macro", and it may gain further functionality. > The out of tree build requires -fdebug-prefix-map mapping for both source > dir and object dir - otherwise the latter is included (2 occurrences) in > xen-syms. As indicated in a reply to Andrew on the thread hanging off of my patch - I think whether to remove those wants to be left to the user. > --- a/tools/Makefile > +++ b/tools/Makefile > @@ -1,4 +1,4 @@ > -XEN_ROOT = $(CURDIR)/.. > +XEN_ROOT = $(realpath $(CURDIR)/..) > > export PKG_CONFIG_DIR = $(CURDIR)/pkg-config > > diff --git a/tools/Rules.mk b/tools/Rules.mk > index 725c3c32e9a2..428fce094819 100644 > --- a/tools/Rules.mk > +++ b/tools/Rules.mk > @@ -166,6 +166,8 @@ endif > CFLAGS-$(CONFIG_X86_32) += $(call cc-option,$(CC),-mno-tls-direct-seg-refs) > CFLAGS += $(CFLAGS-y) > > +$(call cc-option-add,CFLAGS,CC,-fdebug-prefix-map=$(realpath $(XEN_ROOT))=.) Here and below - no need to use cc-option-add for -fdebug-prefix-map, which all permissible compilers support. Further, again as per reply to Andrew on the thread hanging off of my patch - I don't view it as desirable to leave the tools/ prefix in place, or e.g. for libraries, the entire tools/libs/<subdir>/ part. Imo every binary should have only the path (if any) from its own source root left. (And yes, how to deal with e.g. shared include files isn't quite clear to me, yet. Maybe we actually need to pass two options.) > --- a/xen/Makefile > +++ b/xen/Makefile > @@ -208,7 +208,7 @@ VPATH := $(srctree) > > export srctree objtree VPATH > > -export XEN_ROOT := $(abs_srctree)/.. > +export XEN_ROOT := $(patsubst %/xen,%,$(abs_srctree)) Unlike for tools/, is this still needed here? You don't use XEN_ROOT below. > @@ -412,6 +412,10 @@ ifneq ($(CONFIG_CC_IS_CLANG),y) > CFLAGS += -Wa,--strip-local-absolute > endif > > +$(call cc-option-add,CFLAGS,CC,-fdebug-prefix-map=$(abs_objtree)=./xen) > +$(call cc-option-add,CFLAGS,CC,-fdebug-prefix-map=$(abs_srctree)=./xen) > +$(call cc-option-add,CFLAGS,CC,-fmacro-prefix-map=$(abs_srctree)=./xen) I disagree with leaving any xen/ prefix there. That's not how in-tree builds name files; everything there is relative to xen/. I also don't really see a point in using . in the substitution (similarly for the toolstack, but there I have less to say). Finally, why pass two identical, possibly long options for in-tree builds (where $(abs_objtree) == $(abs_srctree))? Below I'll reproduce my own further re-worked patch. It's not quite ready for v2 submission yet, I expect though. For example, the actual Kconfig portion is still missing. Whether the @SRC@ and @BLD@ parts actually make sense (or what to replace them by) I'm also unsure about. If nothing else they may need replacing by plain . Jan build: avoid absolute paths in executables For in-tree builds relative paths are used in most cases, whereas for out- of-tree builds in various situations absolute ones come into play. The extra paths can be long, wasting space and e.g. serial line bandwidth. They would also get in the way of location-independent reproducible builds. Leverage newer gcc's (and Clang's) ability to "remap" file names. For older gcc fall back to using the option affecting debug info only. For the few absolute paths appearing in in-tree builds' debug info, use the generally available option, conditional upon a new Kconfig control Signed-off-by: Jan Beulich <jbeul...@suse.com> --- Of course we may want to consider putting this in the top-level Config.mk, to also affect other sub-trees (presently mainly/only affecting debug info, for which even gcc5 already supports -fdebug-prefix-remap=). As to a Fixes: tag, I wasn't quite sure whether to "blame" the introduction of out-of-tree builds. Note that at least in the gcc5 I'm testing with the (limited) effect is further undermined by the compiler emitting the specified command line options into debug info, thus still leaving references to the absolute directories in place. For the mentioned gcc15 issue see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=121788. --- v2: Use $(abs_srctree). Introduce DEBUG_INFO_REL_PATHS. --- a/xen/Makefile +++ b/xen/Makefile @@ -461,7 +461,21 @@ CFLAGS += -flto LDFLAGS-$(CONFIG_CC_IS_CLANG) += -plugin LLVMgold.so endif +CFLAGS-$(CONFIG_DEBUG_INFO_REL_PATHS) += -fdebug-prefix-map=$(abs_srctree)=@SRC@ + ifdef building_out_of_srctree + # Need to add to CFLAGS-y here, as gcc checks later options before earlier + # ones, and we want in particular the latter one(s) here to be checked + # first. + CFLAGS-$(CONFIG_DEBUG_INFO_REL_PATHS) += -fdebug-prefix-map=$(abs_objtree)=@BLD@ + CFLAGS-y += $(call cc-option,$(CC),-ffile-prefix-map=$(abs_srctree)/=) + # While -ffile-prefix-map= implies -fdebug-prefix-map=, we need to use the + # latter explicitly: Up to at least gcc15 the compiler specs translate all + # -ffile-prefix-map= ahead of all -fdebug-prefix-map= when invoking the + # the assembler for *.S files, thus breaking our intended ordering. + # (Otherwise the option below could be passed as 3rd [fallback] argument to + # cc-option above.) + CFLAGS-y += -fdebug-prefix-map=$(abs_srctree)/= CFLAGS += -I$(objtree)/include CFLAGS += -I$(objtree)/arch/$(SRCARCH)/include endif
