On Tue, Jul 30, 2024 at 11:40:54AM -0700, Nathan Chancellor wrote:
> commit 3415b10a03945b0da4a635e146750dfe5ce0f448 upstream.
>
> After a recent change in clang to stop consuming all instances of '-S'
> and '-c' [1], the stack protector scripts break due to the kernel's use
> of -Werror=unused-command-line-argument to catch cases where flags are
> not being properly consumed by the compiler driver:
>
> $ echo | clang -o - -x c - -S -c -Werror=unused-command-line-argument
> clang: error: argument unused during compilation: '-c' [-Werror,-Wunused-command-line-argument]
>
> This results in CONFIG_STACKPROTECTOR getting disabled because
> CONFIG_CC_HAS_SANE_STACKPROTECTOR is no longer set.
>
> '-c' and '-S' both instruct the compiler to stop at different stages of
> the pipeline ('-S' after compiling, '-c' after assembling), so having
> them present together in the same command makes little sense. In this
> case, the test wants to stop before assembling because it is looking at
> the textual assembly output of the compiler for either '%fs' or '%gs',
> so remove '-c' from the list of arguments to resolve the error.
>
> All versions of GCC continue to work after this change, along with
> versions of clang that do or do not contain the change mentioned above.
>
> Cc: stable@xxxxxxxxxxxxxxx
> Fixes: 4f7fd4d7a791 ("[PATCH] Add the -fstack-protector option to the CFLAGS")
> Fixes: 60a5317ff0f4 ("x86: implement x86_32 stack protector")
> Link: https://github.com/llvm/llvm-project/commit/6461e537815f7fa68cef06842505353cf5600e9c [1]
> Signed-off-by: Nathan Chancellor <nathan@xxxxxxxxxx>
> Signed-off-by: Masahiro Yamada <masahiroy@xxxxxxxxxx>
> [nathan: Fixed conflict in 32-bit version due to lack of 3fb0fdb3bbe7]
> Signed-off-by: Nathan Chancellor <nathan@xxxxxxxxxx>
> ---
> This change applies cleanly with 'patch -p1' on both 5.4 and 4.19.
> ---
> scripts/gcc-x86_32-has-stack-protector.sh | 2 +-
> scripts/gcc-x86_64-has-stack-protector.sh | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
Now queued up, thanks.
greg k-h
