init/Kconfig: fix CC_HAS_ASM_GOTO_TIED_OUTPUT test with dash
PATCH v2 1/1 init/Kconfig: fix CC_HAS_ASM_GOTO_TIED_OUTPUT test with dash
From: Alexandre Belloni <[email protected]>
When using dash as /bin/sh, the CC_HAS_ASM_GOTO_TIED_OUTPUT test fails with a syntax error which is not the one we are looking for:
<stdin>: In function ‘foo’:
<stdin>:1:29: warning: missing terminating " character <stdin>:1:29: error: missing terminating " character <stdin>:2:5: error: expected ‘:’ before ‘+’ token <stdin>:2:7: warning: missing terminating " character <stdin>:2:7: error: missing terminating " character <stdin>:2:5: error: expected declaration or statement at end of input
Removing '\n' solves this.
--- init/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
init/Kconfig +1 -1
@@ -87,7 +87,7 @@ config CC_HAS_ASM_GOTO_OUTPUT config CC_HAS_ASM_GOTO_TIED_OUTPUT depends on CC_HAS_ASM_GOTO_OUTPUT # Detect buggy gcc and clang, fixed in gcc-11 clang-14. - def_bool $(success,echo 'int foo(int *x) { asm goto (".long (%l[bar]) - .\n": "+m"(*x) ::: bar); return *x; bar: return 0; }' | $CC -x c - -c -o /dev/null) + def_bool $(success,echo 'int foo(int *x) { asm goto (".long (%l[bar]) - .": "+m"(*x) ::: bar); return *x; bar: return 0; }' | $CC -x c - -c -o /dev/null) config TOOLS_SUPPORT_RELR def_bool $(success,env "CC=$(CC)" "LD=$(LD)" "NM=$(NM)" "OBJCOPY=$(OBJCOPY)" $(srctree)/scripts/tools-support-relr.sh)
Signature · 1 line
2.38.1
+Masahiro and build, as I don't think this should go through the KVM tree (which is also partly why no one has responded).
On a related topic, should init/Kconfig be added to the KCONFIG MAINTAINERS entry? Or is there a better owner for this?
MAINTAINERS +1 -0
@@ -11040,6 +11040,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git F: Documentation/kbuild/kconfig* F: scripts/Kconfig.include F: scripts/kconfig/ +F: init/Kconfig KCOV R: Dmitry Vyukov <[email protected]>
Quoted 26 lines · On Tue, Nov 15, 2022, [email protected] wrote:
From: Alexandre Belloni <[email protected]>
When using dash as
/bin/sh, theCC_HAS_ASM_GOTO_TIED_OUTPUTtest fails with a syntax error which is not the one we are looking for:<stdin>: In function ‘foo’:
<stdin>:1:29: warning: missing terminating " character <stdin>:1:29: error: missing terminating " character <stdin>:2:5: error: expected ‘:’ before ‘+’ token <stdin>:2:7: warning: missing terminating " character <stdin>:2:7: error: missing terminating " character <stdin>:2:5: error: expected declaration or statement at end of inputRemoving '\n' solves this.
Fixes 1aa0e8b144b6 ("Kconfig: Add option for asm goto w/ tied outputs to workaround clang-13 bug")Signed-off-by Alexandre Belloni <[email protected]>--- init/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)init/Kconfig +0
-0
init/Kconfig config CC_HAS_ASM_GOTO_OUTPUT · line 90
Quoted 5 lines
init/Kconfig +1
-1@@ -87,7 +87,7 @@ config CC_HAS_ASM_GOTO_OUTPUT config CC_HAS_ASM_GOTO_TIED_OUTPUT depends on CC_HAS_ASM_GOTO_OUTPUT # Detect buggy gcc and clang, fixed in gcc-11 clang-14. - def_bool $(success,echo 'int foo(int *x) { asm goto (".long (%l[bar]) - .\n": "+m"(*x) ::: bar); return *x; bar: return 0; }' | $CC -x c - -c -o /dev/null) + def_bool $(success,echo 'int foo(int *x) { asm goto (".long (%l[bar]) - .": "+m"(*x) ::: bar); return *x; bar: return 0; }' | $CC -x c - -c -o /dev/null)
Tested a variety of compiler versions via godbolt, and the results are the same for all cases, so with the caveat that I am far from a shell expert:
Quoted 3 lines · Sean Christopherson
+Masahiro and build, as I don't think this should go through the KVM tree (which is also partly why no one has responded).
Presumably this was sent to the author and the commiter of 1aa0e8b144b6474c4914439d232d15bfe883636b
If Paolo does not pick this up, I can.
Now applied to linux-kbuild/fixes. Thanks.
Quoted 1 line
On a related topic, should init/Kconfig be added to the KCONFIG
MAINTAINERSentry?
No, I do not think so.
init/Kconfig contains a lot, which I am not responsible for.
Quoted 52 lines
Or is there a better owner for this?
MAINTAINERS +1
-0@@ -11040,6 +11040,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git F: Documentation/kbuild/kconfig* F: scripts/Kconfig.include F: scripts/kconfig/ +F: init/Kconfig KCOV R: Dmitry Vyukov <[email protected]>Quoted 26 lines · On Tue, Nov 15, 2022, [email protected] wrote:
From: Alexandre Belloni <[email protected]>
When using dash as
/bin/sh, theCC_HAS_ASM_GOTO_TIED_OUTPUTtest fails with a syntax error which is not the one we are looking for:<stdin>: In function ‘foo’:
<stdin>:1:29: warning: missing terminating " character <stdin>:1:29: error: missing terminating " character <stdin>:2:5: error: expected ‘:’ before ‘+’ token <stdin>:2:7: warning: missing terminating " character <stdin>:2:7: error: missing terminating " character <stdin>:2:5: error: expected declaration or statement at end of inputRemoving '\n' solves this.
Fixes 1aa0e8b144b6 ("Kconfig: Add option for asm goto w/ tied outputs to workaround clang-13 bug")Signed-off-by Alexandre Belloni <[email protected]>--- init/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)init/Kconfig +0
-0init/Kconfig config CC_HAS_ASM_GOTO_OUTPUT · line 90
Quoted 5 lines
init/Kconfig +1
-1@@ -87,7 +87,7 @@ config CC_HAS_ASM_GOTO_OUTPUT config CC_HAS_ASM_GOTO_TIED_OUTPUT depends on CC_HAS_ASM_GOTO_OUTPUT # Detect buggy gcc and clang, fixed in gcc-11 clang-14. - def_bool $(success,echo 'int foo(int *x) { asm goto (".long (%l[bar]) - .\n": "+m"(*x) ::: bar); return *x; bar: return 0; }' | $CC -x c - -c -o /dev/null) + def_bool $(success,echo 'int foo(int *x) { asm goto (".long (%l[bar]) - .": "+m"(*x) ::: bar); return *x; bar: return 0; }' | $CC -x c - -c -o /dev/null)Tested a variety of compiler versions via godbolt, and the results are the same for all cases, so with the caveat that I am far from a shell expert:
Reviewed-by Sean Christopherson <[email protected]>
Signature · 2 lines
Best Regards Masahiro Yamada