From: Norbert Manthey Date: Wed, 6 Feb 2019 14:09:33 +0000 (+0100) Subject: asm: handle comments when creating header file X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=09fc4de4a8ebb389641b8b8a632efcb7ca880e08;p=people%2Fpauldu%2Fxen.git asm: handle comments when creating header file In the early steps of compilation, the asm header files are created, such as include/asm-$(TARGET_ARCH)/asm-offsets.h. These files depend on the assembly file arch/$(TARGET_ARCH)/asm-offsets.s, which is generated before. Depending on the used toolchain, there might be comments in the assembly files. Especially the goto-gcc compiler of the bounded model checker CBMC adds comments that start with a '#' symbol at the beginning of the line. This commit adds handling comments in assembler during the creation of the asm header files, especially ignoring lines that start with '#', which indicate comments for both ARM and x86 assembler. The used tool goto-as produces exactly comments of this kind. Signed-off-by: Norbert Manthey Signed-off-by: Michael Tautschnig Reviewed-by: Jan Beulich Release-acked-by: Juergen Gross --- diff --git a/xen/Makefile b/xen/Makefile index 749c213488..ea82fc8ba6 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -191,7 +191,7 @@ include/asm-$(TARGET_ARCH)/asm-offsets.h: arch/$(TARGET_ARCH)/asm-offsets.s echo "#ifndef __ASM_OFFSETS_H__"; \ echo "#define __ASM_OFFSETS_H__"; \ echo ""; \ - sed -rne "/==>/{s:.*==>(.*)<==.*:\1:; s: [\$$#]: :; p;}"; \ + sed -rne "/^[^#].*==>/{s:.*==>(.*)<==.*:\1:; s: [\$$#]: :; p;}"; \ echo ""; \ echo "#endif") <$< >$@