[PATCH] objtool: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files

[PATCH] objtool: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files

[Thomas Huth]

From: Thomas Huth <thuth@redhat.com>

While the GCC and Clang compilers already define __ASSEMBLER__
automatically when compiling assembly code, __ASSEMBLY__ is a
macro that only gets defined by the Makefiles in the kernel.
This can be very confusing when switching between userspace
and kernelspace coding, or when dealing with uapi headers that
rather should use __ASSEMBLER__ instead. So let's standardize now
on the __ASSEMBLER__ macro that is provided by the compilers.

This is a completely mechanical patch (done with a simple "sed -i"
statement).

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 Note: This patch has been split from an earlier bigger patch of
 mine to ease reviewing.

 include/linux/objtool.h       | 8 ++++----
 include/linux/objtool_types.h | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/linux/objtool.h b/include/linux/objtool.h
index 9a00e701454c5..af2e68e496e5d 100644
--- a/include/linux/objtool.h
+++ b/include/linux/objtool.h
@@ -7,7 +7,7 @@
 
 #ifdef CONFIG_OBJTOOL
 
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
 
 #define UNWIND_HINT(type, sp_reg, sp_offset, signal)		\
 	"987: \n\t"						\
@@ -53,7 +53,7 @@
 
 #define __ASM_BREF(label)	label ## b
 
-#else /* __ASSEMBLY__ */
+#else /* __ASSEMBLER__ */
 
 /*
  * In asm, there are two kinds of code: normal C-type callable functions and
@@ -102,11 +102,11 @@
 #endif
 .endm
 
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
 
 #else /* !CONFIG_OBJTOOL */
 
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
 
 #define UNWIND_HINT(type, sp_reg, sp_offset, signal) "\n\t"
 #define STACK_FRAME_NON_STANDARD(func)
diff --git a/include/linux/objtool_types.h b/include/linux/objtool_types.h
index c6def4049b1ae..c24e9ea392696 100644
--- a/include/linux/objtool_types.h
+++ b/include/linux/objtool_types.h
@@ -2,7 +2,7 @@
 #ifndef _LINUX_OBJTOOL_TYPES_H
 #define _LINUX_OBJTOOL_TYPES_H
 
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
 
 #include <linux/types.h>
 
@@ -18,7 +18,7 @@ struct unwind_hint {
 	u8		signal;
 };
 
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
 
 /*
  * UNWIND_HINT_TYPE_UNDEFINED: A blind spot in ORC coverage which can result in
-- 
2.54.0

[tip: objtool/core] objtool: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files

[tip-bot2 for Thomas Huth]

The following commit has been merged into the objtool/core branch of tip:

Commit-ID:     6e5716b187faf50e5d33f0986ea25827cbdaa294
Gitweb:        https://git.kernel.org/tip/6e5716b187faf50e5d33f0986ea25827cbdaa294
Author:        Thomas Huth <thuth@redhat.com>
AuthorDate:    Fri, 19 Jun 2026 17:57:33 +02:00
Committer:     Peter Zijlstra <peterz@infradead.org>
CommitterDate: Fri, 07 Aug 2026 18:27:18 +02:00

objtool: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files

While the GCC and Clang compilers already define __ASSEMBLER__
automatically when compiling assembly code, __ASSEMBLY__ is a
macro that only gets defined by the Makefiles in the kernel.
This can be very confusing when switching between userspace
and kernelspace coding, or when dealing with uapi headers that
rather should use __ASSEMBLER__ instead. So let's standardize now
on the __ASSEMBLER__ macro that is provided by the compilers.

This is a completely mechanical patch (done with a simple "sed -i"
statement).

Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://patch.msgid.link/20260619155733.58852-1-thuth@redhat.com
---
 include/linux/objtool.h       | 8 ++++----
 include/linux/objtool_types.h | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/linux/objtool.h b/include/linux/objtool.h
index 9a00e70..af2e68e 100644
--- a/include/linux/objtool.h
+++ b/include/linux/objtool.h
@@ -7,7 +7,7 @@
 
 #ifdef CONFIG_OBJTOOL
 
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
 
 #define UNWIND_HINT(type, sp_reg, sp_offset, signal)		\
 	"987: \n\t"						\
@@ -53,7 +53,7 @@
 
 #define __ASM_BREF(label)	label ## b
 
-#else /* __ASSEMBLY__ */
+#else /* __ASSEMBLER__ */
 
 /*
  * In asm, there are two kinds of code: normal C-type callable functions and
@@ -102,11 +102,11 @@
 #endif
 .endm
 
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
 
 #else /* !CONFIG_OBJTOOL */
 
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
 
 #define UNWIND_HINT(type, sp_reg, sp_offset, signal) "\n\t"
 #define STACK_FRAME_NON_STANDARD(func)
