[xen staging] build: generate x86's asm-macros.h with filechk

[patchbot@xxxxxxx]

commit 913b8be1c78f336a066f7237a6b3de42d4537dc8
Author:     Anthony PERARD <anthony.perard@xxxxxxxxxx>
AuthorDate: Fri Feb 25 11:07:04 2022 +0100
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Fri Feb 25 11:07:04 2022 +0100

    build: generate x86's asm-macros.h with filechk
    
    When we will build out-of-tree, make is going to try to generate
    "asm-macros.h" before the directories "arch/x86/include/asm" exist,
    thus we would need to call `mkdir` explicitly. We will use "filechk"
    for that as it does everything that the current recipe does and does
    call `mkdir`.
    
    Also, they are no more "*.new" files generated in this directory.
    
    Signed-off-by: Anthony PERARD <anthony.perard@xxxxxxxxxx>
    Acked-by: Jan Beulich <jbeulich@xxxxxxxx>
---
 xen/arch/x86/Makefile | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile
index 9107cf2ce2..8a081de551 100644
--- a/xen/arch/x86/Makefile
+++ b/xen/arch/x86/Makefile
@@ -236,18 +236,21 @@ include: $(BASEDIR)/arch/x86/include/asm/asm-macros.h
 $(obj)/asm-macros.i: CFLAGS-y += -D__ASSEMBLY__ -P
 
 $(BASEDIR)/arch/x86/include/asm/asm-macros.h: $(obj)/asm-macros.i 
$(src)/Makefile
-       echo '#if 0' >$@.new
-       echo '.if 0' >>$@.new
-       echo '#endif' >>$@.new
-       echo '#ifndef __ASM_MACROS_H__' >>$@.new
-       echo '#define __ASM_MACROS_H__' >>$@.new
-       echo 'asm ( ".include \"$@\"" );' >>$@.new
-       echo '#endif /* __ASM_MACROS_H__ */' >>$@.new
-       echo '#if 0' >>$@.new
-       echo '.endif' >>$@.new
-       cat $< >>$@.new
-       echo '#endif' >>$@.new
-       $(call move-if-changed,$@.new,$@)
+       $(call filechk,asm-macros.h)
+
+define filechk_asm-macros.h
+    echo '#if 0'; \
+    echo '.if 0'; \
+    echo '#endif'; \
+    echo '#ifndef __ASM_MACROS_H__'; \
+    echo '#define __ASM_MACROS_H__'; \
+    echo 'asm ( ".include \"$@\"" );'; \
+    echo '#endif /* __ASM_MACROS_H__ */'; \
+    echo '#if 0'; \
+    echo '.endif'; \
+    cat $<; \
+    echo '#endif'
+endef
 
 $(obj)/efi.lds: AFLAGS-y += -DEFI
 $(obj)/xen.lds $(obj)/efi.lds: $(src)/xen.lds.S FORCE
@@ -261,7 +264,7 @@ $(obj)/efi/mkreloc: $(src)/efi/mkreloc.c
 
 .PHONY: clean
 clean::
-       rm -f *.lds *.new boot/*.o boot/*~ boot/core boot/mkelf32
+       rm -f *.lds boot/*.o boot/*~ boot/core boot/mkelf32
        rm -f asm-macros.i $(BASEDIR)/arch/x86/include/asm/asm-macros.*
        rm -f $(BASEDIR)/.xen-syms.[0-9]* boot/.*.d $(BASEDIR)/.xen.elf32
        rm -f $(BASEDIR)/.xen.efi.[0-9]* efi/*.efi efi/mkreloc
--
generated by git-patchbot for /home/xen/git/xen.git#staging