On Wed, Jul 15, 2020 at 12:48:14PM +0200, Jan Beulich wrote: > Introduce proper assembler macros instead, enabled only when the > assembler itself doesn't support the insns. To avoid duplicating the > macros for assembly and C files, have them processed into asm-macros.h. > This in turn requires adding a multiple inclusion guard when generating > that header. > > No change to generated code. > > Signed-off-by: Jan Beulich <jbeul...@suse.com> > > --- a/xen/arch/x86/Makefile > +++ b/xen/arch/x86/Makefile > @@ -235,7 +235,10 @@ $(BASEDIR)/include/asm-x86/asm-macros.h: > 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 > --- a/xen/arch/x86/arch.mk > +++ b/xen/arch/x86/arch.mk > @@ -20,6 +20,7 @@ $(call as-option-add,CFLAGS,CC,"rdrand % > $(call as-option-add,CFLAGS,CC,"rdfsbase %rax",-DHAVE_AS_FSGSBASE) > $(call as-option-add,CFLAGS,CC,"xsaveopt (%rax)",-DHAVE_AS_XSAVEOPT) > $(call as-option-add,CFLAGS,CC,"rdseed %eax",-DHAVE_AS_RDSEED) > +$(call as-option-add,CFLAGS,CC,"clac",-DHAVE_AS_CLAC_STAC) > $(call as-option-add,CFLAGS,CC,"clwb (%rax)",-DHAVE_AS_CLWB) > $(call as-option-add,CFLAGS,CC,".equ \"x\"$$(comma)1",-DHAVE_AS_QUOTED_SYM) > $(call as-option-add,CFLAGS,CC,"invpcid > (%rax)$$(comma)%rax",-DHAVE_AS_INVPCID) > --- a/xen/arch/x86/asm-macros.c > +++ b/xen/arch/x86/asm-macros.c > @@ -1 +1,2 @@ > +#include <asm/asm-defns.h> > #include <asm/alternative-asm.h> > --- /dev/null > +++ b/xen/include/asm-x86/asm-defns.h
Maybe this could be asm-insn.h or a different name? I find it confusing to have asm-defns.h and an asm_defs.h. Thanks, Roger.
