scripts: headers_install.sh: Normalize __ASSEMBLER__ to __ASSEMBLY__
PATCH v2 1/1 scripts: headers_install.sh: Normalize __ASSEMBLER__ to __ASSEMBLY__
There is an ongoing effort to replace the usage of __ASSEMBLY__ with __ASSEMBLER__ throughout the kernel tree, see for example commit 287d163322b7 ("arm64: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers"). The latter is automatically provided by all compilers and preprocessors supported by the kernel, so the explicit definitions of __ASSEMBLY__ can be removed.
However the UAPI headers might be used with non-GCC-compatible compilers, which do not define __ASSEMBLER__ automatically. So this migration may break users. Also during the migration phase, the UAPI headers will use a mix of *both* __ASSEMBLY__ and __ASSEMBLER__ at the same time, which is ugly and inconsistent.
For now make sure that the exported UAPI headers consistently use __ASSEMBLY__ as before.
---
Changes in v2:
- Normalize *to* __ASSEMBLY__.
- Link to v1: https://patch.msgid.link/[email protected]
---
This should go either through kbuild or asm-generic, I think.
--- scripts/headers_install.sh | 1 + 1 file changed, 1 insertion(+)
scripts/headers_install.sh +1 -0
@@ -36,6 +36,7 @@ sed -E -e ' s/(^|[^a-zA-Z0-9])__packed([^a-zA-Z0-9_]|$)/\1__attribute__((packed))\2/g s/(^|[[:space:](])(inline|asm|volatile)([[:space:](]|$)/\1__\2__\3/g s@#(ifndef|define|endif[[:space:]]*/[*])[[:space:]]*_UAPI@#\1 @ + s/__ASSEMBLER__/__ASSEMBLY__/g ' $INFILE > $TMPFILE || exit 1 scripts/unifdef -U__KERNEL__ -D__EXPORTED_HEADERS__ $TMPFILE > $OUTFILE
---
base-commit: dc59e4fea9d83f03bad6bddf3fa2e52491777482
change-id: 20260302-uapi-assembly-0bb7213b41f1
Best regards,
Signature · 1 line
Thomas Weißschuh <[email protected]>
Thomas Weißschuh <[email protected]> 於 2026年7月1日週三 上午5:15寫道:
Quoted 50 lines
There is an ongoing effort to replace the usage of
__ASSEMBLY__with__ASSEMBLER__throughout the kernel tree, see for example commit287d163322b7("arm64: Replace__ASSEMBLY__with__ASSEMBLER__in non-uapi headers"). The latter is automatically provided by all compilers and preprocessors supported by the kernel, so the explicit definitions of__ASSEMBLY__can be removed.However the UAPI headers might be used with non-GCC-compatible compilers, which do not define
__ASSEMBLER__automatically. So this migration may break users. Also during the migration phase, the UAPI headers will use a mix of *both*__ASSEMBLY__and__ASSEMBLER__at the same time, which is ugly and inconsistent.For now make sure that the exported UAPI headers consistently use
__ASSEMBLY__as before.Signed-off-by Thomas Weißschuh <[email protected]>---
Changes in v2:
- Normalize *to*__ASSEMBLY__.
- Link to v1: https://patch.msgid.link/[email protected]
---
This should go either through kbuild or asm-generic, I think.--- scripts/headers_install.sh | 1 + 1 file changed, 1 insertion(+)scripts/headers_install.sh +1
-1@@ -36,6 +36,7 @@ sed -E -e ' s/(^|[^a-zA-Z0-9])__packed([^a-zA-Z0-9_]|$)/\1__attribute__((packed))\2/g s/(^|[[:space:](])(inline|asm|volatile)([[:space:](]|$)/\1__\2__\3/g s@#(ifndef|define|endif[[:space:]]*/[*])[[:space:]]*_UAPI@#\1 @ + s/__ASSEMBLER__/__ASSEMBLY__/g ' $INFILE > $TMPFILE || exit 1 scripts/unifdef -U__KERNEL__ -D__EXPORTED_HEADERS__ $TMPFILE > $OUTFILE ---base-commit:
dc59e4fea9d83f03bad6bddf3fa2e52491777482
change-id: 20260302-uapi-assembly-0bb7213b41f1Best regards,
--
Thomas Weißschuh <[email protected]>
Quoted 45 lines · Thomas Weißschuh
There is an ongoing effort to replace the usage of
__ASSEMBLY__with__ASSEMBLER__throughout the kernel tree, see for example commit287d163322b7("arm64: Replace__ASSEMBLY__with__ASSEMBLER__in non-uapi headers"). The latter is automatically provided by all compilers and preprocessors supported by the kernel, so the explicit definitions of__ASSEMBLY__can be removed.However the UAPI headers might be used with non-GCC-compatible compilers, which do not define
__ASSEMBLER__automatically. So this migration may break users. Also during the migration phase, the UAPI headers will use a mix of *both*__ASSEMBLY__and__ASSEMBLER__at the same time, which is ugly and inconsistent.For now make sure that the exported UAPI headers consistently use
__ASSEMBLY__as before.Signed-off-by Thomas Weißschuh <[email protected]>---
Changes in v2:
- Normalize *to*__ASSEMBLY__.
- Link to v1: https://patch.msgid.link/[email protected]
---
This should go either through kbuild or asm-generic, I think.--- scripts/headers_install.sh | 1 + 1 file changed, 1 insertion(+)scripts/headers_install.sh +1
-1@@ -36,6 +36,7 @@ sed -E -e ' s/(^|[^a-zA-Z0-9])__packed([^a-zA-Z0-9_]|$)/\1__attribute__((packed))\2/g s/(^|[[:space:](])(inline|asm|volatile)([[:space:](]|$)/\1__\2__\3/g s@#(ifndef|define|endif[[:space:]]*/[*])[[:space:]]*_UAPI@#\1 @ + s/__ASSEMBLER__/__ASSEMBLY__/g ' $INFILE > $TMPFILE || exit 1 scripts/unifdef -U__KERNEL__ -D__EXPORTED_HEADERS__ $TMPFILE > $OUTFILE ---base-commit:
dc59e4fea9d83f03bad6bddf3fa2e52491777482
change-id: 20260302-uapi-assembly-0bb7213b41f1
Quoted 4 lines
Best regards,
Signature · 1 line
Thomas Weißschuh <[email protected]>
Thanks, I'll take it via kbuild. Please veto, if it shall go through asm-generic instead.
Kind regards,
Nicolas
Nicolas Schier
maintainerQuoted 1 line · Thomas Weißschuh
scripts:
headers_install.sh: Normalize__ASSEMBLER__to__ASSEMBLY__
Applied to kbuild/linux.git (kbuild-next-unstable), thanks!
[1/1] scripts: headers_install.sh: Normalize __ASSEMBLER__ to __ASSEMBLY__
https://git.kernel.org/kbuild/c/a6c31a60
Please look out for regression or issue reports or other follow up comments, as they may result in the patch/series getting dropped, reverted or modified (e.g. trailers). Patches applied to the kbuild-next-unstable branch are accepted pending wider testing in linux-next and any post-commit review; they will generally be moved to the kbuild-next branch in about a week if no issues are found.
Best regards,
Signature · 1 line
Nicolas