From: Michal Kubecek Date: Sat, 15 May 2021 10:11:13 +0000 (+0200) Subject: kbuild: dummy-tools: adjust to stricter stackprotector check X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c93db682cfb213501881072a9200a48ce1dc3c3f;p=linux.git kbuild: dummy-tools: adjust to stricter stackprotector check Commit 3fb0fdb3bbe7 ("x86/stackprotector/32: Make the canary into a regular percpu variable") modified the stackprotector check on 32-bit x86 to check if gcc supports using %fs as canary. Adjust dummy-tools gcc script to pass this new test by returning "%fs" rather than "%gs" if it detects -mstack-protector-guard-reg=fs on command line. Fixes: 3fb0fdb3bbe7 ("x86/stackprotector/32: Make the canary into a regular percpu variable") Signed-off-by: Michal Kubecek Signed-off-by: Masahiro Yamada --- diff --git a/scripts/dummy-tools/gcc b/scripts/dummy-tools/gcc index f6d543725f1ed..b2483149bbe55 100755 --- a/scripts/dummy-tools/gcc +++ b/scripts/dummy-tools/gcc @@ -76,7 +76,11 @@ fi if arg_contain -S "$@"; then # For scripts/gcc-x86-*-has-stack-protector.sh if arg_contain -fstack-protector "$@"; then - echo "%gs" + if arg_contain -mstack-protector-guard-reg=fs "$@"; then + echo "%fs" + else + echo "%gs" + fi exit 0 fi