Skip to contentSkip to conversation

scripts: headers_install.sh: Normalize __ASSEMBLY__ to __ASSEMBLER__

PATCH In review Thomas Huth 2 participants 2 messages Jul 22 – Jul 24 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 scripts: headers_install.sh: Normalize __ASSEMBLY__ to __ASSEMBLER__

From: Thomas Huth <[email protected]>

A previous patch to headers_install.sh normalized the usage of __ASSEMBLER__ to __ASSEMBLY__ in the UAPI headers due to two reasons:

1) There was the concern that the UAPI headers might be used with non-GCC-compatible compilers, which do not define __ASSEMBLER__ automatically.

But other C compilers like PCC (see
https://github.com/IanHarvey/pcc/blob/cvs2git/2018.09.20/cc/cc/cc.1#L405)
and Tiny-C (see https://repo.or.cz/tinycc.git/commitdiff/a25325e9be13e52a),
are defining __ASSEMBLER__ for compiling assembler files, too, so using it in UAPI header files should really be fine.

2) 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.

That's true. But since we already shipped a couple of kernel versions that used __ASSEMBLER__ in the UAPI headers for certain architectures, we might now break user space programs that have been developed with these kernel versions if we switch back to __ASSEMBLY__.

Thus let's better always use the macro that is defined by the compilers and standardize on __ASSEMBLER__ instead of __ASSEMBLY__ in all of the UAPI header files now.

---
v2: Updated patch description

 scripts/headers_install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/headers_install.sh +1 -1
index 83e4475968781..2f1d1767ca267 100755
@@ -36,7 +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
+	s/__ASSEMBLY__/__ASSEMBLER__/g
 ' $INFILE > $TMPFILE || exit 1
 
 scripts/unifdef -U__KERNEL__ -D__EXPORTED_HEADERS__ $TMPFILE > $OUTFILE
Signature · 1 line
2.55.0
maintainer
#1 lore raw
Quoted 1 line · Thomas Huth

scripts: headers_install.sh: Normalize __ASSEMBLY__ to __ASSEMBLER__

Applied to kbuild/linux.git (kbuild-next-unstable), thanks!

I apply this early to kbuild-next-unstable for that we have it in linux-next. I am still happy to apply trailers for at least a week, maybe longer. If there is (still) an issue with the commit message, please call out.

[1/1] scripts: headers_install.sh: Normalize __ASSEMBLY__ to __ASSEMBLER__

      https://git.kernel.org/kbuild/c/77e9bd85

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