[PATCH] x86: fix dependency tracking for asm/indirect_thunk_asm.h

[PATCH] x86: fix dependency tracking for asm/indirect_thunk_asm.h

[Jan Beulich]

Including the header solely at the assembler level means the compiler
can't record the header as a dependency in .*.o.d files. Arrange for the
header to be include-able at the C level instead.

Signed-off-by: Jan Beulich <jbeulich@suse.com>

--- a/xen/include/asm-x86/asm_defns.h
+++ b/xen/include/asm-x86/asm_defns.h
@@ -18,12 +18,11 @@
 #ifndef CONFIG_INDIRECT_THUNK
 .equ CONFIG_INDIRECT_THUNK, 0
 #endif
-# include <asm/indirect_thunk_asm.h>
 #else
 asm ( "\t.equ CONFIG_INDIRECT_THUNK, "
       __stringify(IS_ENABLED(CONFIG_INDIRECT_THUNK)) );
-asm ( "\t.include \"asm/indirect_thunk_asm.h\"" );
 #endif
+#include <asm/indirect_thunk_asm.h>
 
 #ifndef __ASSEMBLY__
 void ret_from_intr(void);
--- a/xen/include/asm-x86/indirect_thunk_asm.h
+++ b/xen/include/asm-x86/indirect_thunk_asm.h
@@ -1,7 +1,17 @@
 /*
- * Warning!  This file is included at an assembler level for .c files, causing
- * usual #ifdef'ary to turn into comments.
+ * Trickery to allow this header to be included at the C level, to permit
+ * proper dependency tracking in .*.o.d files, while still having it contain
+ * assembler only macros.
  */
+#ifndef __ASSEMBLY__
+# if 0
+  .if 0
+# endif
+asm ( "\t.include \"asm/indirect_thunk_asm.h\"" );
+# if 0
+  .endif
+# endif
+#else
 
 .macro INDIRECT_BRANCH insn:req arg:req
 /*
@@ -39,3 +49,5 @@
 .macro INDIRECT_JMP arg:req
     INDIRECT_BRANCH jmp \arg
 .endm
+
+#endif





_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Re: [PATCH] x86: fix dependency tracking for asm/indirect_thunk_asm.h

[Wei Liu]

On Tue, Jun 26, 2018 at 01:37:02AM -0600, Jan Beulich wrote:
> Including the header solely at the assembler level means the compiler
> can't record the header as a dependency in .*.o.d files. Arrange for the
> header to be include-able at the C level instead.
> 
> Signed-off-by: Jan Beulich <jbeulich@suse.com>

Reviewed-by: Wei Liu <wei.liu2@citrix.com>

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Ping: [PATCH] x86: fix dependency tracking for asm/indirect_thunk_asm.h

[Jan Beulich]

Ping?

>>> On 26.06.18 at 09:37, <JBeulich@suse.com> wrote:
> Including the header solely at the assembler level means the compiler
> can't record the header as a dependency in .*.o.d files. Arrange for the
> header to be include-able at the C level instead.
> 
> Signed-off-by: Jan Beulich <jbeulich@suse.com>
> 
> --- a/xen/include/asm-x86/asm_defns.h
> +++ b/xen/include/asm-x86/asm_defns.h
> @@ -18,12 +18,11 @@
>  #ifndef CONFIG_INDIRECT_THUNK
>  .equ CONFIG_INDIRECT_THUNK, 0
>  #endif
> -# include <asm/indirect_thunk_asm.h>
>  #else
>  asm ( "\t.equ CONFIG_INDIRECT_THUNK, "
>        __stringify(IS_ENABLED(CONFIG_INDIRECT_THUNK)) );
> -asm ( "\t.include \"asm/indirect_thunk_asm.h\"" );
>  #endif
> +#include <asm/indirect_thunk_asm.h>
>  
>  #ifndef __ASSEMBLY__
>  void ret_from_intr(void);
> --- a/xen/include/asm-x86/indirect_thunk_asm.h
> +++ b/xen/include/asm-x86/indirect_thunk_asm.h
> @@ -1,7 +1,17 @@
>  /*
> - * Warning!  This file is included at an assembler level for .c files, causing
> - * usual #ifdef'ary to turn into comments.
> + * Trickery to allow this header to be included at the C level, to permit
> + * proper dependency tracking in .*.o.d files, while still having it contain
> + * assembler only macros.
>   */
> +#ifndef __ASSEMBLY__
> +# if 0
> +  .if 0
> +# endif
> +asm ( "\t.include \"asm/indirect_thunk_asm.h\"" );
> +# if 0
> +  .endif
> +# endif
> +#else
>  
>  .macro INDIRECT_BRANCH insn:req arg:req
>  /*
> @@ -39,3 +49,5 @@
>  .macro INDIRECT_JMP arg:req
>      INDIRECT_BRANCH jmp \arg
>  .endm
> +
> +#endif




_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Re: [PATCH] x86: fix dependency tracking for asm/indirect_thunk_asm.h

[Andrew Cooper]

On 26/06/18 08:37, Jan Beulich wrote:
> Including the header solely at the assembler level means the compiler
> can't record the header as a dependency in .*.o.d files. Arrange for the
> header to be include-able at the C level instead.
>
> Signed-off-by: Jan Beulich <jbeulich@suse.com>

Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel