objtool: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files
PATCH 1/1 objtool: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files
From: Thomas Huth <[email protected]>
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).
---
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(-)
include/linux/objtool.h +4 -4
@@ -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)
include/linux/objtool_types.h +2 -2
@@ -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
Signature · 1 line
2.54.0
The following commit has been merged into the objtool/core branch of tip:
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 <[email protected]> AuthorDate: Fri, 19 Jun 2026 17:57:33 +02:00 Committer: Peter Zijlstra <[email protected]> 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).
--- include/linux/objtool.h | 8 ++++---- include/linux/objtool_types.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-)
include/linux/objtool.h +4 -4
@@ -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)
include/linux/objtool_types.h +2 -2
@@ -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
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.
Quoted 10 lines · Thomas Huth
From: Thomas Huth <[email protected]>
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.
Quoted 2 lines
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.
Quoted 8 lines
Signed-off-by Thomas Huth <[email protected]>---
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
Quoted 60 lines
2 files changed, 6 insertions(+), 6 deletions(-)include/linux/objtool.h +0
-0@@ -7,7 +7,7 @@
#ifdefCONFIG_OBJTOOLinclude/linux/objtool.h +1
-1-#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__
#defineUNWIND_HINT(type, sp_reg, sp_offset, signal)\
"987: \n\t" \include/linux/objtool.h +0
-0@@ -53,7 +53,7 @@
#define__ASM_BREF(label)label ## binclude/linux/objtool.h +1
-1-#else /* __ASSEMBLY__ */ +#else /* __ASSEMBLER__ */
/*
* In asm, there are two kinds of code: normal C-type callable functions andinclude/linux/objtool.h +0
-0@@ -102,11 +102,11 @@ #endif.endm
include/linux/objtool.h +1
-1-#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */
#else /* !CONFIG_OBJTOOL */include/linux/objtool.h +1
-1-#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__
#defineUNWIND_HINT(type, sp_reg, sp_offset, signal)"\n\t" #defineSTACK_FRAME_NON_STANDARD(func)include/linux/objtool_types.h +0
-0@@ -2,7 +2,7 @@ #ifndef _LINUX_OBJTOOL_TYPES_H #define _LINUX_OBJTOOL_TYPES_Hinclude/linux/objtool_types.h +1
-1-#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__
#include <linux/types.h>include/linux/objtool_types.h +0
-0@@ -18,7 +18,7 @@ struct unwind_hint { u8 signal; };include/linux/objtool_types.h +1
-1-#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */
/*
*UNWIND_HINT_TYPE_UNDEFINED: A blind spot in ORC coverage which can result in
Quoted 12 lines · Manuel Ebner
Hi Thomas,
I have been building the next kernel:
Version: next-20260810
make defconfig
make KCFLAGS=-Werror -j8 > make_output.txtI 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.
...
Quoted 1 line
This warning can be fixed OR shut down by updating
tools/include/linux/objtool_types.hwith 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