[xen master] build: use $(dot-target)

[patchbot@xxxxxxx]

commit 4f86b96779701f430ddbea104c7ce5c76482e16e
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Mon Jun 5 15:02:39 2023 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Mon Jun 5 15:02:39 2023 +0200

    build: use $(dot-target)
    
    While slightly longer, I agree with Andrew that using it helps
    readability. Where touching them anyway, also wrap some overly long
    lines.
    
    Suggested-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    Reviewed-by: Bertrand Marquis <bertrand.marquis@xxxxxxx>
---
 xen/arch/arm/Makefile | 20 +++++++++++---------
 xen/arch/x86/Makefile | 49 ++++++++++++++++++++++++++++---------------------
 2 files changed, 39 insertions(+), 30 deletions(-)

diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile
index d85fc040df..7bf07e9920 100644
--- a/xen/arch/arm/Makefile
+++ b/xen/arch/arm/Makefile
@@ -93,17 +93,19 @@ endif
 
 $(TARGET)-syms: $(objtree)/prelink.o $(obj)/xen.lds
        $(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds -N $< \
-           $(objtree)/common/symbols-dummy.o -o $(@D)/.$(@F).0
-       $(NM) -pa --format=sysv $(@D)/.$(@F).0 \
-               | $(objtree)/tools/symbols $(all_symbols) --sysv --sort 
>$(@D)/.$(@F).0.S
-       $(MAKE) $(build)=$(@D) $(@D)/.$(@F).0.o
+           $(objtree)/common/symbols-dummy.o -o $(dot-target).0
+       $(NM) -pa --format=sysv $(dot-target).0 \
+               | $(objtree)/tools/symbols $(all_symbols) --sysv --sort \
+               > $(dot-target).0.S
+       $(MAKE) $(build)=$(@D) $(dot-target).0.o
        $(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds -N $< \
-           $(@D)/.$(@F).0.o -o $(@D)/.$(@F).1
-       $(NM) -pa --format=sysv $(@D)/.$(@F).1 \
-               | $(objtree)/tools/symbols $(all_symbols) --sysv --sort 
>$(@D)/.$(@F).1.S
-       $(MAKE) $(build)=$(@D) $(@D)/.$(@F).1.o
+           $(dot-target).0.o -o $(dot-target).1
+       $(NM) -pa --format=sysv $(dot-target).1 \
+               | $(objtree)/tools/symbols $(all_symbols) --sysv --sort \
+               > $(dot-target).1.S
+       $(MAKE) $(build)=$(@D) $(dot-target).1.o
        $(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds -N $< $(build_id_linker) \
-           $(@D)/.$(@F).1.o -o $@
+           $(dot-target).1.o -o $@
        $(NM) -pa --format=sysv $@ \
                | $(objtree)/tools/symbols --all-symbols --xensyms --sysv 
--sort \
                > $@.map
diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile
index a3a3c3ba41..e642ad6c55 100644
--- a/xen/arch/x86/Makefile
+++ b/xen/arch/x86/Makefile
@@ -123,7 +123,7 @@ syms-warn-dup-$(CONFIG_ENFORCE_UNIQUE_SYMBOLS) := 
--error-dup
 
 orphan-handling-$(call ld-option,--orphan-handling=warn) += 
--orphan-handling=warn
 
-$(TARGET): TMP = $(@D)/.$(@F).elf32
+$(TARGET): TMP = $(dot-target).elf32
 $(TARGET): $(TARGET)-syms $(efi-y) $(obj)/boot/mkelf32
        $(obj)/boot/mkelf32 $(notes_phdrs) $(TARGET)-syms $(TMP) 
$(XEN_IMG_OFFSET) \
                       `$(NM) $(TARGET)-syms | sed -ne 's/^\([^ ]*\) . 
__2M_rwdata_end$$/0x\1/p'`
@@ -137,23 +137,23 @@ CFLAGS-$(XEN_BUILD_EFI) += -DXEN_BUILD_EFI
 
 $(TARGET)-syms: $(objtree)/prelink.o $(obj)/xen.lds
        $(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds -N $< $(build_id_linker) \
-           $(objtree)/common/symbols-dummy.o -o $(@D)/.$(@F).0
-       $(NM) -pa --format=sysv $(@D)/.$(@F).0 \
+           $(objtree)/common/symbols-dummy.o -o $(dot-target).0
+       $(NM) -pa --format=sysv $(dot-target).0 \
                | $(objtree)/tools/symbols $(all_symbols) --sysv --sort \
-               >$(@D)/.$(@F).0.S
-       $(MAKE) $(build)=$(@D) $(@D)/.$(@F).0.o
+               > $(dot-target).0.S
+       $(MAKE) $(build)=$(@D) $(dot-target).0.o
        $(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds -N $< $(build_id_linker) \
-           $(@D)/.$(@F).0.o -o $(@D)/.$(@F).1
-       $(NM) -pa --format=sysv $(@D)/.$(@F).1 \
+           $(dot-target).0.o -o $(dot-target).1
+       $(NM) -pa --format=sysv $(dot-target).1 \
                | $(objtree)/tools/symbols $(all_symbols) --sysv --sort 
$(syms-warn-dup-y) \
-               >$(@D)/.$(@F).1.S
-       $(MAKE) $(build)=$(@D) $(@D)/.$(@F).1.o
+               > $(dot-target).1.S
+       $(MAKE) $(build)=$(@D) $(dot-target).1.o
        $(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds -N $< $(build_id_linker) \
-           $(orphan-handling-y) $(@D)/.$(@F).1.o -o $@
+           $(orphan-handling-y) $(dot-target).1.o -o $@
        $(NM) -pa --format=sysv $@ \
                | $(objtree)/tools/symbols --all-symbols --xensyms --sysv 
--sort \
                > $@.map
-       rm -f $(@D)/.$(@F).[0-9]* $(@D)/..$(@F).[0-9]*
+       rm -f $(dot-target).[0-9]* $(@D)/..$(@F).[0-9]*
 ifeq ($(CONFIG_XEN_IBT),y)
        $(SHELL) $(srctree)/tools/check-endbr.sh $@
 endif
@@ -210,27 +210,34 @@ ifeq ($(CONFIG_DEBUG_INFO),y)
 endif
        $(foreach base, $(VIRT_BASE) $(ALT_BASE), \
                  $(LD) $(call EFI_LDFLAGS,$(base)) -T $(obj)/efi.lds -N $< 
$(relocs-dummy) \
-                       $(objtree)/common/symbols-dummy.o $(note_file_option) 
-o $(@D)/.$(@F).$(base).0 &&) :
-       $(MKRELOC) $(foreach base,$(VIRT_BASE) 
$(ALT_BASE),$(@D)/.$(@F).$(base).0) >$(@D)/.$(@F).0r.S
-       $(NM) -pa --format=sysv $(@D)/.$(@F).$(VIRT_BASE).0 \
-               | $(objtree)/tools/symbols $(all_symbols) --sysv --sort 
>$(@D)/.$(@F).0s.S
+                       $(objtree)/common/symbols-dummy.o $(note_file_option) \
+                       -o $(dot-target).$(base).0 &&) :
+       $(MKRELOC) $(foreach base,$(VIRT_BASE) 
$(ALT_BASE),$(dot-target).$(base).0) \
+               > $(dot-target).0r.S
+       $(NM) -pa --format=sysv $(dot-target).$(VIRT_BASE).0 \
+               | $(objtree)/tools/symbols $(all_symbols) --sysv --sort \
+               > $(dot-target).0s.S
        $(MAKE) $(build)=$(@D) .$(@F).0r.o .$(@F).0s.o
        $(foreach base, $(VIRT_BASE) $(ALT_BASE), \
                  $(LD) $(call EFI_LDFLAGS,$(base)) -T $(obj)/efi.lds -N $< \
-                       $(@D)/.$(@F).0r.o $(@D)/.$(@F).0s.o $(note_file_option) 
-o $(@D)/.$(@F).$(base).1 &&) :
-       $(MKRELOC) $(foreach base,$(VIRT_BASE) 
$(ALT_BASE),$(@D)/.$(@F).$(base).1) >$(@D)/.$(@F).1r.S
-       $(NM) -pa --format=sysv $(@D)/.$(@F).$(VIRT_BASE).1 \
-               | $(objtree)/tools/symbols $(all_symbols) --sysv --sort 
>$(@D)/.$(@F).1s.S
+                       $(dot-target).0r.o $(dot-target).0s.o 
$(note_file_option) \
+                       -o $(dot-target).$(base).1 &&) :
+       $(MKRELOC) $(foreach base,$(VIRT_BASE) 
$(ALT_BASE),$(dot-target).$(base).1) \
+               > $(dot-target).1r.S
+       $(NM) -pa --format=sysv $(dot-target).$(VIRT_BASE).1 \
+               | $(objtree)/tools/symbols $(all_symbols) --sysv --sort \
+               > $(dot-target).1s.S
        $(MAKE) $(build)=$(@D) .$(@F).1r.o .$(@F).1s.o
        $(LD) $(call EFI_LDFLAGS,$(VIRT_BASE)) -T $(obj)/efi.lds -N $< \
-             $(@D)/.$(@F).1r.o $(@D)/.$(@F).1s.o $(orphan-handling-y) 
$(note_file_option) -o $@
+             $(dot-target).1r.o $(dot-target).1s.o $(orphan-handling-y) \
+             $(note_file_option) -o $@
        $(NM) -pa --format=sysv $@ \
                | $(objtree)/tools/symbols --all-symbols --xensyms --sysv 
--sort \
                > $@.map
 ifeq ($(CONFIG_DEBUG_INFO),y)
        $(if $(filter --strip-debug,$(EFI_LDFLAGS)),:$(space))$(OBJCOPY) -O 
elf64-x86-64 $@ $@.elf
 endif
-       rm -f $(@D)/.$(@F).[0-9]* $(@D)/..$(@F).[0-9]*
+       rm -f $(dot-target).[0-9]* $(@D)/..$(@F).[0-9]*
 ifeq ($(CONFIG_XEN_IBT),y)
        $(SHELL) $(srctree)/tools/check-endbr.sh $@
 endif
--
generated by git-patchbot for /home/xen/git/xen.git#master