boot/arm-trusted-firmware: don't force ENABLE_STACK_PROTECTOR
authorBaruch Siach <baruch@tkos.co.il>
Mon, 16 Aug 2021 03:30:11 +0000 (06:30 +0300)
committerPeter Korsgaard <peter@korsgaard.com>
Tue, 17 Aug 2021 07:24:09 +0000 (09:24 +0200)
commitccac9a5bbbd7374187a0f0017101ece0c202851d
tree7000514320bfefb82fe6e9bdc429420fbff1ea4b
parent5a3d1f34bcd5c5305b07ba268fa47d6c42a7f7ca
boot/arm-trusted-firmware: don't force ENABLE_STACK_PROTECTOR

Commit 5f432df7e2d2 ("boot/arm-trusted-firmware: change
ENABLE_STACK_PROTECTOR value when disabled") set
ENABLE_STACK_PROTECTOR=0 when disabled. But since we pass this value as
MAKE_OPT, the internal ATF logic that sets ENABLE_STACK_PROTECTOR again
based on its initial value breaks. This leads to build failure:

make[1]: *** [/builds/buildroot.org/buildroot/output/build/arm-trusted-firmware-v2.4/build/a80x0_mcbin/release/libc/assert.o] Error 1
aarch64-buildroot-linux-uclibc-gcc.br_real: error: unrecognized command-line option ‘-fstack-protector-0’; did you mean ‘-fstack-protector’?

Move ENABLE_STACK_PROTECTOR to make environment instead to allow make to
change its value.

Fixes:
https://gitlab.com/buildroot.org/buildroot/-/jobs/1497663294

Cc: Dick Olsson <hi@senzilla.io>
Cc: Sergey Matyukevich <geomatsi@gmail.com>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
boot/arm-trusted-firmware/arm-trusted-firmware.mk