diff --git a/include/linux/objtool_types.h b/include/linux/objtool_types.h
index c6def40..c24e9ea 100644
--- a/include/linux/objtool_types.h
+++ b/include/linux/objtool_types.h
@@ -2,7 +2,7 @@
 #ifndef _LINUX_OBJTOOL_TYPES_H
 #define _LINUX_OBJTOOL_TYPES_H
 
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
 
 #include <linux/types.h>
 
@@ -18,7 +18,7 @@ struct unwind_hint {
 	u8		signal;
 };
 
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
 
 /*
  * UNWIND_HINT_TYPE_UNDEFINED: A blind spot in ORC coverage which can result in

Re: [PATCH] objtool: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files

[Manuel Ebner]

Hi Thomas,

I have been building the next kernel:

 Version: next-20260810
 make defconfig
 make KCFLAGS=-Werror -j8 > make_output.txt

I get following warning:
 Warning: Kernel ABI header at 'tools/include/linux/objtool_types.h' differs from latest version at 'include/linux/objtool_types.h'

The build continues and succeeds.

On Fri, 2026-06-19 at 17:57 +0200, Thomas Huth wrote:
> From: Thomas Huth <thuth@redhat.com>
> 
> While the GCC and Clang compilers already define __ASSEMBLER__
> automatically when compiling assembly code, __ASSEMBLY__ is a
> macro that only gets defined by the Makefiles in the kernel.
> This can be very confusing when switching between userspace
> and kernelspace coding, or when dealing with uapi headers that
> rather should use __ASSEMBLER__ instead. So let's standardize now
> on the __ASSEMBLER__ macro that is provided by the compilers.
> 
> This is a completely mechanical patch (done with a simple "sed -i"
> statement).

This warning can be fixed OR shut down by updating tools/include/linux/objtool_types.h with the same replacement.

> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  Note: This patch has been split from an earlier bigger patch of
>  mine to ease reviewing.
> 
>  include/linux/objtool.h       | 8 ++++----
>  include/linux/objtool_types.h | 4 ++--

Because of this file change I think this patch is related to the warning:
 Warning: Kernel ABI header at 'tools/include/linux/objtool_types.h' differs from latest version at 'include/linux/objtool_types.h'

Please advice, Thanks.
 Manuel Ebner

>  2 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/include/linux/objtool.h b/include/linux/objtool.h
> index 9a00e701454c5..af2e68e496e5d 100644
> --- a/include/linux/objtool.h
> +++ b/include/linux/objtool.h
> @@ -7,7 +7,7 @@
>  
>  #ifdef CONFIG_OBJTOOL
>  
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>  
>  #define UNWIND_HINT(type, sp_reg, sp_offset, signal)		\
>  	"987: \n\t"						\
> @@ -53,7 +53,7 @@
>  
>  #define __ASM_BREF(label)	label ## b
>  
> -#else /* __ASSEMBLY__ */
> +#else /* __ASSEMBLER__ */
>  
>  /*
>   * In asm, there are two kinds of code: normal C-type callable functions and
> @@ -102,11 +102,11 @@
>  #endif
>  .endm
>  
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
>  
>  #else /* !CONFIG_OBJTOOL */
>  
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>  
>  #define UNWIND_HINT(type, sp_reg, sp_offset, signal) "\n\t"
>  #define STACK_FRAME_NON_STANDARD(func)
> diff --git a/include/linux/objtool_types.h b/include/linux/objtool_types.h
> index c6def4049b1ae..c24e9ea392696 100644
> --- a/include/linux/objtool_types.h
> +++ b/include/linux/objtool_types.h
> @@ -2,7 +2,7 @@
>  #ifndef _LINUX_OBJTOOL_TYPES_H
>  #define _LINUX_OBJTOOL_TYPES_H
>  
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>  
>  #include <linux/types.h>
>  
> @@ -18,7 +18,7 @@ struct unwind_hint {
>  	u8		signal;
>  };
>  
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
>  
>  /*
>   * UNWIND_HINT_TYPE_UNDEFINED: A blind spot in ORC coverage which can result in

Re: [PATCH] objtool: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files

[Thomas Huth]

On 11/08/2026 15.06, Manuel Ebner wrote:
> Hi Thomas,
> 
> I have been building the next kernel:
> 
>   Version: next-20260810
>   make defconfig
>   make KCFLAGS=-Werror -j8 > make_output.txt
> 
> I get following warning:
>   Warning: Kernel ABI header at 'tools/include/linux/objtool_types.h' differs from latest version at 'include/linux/objtool_types.h'
> 
> The build continues and succeeds.
...
> This warning can be fixed OR shut down by updating tools/include/linux/objtool_types.h with the same replacement.
Sorry for that!

I've got a mail already earlier today about this, looks like Ingo already 
sent a fix:

  https://lore.kernel.org/lkml/178643815674.442315.17965640706499490354.tip-bot2@tip-bot2/

So I assume I don't have to send a v2 of my patch, do I?

  Thomas